Changeset d27e340 for src

Timestamp:

Feb 15, 2018, 11:11:00 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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

Children:

271326e, ac7d921, d55d7a6

Parents:

b69ea6b (diff), f3543b0 (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:software/cfa/cfa-cc

Location:

src

Files:

• Parser/parser.yy (modified) (4 diffs)
• tests/alloc.c (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 : Thu Dec 21 11:32:56 2017
-// Update Count     : 2996
+// Last Modified On : Tue Feb 13 11:40:34 2018
+// Update Count     : 2999
 //
 
@@ -482 +482 @@
                 { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
         | type_name '.' no_attr_identifier                                      // CFA, nested type
-                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; }                                                          // FIX ME
+                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME
         | type_name '.' '[' push field_list pop ']'                     // CFA, nested type / tuple field selector
-                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; }                                                          // FIX ME
+                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; } // FIX ME
         ;
 
@@ -767 +767 @@
         | unary_expression assignment_operator assignment_expression
                 { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
+        | unary_expression '=' '{' initializer_list comma_opt '}' // FIX ME
+                { $$ = nullptr; }
         ;
 
@@ -1050 +1052 @@
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
+        | RETURN '{' initializer_list comma_opt '}'                     // FIX ME
+                { $$ = nullptr; }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }

src/tests/alloc.c

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 22 21:26:40 2018
-// Update Count     : 326
+// Last Modified On : Wed Feb 14 17:52:36 2018
+// Update Count     : 328
 //
 
@@ -27 +27 @@
 int main( void ) {
         size_t dim = 10;
+        char fill = '\xff';
         int * p;
-        char fill = '\1';
 
         // allocation, non-array types