Changeset ca37445 for src/Parser

Timestamp:

Apr 10, 2018, 3:31:07 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

33f5b57

Parents:

9d1e3f7 (diff), 8ad6533 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/Parser

Files:

• lex.ll (modified) (5 diffs)
• parser.yy (modified) (8 diffs)

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Thu Mar 22 16:47:06 2018
- * Update Count     : 668
+ * Last Modified On : Fri Apr  6 15:16:15 2018
+ * Update Count     : 670
  */
 
@@ -198 +198 @@
 __asm                   { KEYWORD_RETURN(ASM); }                                // GCC
 __asm__                 { KEYWORD_RETURN(ASM); }                                // GCC
-_At                             { KEYWORD_RETURN(AT); }                                 // CFA
 _Atomic                 { KEYWORD_RETURN(ATOMIC); }                             // C11
 __attribute             { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
@@ -229 +228 @@
 exception               { KEYWORD_RETURN(EXCEPTION); }                  // CFA
 extern                  { KEYWORD_RETURN(EXTERN); }
+fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
 fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
-fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
 finally                 { KEYWORD_RETURN(FINALLY); }                    // CFA
 float                   { KEYWORD_RETURN(FLOAT); }
@@ -260 +259 @@
 __builtin_offsetof { KEYWORD_RETURN(OFFSETOF); }                // GCC
 one_t                   { NUMERIC_RETURN(ONE_T); }                              // CFA
+or                              { QKEYWORD_RETURN(WOR); }                               // CFA
 otype                   { KEYWORD_RETURN(OTYPE); }                              // CFA
 register                { KEYWORD_RETURN(REGISTER); }
@@ -296 +296 @@
 __volatile__    { KEYWORD_RETURN(VOLATILE); }                   // GCC
 waitfor                 { KEYWORD_RETURN(WAITFOR); }
-or                              { QKEYWORD_RETURN(WOR); }                               // CFA
 when                    { KEYWORD_RETURN(WHEN); }
 while                   { KEYWORD_RETURN(WHILE); }

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 22 16:56:21 2018
-// Update Count     : 3125
+// Last Modified On : Wed Mar 28 17:52:24 2018
+// Update Count     : 3130
 //
 
@@ -497 +497 @@
                 { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
         | type_name '.' no_attr_identifier                                      // CFA, nested type
-                { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; }
         | type_name '.' '[' push field_list pop ']'                     // CFA, nested type / tuple field selector
-                { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; }
         | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11
-                { SemanticError( yylloc, "_Generic is currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "_Generic is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -687 +687 @@
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
+        | '(' COROUTINE '&' ')' cast_expression                         // CFA
+                { SemanticError( yylloc, "coroutine cast is currently unimplemented." ); $$ = nullptr; }
+        | '(' THREAD '&' ')' cast_expression                            // CFA
+                { SemanticError( yylloc, "monitor cast is currently unimplemented." ); $$ = nullptr; }
+        | '(' MONITOR '&' ')' cast_expression                           // CFA
+                { SemanticError( yylloc, "thread cast is currently unimplemented." ); $$ = nullptr; }
                 // VIRTUAL cannot be opt because of look ahead issues
-        | '(' VIRTUAL ')' cast_expression
+        | '(' VIRTUAL ')' cast_expression                                       // CFA
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $4 ), maybeMoveBuildType( nullptr ) ) ); }
-        | '(' VIRTUAL type_no_function ')' cast_expression
+        | '(' VIRTUAL type_no_function ')' cast_expression      // CFA
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); }
 //      | '(' type_no_function ')' tuple
@@ -782 +788 @@
         | logical_OR_expression '?' comma_expression ':' conditional_expression
                 { $$ = new ExpressionNode( build_cond( $1, $3, $5 ) ); }
-                // FIX ME: this hack computes $1 twice
+                // FIX ME: computes $1 twice
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
                 { $$ = new ExpressionNode( build_cond( $1, $1, $4 ) ); }
@@ -797 +803 @@
                 { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
         | unary_expression '=' '{' initializer_list comma_opt '}'
-                { SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -867 +873 @@
         | exception_statement
         | enable_disable_statement
-                { SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; }
         | asm_statement
         ;
@@ -1062 +1068 @@
                 { $$ = new StatementNode( build_return( $2 ) ); }
         | RETURN '{' initializer_list comma_opt '}'
-                { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
@@ -1086 +1092 @@
 mutex_statement:
         MUTEX '(' argument_expression_list ')' statement
-                { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; }
         ;