Changeset ab84e8a for src/Parser/parser.yy

Timestamp:

Oct 19, 2016, 3:32:40 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

2b93c5a

Parents:

b512454 (diff), d58a39a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (5 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 : Sat Sep 24 12:16:53 2016
-// Update Count     : 1992
+// Last Modified On : Wed Oct  5 14:10:46 2016
+// Update Count     : 2002
 //
 
@@ -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
@@ -378 +379 @@
                 { $$ = 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 ) ) ); }
@@ -413 +415 @@
 
 field:                                                                                                  // CFA, tuple field selector
-        no_attr_identifier
-                { $$ = new ExpressionNode( build_varref( $1 ) ); }
+        field_name
                 // ambiguity with .0 so space required after field-selection, e.g.
                 //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
-        | no_attr_identifier '.' field
+                { $$ = new ExpressionNode( build_varref( $1 ) ); }
+        | field_name '.' field
                 { $$ = new ExpressionNode( build_fieldSel( $3, build_varref( $1 ) ) ); }
-        | no_attr_identifier '.' '[' push field_list pop ']'
+        | field_name '.' '[' push field_list pop ']'
                 { $$ = new ExpressionNode( build_fieldSel( $5, build_varref( $1 ) ) ); }
-        | no_attr_identifier ARROW field
+        | field_name ARROW field
                 { $$ = new ExpressionNode( build_pfieldSel( $3, build_varref( $1 ) ) ); }
-        | no_attr_identifier ARROW '[' push field_list pop ']'
+        | field_name ARROW '[' push field_list pop ']'
                 { $$ = new ExpressionNode( build_pfieldSel( $5, build_varref( $1 ) ) ); }
+        ;
+
+field_name:
+        no_attr_identifier
+        | INTEGERconstant
         ;
 
@@ -2005 +2012 @@
                 {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
-                        linkage = LinkageSpec::fromString( *$2 );
+                        linkage = LinkageSpec::linkageCheck( $2 );
                 }
           '{' external_definition_list_opt '}'                          // C++-style linkage specifier