Changes in src/Parser/parser.yy [8780e30:1b29996]

File:

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

src/Parser/parser.yy

@@ -199 +199 @@
 
 %type<decl> field_declaration field_declaration_list field_declarator field_declaring_list
-%type<en> field field_list field_name fraction_constants
+%type<en> field field_list
+%type<tok> field_name
 
 %type<decl> external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr
@@ -383 +384 @@
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression REALFRACTIONconstant                       // CFA, tuple index
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_REALFRACTIONconstant( *$2 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
-                        { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression ICR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }
@@ -423 +421 @@
 field:                                                                                                  // CFA, tuple field selector
         field_name
+                { $$ = new ExpressionNode( build_varref( $1 ) ); }
         | REALDECIMALconstant field
-                { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_REALDECIMALconstant( *$1 ) ), maybeMoveBuild<Expression>( $2 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $2, build_varref( $1 ) ) ); }
         | REALDECIMALconstant '[' push field_list pop ']'
-                { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_REALDECIMALconstant( *$1 ) ), build_tuple( $4 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $4, build_varref( $1 ) ) ); }
         | field_name '.' field
-                { $$ = new ExpressionNode( build_fieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $3, build_varref( $1 ) ) ); }
         | field_name '.' '[' push field_list pop ']'
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $5, build_varref( $1 ) ) ); }
         | field_name ARROW field
-                { $$ = new ExpressionNode( build_pfieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
+                { $$ = new ExpressionNode( build_pfieldSel( $3, build_varref( $1 ) ) ); }
         | field_name ARROW '[' push field_list pop ']'
-                { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
+                { $$ = new ExpressionNode( build_pfieldSel( $5, build_varref( $1 ) ) ); }
         ;
 
 field_name:
         INTEGERconstant fraction_constants
-                { $$ = new ExpressionNode( build_field_name_fraction_constants( build_constantInteger( *$1 ), $2 ) ); }
+                { $$ = $1; }
         | FLOATINGconstant fraction_constants
-                { $$ = new ExpressionNode( build_field_name_fraction_constants( build_field_name_FLOATINGconstant( *$1 ), $2 ) ); }
+                { $$ = $1; }
         | no_attr_identifier fraction_constants
-                { $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) ); }
+                { $$ = $1; }
         ;
 
 fraction_constants:
         // empty
-                { $$ = nullptr; }
         | fraction_constants REALFRACTIONconstant
-                {
-                        Expression * constant = build_field_name_REALFRACTIONconstant( *$2 );
-                        $$ = $1 != nullptr ? new ExpressionNode( build_fieldSel( $1,  constant ) ) : new ExpressionNode( constant );
-                }
         ;