Changes in src/Parser/parser.yy [3a2128f:8780e30]

File:

• src/Parser/parser.yy (modified) (7 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 : Tue Nov 29 11:35:52 2016
-// Update Count     : 2069
+// Last Modified On : Wed Oct 26 17:35:53 2016
+// Update Count     : 2066
 //
 
@@ -78 +78 @@
 %token RESTRICT                                                                                 // C99
 %token FORALL LVALUE                                                                    // CFA
-%token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED ZERO_T ONE_T
+%token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
 %token VALIST                                                                                   // GCC
 %token BOOL COMPLEX IMAGINARY                                                   // C99
@@ -199 +199 @@
 
 %type<decl> field_declaration field_declaration_list field_declarator field_declaring_list
-%type<en> field field_list
-%type<tok> field_name
+%type<en> field field_list field_name fraction_constants
 
 %type<decl> external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr
@@ -384 +383 @@
                 { $$ = 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 ) ); }
@@ -421 +423 @@
 field:                                                                                                  // CFA, tuple field selector
         field_name
-                { $$ = new ExpressionNode( build_varref( $1 ) ); }
         | REALDECIMALconstant field
-                { $$ = new ExpressionNode( build_fieldSel( $2, build_varref( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_REALDECIMALconstant( *$1 ) ), maybeMoveBuild<Expression>( $2 ) ) ); }
         | REALDECIMALconstant '[' push field_list pop ']'
-                { $$ = new ExpressionNode( build_fieldSel( $4, build_varref( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_REALDECIMALconstant( *$1 ) ), build_tuple( $4 ) ) ); }
         | field_name '.' field
-                { $$ = new ExpressionNode( build_fieldSel( $3, build_varref( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
         | field_name '.' '[' push field_list pop ']'
-                { $$ = new ExpressionNode( build_fieldSel( $5, build_varref( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
         | field_name ARROW field
-                { $$ = new ExpressionNode( build_pfieldSel( $3, build_varref( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_pfieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
         | field_name ARROW '[' push field_list pop ']'
-                { $$ = new ExpressionNode( build_pfieldSel( $5, build_varref( $1 ) ) ); }
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
         ;
 
 field_name:
         INTEGERconstant fraction_constants
-                { $$ = $1; }
+                { $$ = new ExpressionNode( build_field_name_fraction_constants( build_constantInteger( *$1 ), $2 ) ); }
         | FLOATINGconstant fraction_constants
-                { $$ = $1; }
+                { $$ = new ExpressionNode( build_field_name_fraction_constants( build_field_name_FLOATINGconstant( *$1 ), $2 ) ); }
         | no_attr_identifier fraction_constants
-                { $$ = $1; }
+                { $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) ); }
         ;
 
 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 );
+                }
         ;
 
@@ -708 +714 @@
         | '{'
                 // Two scopes are necessary because the block itself has a scope, but every declaration within the block also
-                // requires its own scope.
+                // requires its own scope
           push push
           local_label_declaration_opt                                           // GCC, local labels
@@ -1404 +1410 @@
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
-        | ZERO_T
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Char ); }
-        | ONE_T
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Char ); }
         ;