Changeset 22f94a4 for src/Parser/parser.yy

Timestamp:

Aug 11, 2020, 4:40:15 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0d070ca

Parents:

07d867b (diff), 129674b (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' into new-ast

File:

• src/Parser/parser.yy (modified) (13 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 : Mon Apr 27 12:25:42 2020
-// Update Count     : 4483
+// Last Modified On : Thu May 28 12:11:45 2020
+// Update Count     : 4500
 //
 
@@ -329 +329 @@
 %type<en> conditional_expression                constant_expression                     assignment_expression           assignment_expression_opt
 %type<en> comma_expression                              comma_expression_opt
-%type<en> argument_expression_list              argument_expression                     default_initialize_opt
+%type<en> argument_expression_list_opt          argument_expression                     default_initialize_opt
 %type<ifctl> if_control_expression
 %type<fctl> for_control_expression              for_control_expression_list
@@ -624 +624 @@
                 // equivalent to the old x[i,j].
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, $3 ) ); }
-        | postfix_expression '{' argument_expression_list '}' // CFA, constructor call
+        | postfix_expression '{' argument_expression_list_opt '}' // CFA, constructor call
                 {
                         Token fn;
@@ -630 +630 @@
                         $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
                 }
-        | postfix_expression '(' argument_expression_list ')'
+        | postfix_expression '(' argument_expression_list_opt ')'
                 { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
         | postfix_expression '`' identifier                                     // CFA, postfix call
@@ -662 +662 @@
         | '(' type_no_function ')' '@' '{' initializer_list_opt comma_opt '}' // CFA, explicit C compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, (new InitializerNode( $6, true ))->set_maybeConstructed( false ) ) ); }
-        | '^' primary_expression '{' argument_expression_list '}' // CFA, destructor call
+        | '^' primary_expression '{' argument_expression_list_opt '}' // CFA, destructor call
                 {
                         Token fn;
@@ -670 +670 @@
         ;
 
-argument_expression_list:
+argument_expression_list_opt:
         // empty
                 { $$ = nullptr; }
         | argument_expression
-        | argument_expression_list ',' argument_expression
+        | argument_expression_list_opt ',' argument_expression
                 { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
@@ -1196 +1196 @@
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
                                                 OperKinds::LThan, $1->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | '=' comma_expression                                                                  // CFA
+        | '=' comma_expression                                                          // CFA
                 { $$ = forCtrl( $2, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
                                                 OperKinds::LEThan, $2->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
@@ -1203 +1203 @@
         | comma_expression inclexcl comma_expression '~' comma_expression // CFA
                 { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
+        | comma_expression ';'                                                          // CFA
+                { $$ = forCtrl( new ExpressionNode( build_constantInteger( *new string( "0u" ) ) ), $1, nullptr, OperKinds::LThan, nullptr, nullptr ); }
         | comma_expression ';' comma_expression                         // CFA
                 { $$ = forCtrl( $3, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
                                                 OperKinds::LThan, $3->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | comma_expression ';' '=' comma_expression                             // CFA
+        | comma_expression ';' '=' comma_expression                     // CFA
                 { $$ = forCtrl( $4, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
                                                 OperKinds::LEThan, $4->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
@@ -1304 +1306 @@
 // If MUTEX becomes a general qualifier, there are shift/reduce conflicts, so change syntax to "with mutex".
 mutex_statement:
-        MUTEX '(' argument_expression_list ')' statement
+        MUTEX '(' argument_expression_list_opt ')' statement
                 { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; }
         ;
@@ -1321 +1323 @@
         WAITFOR '(' cast_expression ')'
                 { $$ = $3; }
-//      | WAITFOR '(' cast_expression ',' argument_expression_list ')'
+//      | WAITFOR '(' cast_expression ',' argument_expression_list_opt ')'
 //              { $$ = (ExpressionNode *)$3->set_last( $5 ); }
-        | WAITFOR '(' cast_expression_list ':' argument_expression_list ')'
+        | WAITFOR '(' cast_expression_list ':' argument_expression_list_opt ')'
                 { $$ = (ExpressionNode *)($3->set_last( $5 )); }
         ;
@@ -1330 +1332 @@
         cast_expression
         | cast_expression_list ',' cast_expression
-                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+                // { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+                { SemanticError( yylloc, "List of mutex member is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -2095 +2098 @@
 
 aggregate_control:                                                                              // CFA
-        GENERATOR
+        MONITOR
+                { yyy = true; $$ = AggregateDecl::Monitor; }
+        | MUTEX STRUCT
+                { yyy = true; $$ = AggregateDecl::Monitor; }
+        | GENERATOR
                 { yyy = true; $$ = AggregateDecl::Generator; }
-        | MONITOR GENERATOR
+        | MUTEX GENERATOR
                 { SemanticError( yylloc, "monitor generator is currently unimplemented." ); $$ = AggregateDecl::NoAggregate; }
         | COROUTINE
                 { yyy = true; $$ = AggregateDecl::Coroutine; }
-        | MONITOR
-                { yyy = true; $$ = AggregateDecl::Monitor; }
-        | MONITOR COROUTINE
+        | MUTEX COROUTINE
                 { SemanticError( yylloc, "monitor coroutine is currently unimplemented." ); $$ = AggregateDecl::NoAggregate; }
         | THREAD
                 { yyy = true; $$ = AggregateDecl::Thread; }
-        | MONITOR THREAD
+        | MUTEX THREAD
                 { SemanticError( yylloc, "monitor thread is currently unimplemented." ); $$ = AggregateDecl::NoAggregate; }
         ;
@@ -2774 +2779 @@
         | attr_name
                 { $$ = DeclarationNode::newAttribute( $1 ); }
-        | attr_name '(' argument_expression_list ')'
+        | attr_name '(' argument_expression_list_opt ')'
                 { $$ = DeclarationNode::newAttribute( $1, $3 ); }
         ;