Changeset 553772b

Timestamp:

May 16, 2019, 9:43:49 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7a54d67

Parents:

3c5dee4

Message:

add new type constructor "generator" with temporary coroutine semantics

Location:

src/Parser

Files:

• lex.ll (modified) (2 diffs)
• parser.yy (modified) (6 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 : Wed Mar 13 14:54:30 2019
- * Update Count     : 707
+ * Last Modified On : Wed May 15 21:25:27 2019
+ * Update Count     : 708
  */
 
@@ -265 +265 @@
 fortran                 { KEYWORD_RETURN(FORTRAN); }
 ftype                   { KEYWORD_RETURN(FTYPE); }                              // CFA
+generator               { KEYWORD_RETURN(GENERATOR); }                  // CFA
 _Generic                { KEYWORD_RETURN(GENERIC); }                    // C11
 goto                    { KEYWORD_RETURN(GOTO); }

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 Apr 15 15:02:56 2019
-// Update Count     : 4290
+// Last Modified On : Wed May 15 21:25:27 2019
+// Update Count     : 4296
 //
 
@@ -173 +173 @@
 DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) {
         if ( ! fieldList ) {                                                            // field declarator ?
-                if ( ! ( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) {
+                if ( ! ( typeSpec->type && (typeSpec->type->kind == TypeData::Aggregate || typeSpec->type->kind == TypeData::Enum) ) ) {
                         stringstream ss;
                         typeSpec->type->print( ss );
@@ -275 +275 @@
 %token ENUM STRUCT UNION
 %token EXCEPTION                                                                                // CFA
-%token COROUTINE MONITOR THREAD                                                 // CFA
+%token GENERATOR COROUTINE MONITOR THREAD                               // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
 %token SIZEOF OFFSETOF
@@ -677 +677 @@
         // empty
                 { $$ = nullptr; }
-        | '?'                                                                                           // CFA, default parameter
+        | '@'                                                                                           // CFA, default parameter
                 { SemanticError( yylloc, "Default parameter for argument is currently unimplemented." ); $$ = nullptr; }
                 // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
@@ -796 +796 @@
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
                 // keyword cast cannot be grouped because of reduction in aggregate_key
+        | '(' GENERATOR '&' ')' cast_expression                         // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
         | '(' COROUTINE '&' ')' cast_expression                         // CFA
                 { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
@@ -2061 +2063 @@
         | EXCEPTION
                 { yyy = true; $$ = DeclarationNode::Exception; }
+        | GENERATOR
+                { yyy = true; $$ = DeclarationNode::Coroutine; }
         | COROUTINE
                 { yyy = true; $$ = DeclarationNode::Coroutine; }