Changeset 8cbe732 for src/Parser

Timestamp:

Oct 13, 2023, 7:13:21 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

a97b9ed, bab2917

Parents:

85034ed (diff), 0bf0b978 (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

Location:

src/Parser

Files:

• StatementNode.cc (modified) (1 diff)
• StatementNode.h (modified) (1 diff)
• lex.ll (modified) (5 diffs)
• parser.yy (modified) (5 diffs)

src/Parser/StatementNode.cc

@@ -498 +498 @@
 } // build_mutex
 
+ast::Stmt * build_corun( const CodeLocation & location, StatementNode * stmt ) {
+        ast::Stmt * body = maybeMoveBuild( stmt );
+        return new ast::CorunStmt( location, body );
+} // build_corun
+
 // Local Variables: //
 // tab-width: 4 //

src/Parser/StatementNode.h

@@ -105 +105 @@
 ast::Stmt * build_with( const CodeLocation &, ExpressionNode * exprs, StatementNode * stmt );
 ast::Stmt * build_mutex( const CodeLocation &, ExpressionNode * exprs, StatementNode * stmt );
+ast::Stmt * build_corun( const CodeLocation &, StatementNode * stmt );

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Fri Jun  9 10:04:00 2023
- * Update Count     : 770
+ * Last Modified On : Tue Oct  3 17:10:57 2023
+ * Update Count     : 773
  */
 
@@ -217 +217 @@
 
                                 /* keywords */
+alignas                 { KEYWORD_RETURN(ALIGNAS); }                    // CFA
 _Alignas                { KEYWORD_RETURN(ALIGNAS); }                    // C11
+alignof                 { KEYWORD_RETURN(ALIGNOF); }                    // CFA
 _Alignof                { KEYWORD_RETURN(ALIGNOF); }                    // C11
 __alignof               { KEYWORD_RETURN(ALIGNOF); }                    // GCC
@@ -239 +241 @@
 choose                  { KEYWORD_RETURN(CHOOSE); }                             // CFA
 coerce                  { KEYWORD_RETURN(COERCE); }                             // CFA
+corun                   { KEYWORD_RETURN(CORUN); }                              // CFA
+cofor                   { KEYWORD_RETURN(COFOR); }                              // CFA
 _Complex                { KEYWORD_RETURN(COMPLEX); }                    // C99
 __complex               { KEYWORD_RETURN(COMPLEX); }                    // GCC
@@ -319 +323 @@
 static                  { KEYWORD_RETURN(STATIC); }
 _Static_assert  { KEYWORD_RETURN(STATICASSERT); }               // C11
-_static_assert  { KEYWORD_RETURN(STATICASSERT); }               // C23
+static_assert   { KEYWORD_RETURN(STATICASSERT); }               // C23
 struct                  { KEYWORD_RETURN(STRUCT); }
 suspend                 { KEYWORD_RETURN(SUSPEND); }                    // CFA
@@ -326 +330 @@
 __thread                { KEYWORD_RETURN(THREADLOCALGCC); }             // GCC
 _Thread_local   { KEYWORD_RETURN(THREADLOCALC11); }             // C11
+thread_local    { KEYWORD_RETURN(THREADLOCALC11); }             // C23
 throw                   { KEYWORD_RETURN(THROW); }                              // CFA
 throwResume             { KEYWORD_RETURN(THROWRESUME); }                // CFA

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 Sep  4 18:28:12 2023
-// Update Count     : 6393
+// Last Modified On : Tue Oct  3 17:14:12 2023
+// Update Count     : 6396
 //
 
@@ -350 +350 @@
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
 %token CHOOSE FALLTHRU FALLTHROUGH WITH WHEN WAITFOR WAITUNTIL // CFA
+%token CORUN COFOR
 %token DISABLE ENABLE TRY THROW THROWRESUME AT                  // CFA
 %token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
@@ -422 +423 @@
 %type<stmt> with_statement
 %type<expr> with_clause_opt
+%type<stmt> corun_statement                             cofor_statement
 %type<stmt> exception_statement
 %type<clause> handler_clause                    finally_clause
@@ -1140 +1142 @@
         | waitfor_statement
         | waituntil_statement
+        | corun_statement
+        | cofor_statement
         | exception_statement
         | enable_disable_statement
@@ -1713 +1717 @@
         wor_waituntil_clause                                                            %prec THEN
                 { $$ = new StatementNode( build_waituntil_stmt( yylloc, $1 ) ); }
+        ;
+
+corun_statement:
+        CORUN statement
+                { $$ = new StatementNode( build_corun( yylloc, $2 ) ); }
+        ;
+
+cofor_statement:
+        COFOR '(' for_control_expression_list ')' statement
+                { SemanticError( yylloc, "cofor statement is currently unimplemented." ); $$ = nullptr; }
         ;