Changeset 0393653 for src

Timestamp:

Jan 31, 2023, 3:07:42 PM (15 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

dab2b6a

Parents:

757099e (diff), 7a24d76 (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

File:

• src/Parser/parser.yy (modified) (3 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 : Mon Jan 30 20:47:27 2023
-// Update Count     : 5859
+// Last Modified On : Tue Jan 31 08:55:11 2023
+// Update Count     : 5861
 //
 
@@ -2080 +2080 @@
                 { $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
         | forall
+                { $$ = DeclarationNode::newForall( $1 ); }
         ;
 
 forall:
         FORALL '(' type_parameter_list ')'                                      // CFA
-                { $$ = DeclarationNode::newForall( $3 ); }
+                { $$ = $3; }
         ;
 
@@ -2979 +2980 @@
         TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' '}'
                 { $$ = DeclarationNode::newTrait( $2, $4, nullptr ); }
-        | FORALL '(' type_parameter_list ')' TRAIT identifier_or_type_name '{' '}' // alternate
-                { $$ = DeclarationNode::newTrait( $6, $3, nullptr ); }
+        | forall TRAIT identifier_or_type_name '{' '}' // alternate
+                { $$ = DeclarationNode::newTrait( $3, $1, nullptr ); }
         | TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
                 { $$ = DeclarationNode::newTrait( $2, $4, $8 ); }
-        | FORALL '(' type_parameter_list ')' TRAIT identifier_or_type_name '{' push trait_declaration_list pop '}' // alternate
-                { $$ = DeclarationNode::newTrait( $6, $3, $9 ); }
+        | forall TRAIT identifier_or_type_name '{' push trait_declaration_list pop '}' // alternate
+                { $$ = DeclarationNode::newTrait( $3, $1, $6 ); }
         ;