Changes in src/Parser/parser.yy [faddbd8:2298f728]

File:

• src/Parser/parser.yy (modified) (6 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 : Wed Oct  5 14:10:46 2016
-// Update Count     : 2002
+// Last Modified On : Sat Sep 24 11:30:40 2016
+// Update Count     : 1991
 //
 
@@ -196 +196 @@
 %type<decl> field_declaration field_declaration_list field_declarator field_declaring_list
 %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
@@ -379 +378 @@
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
-        | postfix_expression '.' INTEGERconstant
         | postfix_expression ARROW no_attr_identifier
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
@@ -392 +390 @@
                 {
                         Token fn;
-                        fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
-                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
+                        fn.str = new string( "?{}" );                           // location undefined
+                        $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) );
                 }
         ;
@@ -415 +413 @@
 
 field:                                                                                                  // CFA, tuple field selector
-        field_name
+        no_attr_identifier
+                { $$ = new ExpressionNode( build_varref( $1 ) ); }
                 // ambiguity with .0 so space required after field-selection, e.g.
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
-                { $$ = new ExpressionNode( build_varref( $1 ) ); }
-        | field_name '.' field
+        | no_attr_identifier '.' field
                 { $$ = new ExpressionNode( build_fieldSel( $3, build_varref( $1 ) ) ); }
-        | field_name '.' '[' push field_list pop ']'
+        | no_attr_identifier '.' '[' push field_list pop ']'
                 { $$ = new ExpressionNode( build_fieldSel( $5, build_varref( $1 ) ) ); }
-        | field_name ARROW field
+        | no_attr_identifier ARROW field
                 { $$ = new ExpressionNode( build_pfieldSel( $3, build_varref( $1 ) ) ); }
-        | field_name ARROW '[' push field_list pop ']'
+        | no_attr_identifier ARROW '[' push field_list pop ']'
                 { $$ = new ExpressionNode( build_pfieldSel( $5, build_varref( $1 ) ) ); }
-        ;
-
-field_name:
-        no_attr_identifier
-        | INTEGERconstant
         ;
 
@@ -2012 +2005 @@
                 {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
-                        linkage = LinkageSpec::linkageCheck( $2 );
+                        linkage = LinkageSpec::fromString( *$2 );
                 }
           '{' external_definition_list_opt '}'                          // C++-style linkage specifier