Changeset 29702ad for src/Parser/parser.yy

Timestamp:

Nov 22, 2022, 10:18:04 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

20cf96d

Parents:

1553a55 (diff), d41735a (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) (6 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 : Wed Nov  2 21:31:21 2022
-// Update Count     : 5810
+// Last Modified On : Mon Nov 21 22:34:30 2022
+// Update Count     : 5848
 //
 
@@ -383 +383 @@
 %type<ifctl> conditional_declaration
 %type<fctl> for_control_expression              for_control_expression_list
-%type<compop> updown updowneq downupdowneq
+%type<compop> upupeq updown updowneq downupdowneq
 %type<en> subrange
 %type<decl> asm_name_opt
@@ -489 +489 @@
 %type<decl> type_parameter type_parameter_list type_initializer_opt
 
-%type<en> type_parameters_opt type_list
+%type<en> type_parameters_opt type_list array_type_list
 
 %type<decl> type_qualifier type_qualifier_name forall type_qualifier_list_opt type_qualifier_list
@@ -2558 +2558 @@
                 { typedefTable.makeTypedef( *$3 ); }
           hide_opt '{' enumerator_list comma_opt '}'
-          { $$ = DeclarationNode::newEnum( $3, $7, true, false )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newEnum( $3, $7, true, false, nullptr, $5 )->addQualifiers( $2 ); }
         | ENUM attribute_list_opt typedef_name                          // unqualified type name
           hide_opt '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $3->name, $6, true, false )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newEnum( $3->name, $6, true, false, nullptr, $4 )->addQualifiers( $2 ); }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}'
                 {
@@ -2580 +2580 @@
           hide_opt '{' enumerator_list comma_opt '}'
                 {
-                        $$ = DeclarationNode::newEnum( $6, $11, true, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
+                        $$ = DeclarationNode::newEnum( $6, $11, true, true, $3, $9 )->addQualifiers( $5 )->addQualifiers( $7 );
                 }
         | ENUM '(' ')' attribute_list_opt identifier attribute_list_opt
           hide_opt '{' enumerator_list comma_opt '}'
                 {
-                        $$ = DeclarationNode::newEnum( $5, $9, true, true, nullptr )->addQualifiers( $4 )->addQualifiers( $6 );
+                        $$ = DeclarationNode::newEnum( $5, $9, true, true, nullptr, $7 )->addQualifiers( $4 )->addQualifiers( $6 );
                 }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt
           hide_opt '{' enumerator_list comma_opt '}'
                 {
-                        $$ = DeclarationNode::newEnum( $6->name, $10, true, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
+                        $$ = DeclarationNode::newEnum( $6->name, $10, true, true, $3, $8 )->addQualifiers( $5 )->addQualifiers( $7 );
                 }
         | ENUM '(' ')' attribute_list_opt typedef_name attribute_list_opt
           hide_opt '{' enumerator_list comma_opt '}'
                 {
-                        $$ = DeclarationNode::newEnum( $5->name, $9, true, true, nullptr )->addQualifiers( $4 )->addQualifiers( $6 );
+                        $$ = DeclarationNode::newEnum( $5->name, $9, true, true, nullptr, $7 )->addQualifiers( $4 )->addQualifiers( $6 );
                 }
         | enum_type_nobody
@@ -3653 +3653 @@
         | '[' ']' multi_array_dimension
                 { $$ = DeclarationNode::newArray( 0, 0, false )->addArray( $3 ); }
-        | '[' push assignment_expression pop ',' comma_expression ']'
+                // Cannot use constant_expression because of tuples => semantic check
+        | '[' push assignment_expression pop ',' comma_expression ']' // CFA
                 { $$ = DeclarationNode::newArray( $3, 0, false )->addArray( DeclarationNode::newArray( $6, 0, false ) ); }
                 // { SemanticError( yylloc, "New array dimension is currently unimplemented." ); $$ = nullptr; }
+        | '[' push array_type_list pop ']'                                      // CFA
+                { SemanticError( yylloc, "Type array dimension is currently unimplemented." ); $$ = nullptr; }
         | multi_array_dimension
         ;
+
+array_type_list:
+        basic_type_name
+                { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
+        | type_name
+                { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
+        | assignment_expression upupeq assignment_expression
+        | array_type_list ',' basic_type_name
+                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) )); }
+        | array_type_list ',' type_name 
+                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) )); }
+        | array_type_list ',' assignment_expression upupeq assignment_expression
+        ;
+
+upupeq:
+        '~'
+                { $$ = OperKinds::LThan; }
+        | ErangeUpEq
+                { $$ = OperKinds::LEThan; }
+        ;
 
 multi_array_dimension: