Changeset 3cb693c

Timestamp:

Jul 25, 2024, 5:00:55 PM (3 hours ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

fd4df379

Parents:

d02d223 (diff), c1b0b8f (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) (4 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 : Tue Jul  9 10:29:01 2024
-// Update Count     : 6713
+// Last Modified On : Thu Jul 25 15:19:32 2024
+// Update Count     : 6730
 //
 
@@ -852 +852 @@
         ;
 
-argument_expression_list_opt:
-        // empty
-                { $$ = nullptr; }
-        | argument_expression_list
-        ;
-
-argument_expression_list:
-        argument_expression
-        | argument_expression_list_opt ',' argument_expression
-                { $$ = $1->set_last( $3 ); }
-        ;
-
-argument_expression:
-        '@'                                                                                                     // CFA, default parameter
-                { SemanticError( yylloc, "Default parameter for argument is currently unimplemented." ); $$ = nullptr; }
-                // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
-        | assignment_expression
-        ;
-
 field_name_list:                                                                                // CFA, tuple field selector
         field
@@ -1116 +1097 @@
 constant_expression:
         conditional_expression
+        ;
+
+argument_expression_list_opt:
+        // empty
+                { $$ = nullptr; }
+        | argument_expression_list
+        ;
+
+argument_expression_list:
+        argument_expression
+        // | argument_expression_list_opt ',' argument_expression // CFA, allow empty argument
+        | argument_expression_list ',' argument_expression      // no empty argument
+                { $$ = $1->set_last( $3 ); }
+        ;
+
+argument_expression:
+        '?'                                                                                                     // CFA, default parameter
+                { SemanticError( yylloc, "Argument to default parameter is currently unimplemented." ); $$ = nullptr; }
+                // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
+        | '?' identifier '=' assignment_expression                      // CFA, keyword argument
+                { SemanticError( yylloc, "keyword argument is currently unimplemented." ); $$ = nullptr; }
+        | assignment_expression
         ;
 
@@ -3543 +3546 @@
         identifier_at
                 { $$ = DeclarationNode::newName( $1 ); }
+        | '?' identifier
+                { SemanticError( yylloc, "keyword parameter is currently unimplemented." ); $$ = nullptr; }
         | '(' paren_identifier ')'                                                      // redundant parenthesis
                 { $$ = $2; }