Changeset 55c7577

Timestamp:

Mar 19, 2018, 2:13:49 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

12db9e4

Parents:

a4d188f (diff), e6b3942 (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:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (2 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  9 11:37:35 2018
-// Update Count     : 3075
+// Last Modified On : Fri Mar 16 17:24:44 2018
+// Update Count     : 3081
 //
 
@@ -534 +534 @@
         | '(' type_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
+        | '(' type_no_function ')' '@' '{' initializer_list comma_opt '}' // CFA, explicit C compound-literal
+                { SemanticError( yylloc, "explicit C compound-literal is currently unimplemented." ); $$ = nullptr; } // FIX ME
         | '^' primary_expression '{' argument_expression_list '}' // CFA
                 {