Changeset 55c97e4

Timestamp:

Apr 25, 2024, 3:43:52 PM (11 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7042c60, e78966e

Parents:

314c9d8 (diff), a1fbad0 (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

Files:

• src/CodeGen/CodeGenerator.cpp (modified) (2 diffs)
• src/Parser/parser.yy (modified) (3 diffs)
• tools/test_time.py (added)

src/CodeGen/CodeGenerator.cpp

@@ -167 +167 @@
         ast::Pass<CodeGenerator> subCG( acc, subOptions );
         // Add the forall clause.
-        // TODO: These probably should be removed by now and the assert used.
         if ( !decl->type_params.empty() ) {
                 assertf( !options.genC, "FunctionDecl forall should not reach code generation." );
@@ -174 +173 @@
                 acc << ")" << std::endl;
         }
+        // The forall clause should be printed early as part of the preamble.
+        output << acc.str();
+        acc.str("");
 
         acc << mangleName( decl );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Mar 16 18:19:23 2024
-// Update Count     : 6617
+// Last Modified On : Tue Apr 23 15:39:29 2024
+// Update Count     : 6620
 //
 
@@ -493 +493 @@
 %type<decl> exception_declaration
 
-%type<decl> field_declaration_list_opt field_declaration field_declaring_list_opt field_declarator field_abstract_list_opt field_abstract
+%type<decl> field_declaration_list_opt field_declaration field_declaring_list_opt field_declaring_list field_declarator field_abstract_list_opt field_abstract
 %type<expr> field field_name_list field_name fraction_constants_opt
 
@@ -2682 +2682 @@
         // empty
                 { $$ = nullptr; }
-        | field_declarator
-        | field_declaring_list_opt ',' attribute_list_opt field_declarator
+        | field_declaring_list
+        ;
+
+field_declaring_list:
+        field_declarator
+        | field_declaring_list ',' attribute_list_opt field_declarator
                 { $$ = $1->set_last( $4->addQualifiers( $3 ) ); }
         ;