Changeset 8a9a3ab for src/Parser

Timestamp:

Sep 1, 2023, 3:54:42 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

4b30318b

Parents:

4269d1b (diff), 4c0fa03 (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

@@ -2691 +2691 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt
                 {
-                        if ( $3->storageClasses.any() || $3->type->qualifiers.val != 0 ) {
+                        if ( $3 && ($3->storageClasses.any() || $3->type->qualifiers.val != 0 )) {
                                 SemanticError( yylloc, "syntax error, storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." );
                         }
@@ -2829 +2829 @@
 
 cfa_abstract_parameter_declaration:                                             // CFA, new & old style parameter declaration
-        abstract_parameter_declaration
+        // empty
+                { $$ = nullptr; }
+        | abstract_parameter_declaration
         | cfa_identifier_parameter_declarator_no_tuple
         | cfa_abstract_tuple
@@ -3854 +3856 @@
                 // { SemanticError( yylloc, "New array dimension is currently unimplemented." ); $$ = nullptr; }
         | '[' push array_type_list pop ']'                                      // CFA
-                { SemanticError( yylloc, "Type array dimension is currently unimplemented." ); $$ = nullptr; }
+                { $$ = DeclarationNode::newArray( $3, nullptr, false ); }
         | multi_array_dimension
         ;