Changeset 87d13cd for src/Parser

Timestamp:

Mar 21, 2017, 10:07:52 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

cb91437

Parents:

829c907 (diff), a53e10a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicit in iostream.c

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (1 diff)
• lex.ll (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -163 +163 @@
 ConstantExpr *build_constantStr( const std::string & str ) {
         // string should probably be a primitive type
-        ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( emptyQualifiers, BasicType::Char ),
+        ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
                                 new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::UnsignedInt ),
                                                                                         toString( str.size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'

src/Parser/lex.ll

@@ -202 +202 @@
 __const__               { KEYWORD_RETURN(CONST); }                              // GCC
 continue                { KEYWORD_RETURN(CONTINUE); }
-_Coroutine              { KEYWORD_RETURN(COROUTINE); }                  // CFA
+coroutine               { KEYWORD_RETURN(COROUTINE); }                  // CFA
 default                 { KEYWORD_RETURN(DEFAULT); }
 disable                 { KEYWORD_RETURN(DISABLE); }                    // CFA