Changeset fc12f05 for src/Parser/parser.yy

Timestamp:

Nov 13, 2023, 3:43:43 AM (23 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

25f2798

Parents:

0030b508 (diff), 2174191 (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) (8 diffs)

src/Parser/parser.yy

@@ -48 +48 @@
 using namespace std;
 
-#include "SynTree/Type.h"                               // for Type
 #include "DeclarationNode.h"                            // for DeclarationNode, ...
 #include "ExpressionNode.h"                             // for ExpressionNode, ...
@@ -58 +57 @@
 #include "Common/SemanticError.h"                                               // error_str
 #include "Common/utility.h"                                                             // for maybeMoveBuild, maybeBuild, CodeLo...
-
-#include "SynTree/Attribute.h"                                                  // for Attribute
 
 // lex uses __null in a boolean context, it's fine.
@@ -1726 +1723 @@
 cofor_statement:
         COFOR '(' for_control_expression_list ')' statement
-                { SemanticError( yylloc, "cofor statement is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_cofor( yylloc, $3, maybe_build_compound( yylloc, $5 ) ) ); }
         ;
 
@@ -2169 +2166 @@
 type_qualifier_name:
         CONST
-                { $$ = DeclarationNode::newTypeQualifier( Type::Const ); }
+                { $$ = DeclarationNode::newTypeQualifier( ast::CV::Const ); }
         | RESTRICT
-                { $$ = DeclarationNode::newTypeQualifier( Type::Restrict ); }
+                { $$ = DeclarationNode::newTypeQualifier( ast::CV::Restrict ); }
         | VOLATILE
-                { $$ = DeclarationNode::newTypeQualifier( Type::Volatile ); }
+                { $$ = DeclarationNode::newTypeQualifier( ast::CV::Volatile ); }
         | ATOMIC
-                { $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
+                { $$ = DeclarationNode::newTypeQualifier( ast::CV::Atomic ); }
         | forall
                 { $$ = DeclarationNode::newForall( $1 ); }
@@ -2206 +2203 @@
 storage_class:
         EXTERN
-                { $$ = DeclarationNode::newStorageClass( Type::Extern ); }
+                { $$ = DeclarationNode::newStorageClass( ast::Storage::Extern ); }
         | STATIC
-                { $$ = DeclarationNode::newStorageClass( Type::Static ); }
+                { $$ = DeclarationNode::newStorageClass( ast::Storage::Static ); }
         | AUTO
-                { $$ = DeclarationNode::newStorageClass( Type::Auto ); }
+                { $$ = DeclarationNode::newStorageClass( ast::Storage::Auto ); }
         | REGISTER
-                { $$ = DeclarationNode::newStorageClass( Type::Register ); }
+                { $$ = DeclarationNode::newStorageClass( ast::Storage::Register ); }
         | THREADLOCALGCC                                                                                // GCC
-                { $$ = DeclarationNode::newStorageClass( Type::ThreadlocalGcc ); }
+                { $$ = DeclarationNode::newStorageClass( ast::Storage::ThreadLocalGcc ); }
         | THREADLOCALC11                                                                                // C11
-                { $$ = DeclarationNode::newStorageClass( Type::ThreadlocalC11 ); }
+                { $$ = DeclarationNode::newStorageClass( ast::Storage::ThreadLocalC11 ); }
                 // Put function specifiers here to simplify parsing rules, but separate them semantically.
         | INLINE                                                                                        // C99
-                { $$ = DeclarationNode::newFuncSpecifier( Type::Inline ); }
+                { $$ = DeclarationNode::newFuncSpecifier( ast::Function::Inline ); }
         | FORTRAN                                                                                       // C99
-                { $$ = DeclarationNode::newFuncSpecifier( Type::Fortran ); }
+                { $$ = DeclarationNode::newFuncSpecifier( ast::Function::Fortran ); }
         | NORETURN                                                                                      // C11
-                { $$ = DeclarationNode::newFuncSpecifier( Type::Noreturn ); }
+                { $$ = DeclarationNode::newFuncSpecifier( ast::Function::Noreturn ); }
         ;
 
@@ -3717 +3714 @@
                 { $$ = $1->addQualifiers( $2 ); }
         | '&' MUTEX paren_identifier attribute_list_opt
-                { $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
+                { $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( ast::CV::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
         | identifier_parameter_ptr
         | identifier_parameter_array attribute_list_opt
@@ -3767 +3764 @@
                 { $$ = $1->addQualifiers( $2 ); }
         | '&' MUTEX typedef_name attribute_list_opt
-                { $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
+                { $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( ast::CV::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
         | type_parameter_ptr
         | type_parameter_array attribute_list_opt
@@ -3941 +3938 @@
         abstract_parameter_ptr
         | '&' MUTEX attribute_list_opt
-                { $$ = DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf )->addQualifiers( $3 ); }
+                { $$ = DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( ast::CV::Mutex ), OperKinds::AddressOf )->addQualifiers( $3 ); }
         | abstract_parameter_array attribute_list_opt
                 { $$ = $1->addQualifiers( $2 ); }