Changeset df22130

Timestamp:

May 9, 2018, 5:56:19 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

a8de0f4

Parents:

b4a835d

Message:

allow spaces for tuple index in expression

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 : Thu May  3 08:20:09 2018
-// Update Count     : 3225
+// Last Modified On : Wed May  9 17:17:35 2018
+// Update Count     : 3244
 //
 
@@ -302 +302 @@
 
 %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 field_name fraction_constants_opt
 
 %type<decl> external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr
@@ -499 +499 @@
         | type_name '.' no_attr_identifier                                      // CFA, nested type
                 { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; }
+//              { $$ = nullptr; }
         | type_name '.' '[' push field_list pop ']'                     // CFA, nested type / tuple field selector
                 { SemanticError( yylloc, "Qualified names are currently unimplemented." ); $$ = nullptr; }
+//              { $$ = nullptr; }
         | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11
                 { SemanticError( yylloc, "_Generic is currently unimplemented." ); $$ = nullptr; }
@@ -533 +535 @@
         | postfix_expression '.' no_attr_identifier
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
+        | postfix_expression '.' INTEGERconstant                        // CFA, tuple index
+                { $$ = new ExpressionNode( build_fieldSel( $1, build_constantInteger( *$3 ) ) ); }
+        | postfix_expression FLOATING_FRACTIONconstant          // CFA, tuple index
+                { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_FLOATING_FRACTIONconstant( *$2 ) ) ); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
-        | postfix_expression FLOATING_FRACTIONconstant          // CFA, tuple index
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_FLOATING_FRACTIONconstant( *$2 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
                 {
                         $$ = new ExpressionNode( build_pfieldSel( $1, *$3 == "0" || *$3 == "1" ? build_constantInteger( *$3 ) : build_varref( $3 ) ) );
                 }
-        | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
-                        { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$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 ) ); }
@@ -597 +601 @@
 
 field_name:
-        INTEGERconstant fraction_constants
+        INTEGERconstant fraction_constants_opt
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_constantInteger( *$1 ), $2 ) ); }
-        | FLOATINGconstant fraction_constants
+        | FLOATINGconstant fraction_constants_opt
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_field_name_FLOATINGconstant( *$1 ), $2 ) ); }
-        | no_attr_identifier fraction_constants
+        | no_attr_identifier fraction_constants_opt
                 {
                         $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) );
@@ -607 +611 @@
         ;
 
-fraction_constants:
+fraction_constants_opt:
         // empty
                 { $$ = nullptr; }
-        | fraction_constants FLOATING_FRACTIONconstant
+        | fraction_constants_opt FLOATING_FRACTIONconstant
                 {
                         Expression * constant = build_field_name_FLOATING_FRACTIONconstant( *$2 );
@@ -2390 +2394 @@
 external_definition_list:
         external_definition
-        | external_definition_list { forall = xxx; } push external_definition
+        | external_definition_list
+                { forall = xxx; }
+          push external_definition
                 { $$ = $1 ? $1->appendList( $4 ) : $4; }
         ;