Changes in src/Parser/parser.yy [dc2b4d6:578e6037]

File:

• src/Parser/parser.yy (modified) (11 diffs)

src/Parser/parser.yy

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 17 12:17:00 2017
-// Update Count     : 2455
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 13 14:38:54 2017
+// Update Count     : 2431
 //
 
@@ -151 +151 @@
 %token ELLIPSIS                                                                                 // ...
 
-%token EXPassign        MULTassign      DIVassign       MODassign       // \=   *=      /=      %=
+%token MULTassign       DIVassign       MODassign                               // *=   /=      %=/
 %token PLUSassign       MINUSassign                                                     // +=   -=
 %token LSassign         RSassign                                                        // <<=  >>=
@@ -168 +168 @@
 %type<op> ptrref_operator                               unary_operator                          assignment_operator
 %type<en> primary_expression                    postfix_expression                      unary_expression
-%type<en> cast_expression                               exponential_expression          multiplicative_expression       additive_expression
-%type<en> shift_expression                              relational_expression           equality_expression
-%type<en> AND_expression                                exclusive_OR_expression         inclusive_OR_expression
-%type<en> logical_AND_expression                logical_OR_expression
-%type<en> conditional_expression                constant_expression                     assignment_expression           assignment_expression_opt
+%type<en> cast_expression                               multiplicative_expression       additive_expression                     shift_expression
+%type<en> relational_expression                 equality_expression                     AND_expression                          exclusive_OR_expression
+%type<en> inclusive_OR_expression               logical_AND_expression          logical_OR_expression           conditional_expression
+%type<en> 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              argument_expression                     assignment_opt
 %type<fctl> for_control_expression
 %type<en> subrange
@@ -574 +573 @@
         ;
 
-exponential_expression:
+multiplicative_expression:
         cast_expression
-        | exponential_expression '\\' cast_expression
-                { $$ = new ExpressionNode( build_binary_val( OperKinds::Exp, $1, $3 ) ); }
-        ;
-
-multiplicative_expression:
-        exponential_expression
-        | multiplicative_expression '*' exponential_expression
+        | multiplicative_expression '*' cast_expression
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Mul, $1, $3 ) ); }
-        | multiplicative_expression '/' exponential_expression
+        | multiplicative_expression '/' cast_expression
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Div, $1, $3 ) ); }
-        | multiplicative_expression '%' exponential_expression
+        | multiplicative_expression '%' cast_expression
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Mod, $1, $3 ) ); }
         ;
@@ -685 +678 @@
         '='                                                                                     { $$ = OperKinds::Assign; }
         | ATassign                                                                      { $$ = OperKinds::AtAssn; }
-        | EXPassign                                                                     { $$ = OperKinds::ExpAssn; }
         | MULTassign                                                            { $$ = OperKinds::MulAssn; }
         | DIVassign                                                                     { $$ = OperKinds::DivAssn; }
@@ -980 +972 @@
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); }
 
-        | handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( $1, $5, nullptr, $9 ) ); }
-        | handler_clause handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, nullptr, $10 ) ) ); }
-        ;
-
-handler_predicate_opt:
-        //empty
-        | ';' conditional_expression
+        | handler_key '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( $1, $5, nullptr, $8 ) ); }
+        | handler_clause handler_key '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, nullptr, $9 ) ) ); }
         ;
 
@@ -1680 +1667 @@
         | aggregate_key attribute_list_opt typegen_name         // CFA
                 { $$ = $3->addQualifiers( $2 ); }
-
-// Temp, testing TreeStruct
-    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name
-        {
-            typedefTable.makeTypedef( *$4 );            // create typedef
-            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
-            forall = false;                             // reset
-        }
-      '{' field_declaration_list '}'
-        {
-            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
-                $4, nullptr, nullptr, $7, true )->addQualifiers( $3 );
-        }
-    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name TYPEDEFname
-        {
-            typedefTable.makeTypedef( *$4 );            // create typedef
-            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
-            forall = false;                             // reset
-        }
-      '{' field_declaration_list '}'
-        {
-            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
-                $4, $5, nullptr, $8, true )->addQualifiers( $3 );
-        }
         ;
 
@@ -1882 +1845 @@
 cfa_parameter_declaration:                                                              // CFA, new & old style parameter declaration
         parameter_declaration
-        | cfa_identifier_parameter_declarator_no_tuple identifier_or_type_name default_initialize_opt
+        | cfa_identifier_parameter_declarator_no_tuple identifier_or_type_name assignment_opt
                 { $$ = $1->addName( $2 ); }
-        | cfa_abstract_tuple identifier_or_type_name default_initialize_opt
+        | cfa_abstract_tuple identifier_or_type_name assignment_opt
                 // To obtain LR(1), these rules must be duplicated here (see cfa_abstract_declarator).
                 { $$ = $1->addName( $2 ); }
-        | type_qualifier_list cfa_abstract_tuple identifier_or_type_name default_initialize_opt
+        | type_qualifier_list cfa_abstract_tuple identifier_or_type_name assignment_opt
                 { $$ = $2->addName( $3 )->addQualifiers( $1 ); }
         | cfa_function_specifier
@@ -1904 +1867 @@
 parameter_declaration:
                 // No SUE declaration in parameter list.
-        declaration_specifier_nobody identifier_parameter_declarator default_initialize_opt
+        declaration_specifier_nobody identifier_parameter_declarator assignment_opt
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
                 }
-        | declaration_specifier_nobody type_parameter_redeclarator default_initialize_opt
+        | declaration_specifier_nobody type_parameter_redeclarator assignment_opt
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -1917 +1880 @@
 
 abstract_parameter_declaration:
-        declaration_specifier_nobody default_initialize_opt
+        declaration_specifier_nobody assignment_opt
                 { $$ = $1->addInitializer( $2 ? new InitializerNode( $2 ) : nullptr ); }
-        | declaration_specifier_nobody abstract_parameter_declarator default_initialize_opt
+        | declaration_specifier_nobody abstract_parameter_declarator assignment_opt
                 { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
         ;
@@ -3082 +3045 @@
         ;
 
-default_initialize_opt:
+assignment_opt:
         // empty
                 { $$ = nullptr; }