Changeset cce7872 for src/Parser/parser.yy

Timestamp:

Feb 11, 2016, 3:28:27 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

bed4d37c

Parents:

98735ef (diff), 52f85e0 (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) (4 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 : Mon Feb  1 13:51:20 2016
-// Update Count     : 1481
+// Last Modified On : Mon Feb  1 18:22:42 2016
+// Update Count     : 1483
 // 
 
@@ -319 +319 @@
         ;
 
-// no zero_one because ambiguity with 0.0 : double constant or field selection
 no_attr_identifier:
         IDENTIFIER
+        | zero_one                                                                                      // CFA
         ;
 
@@ -357 +357 @@
         | postfix_expression '(' argument_expression_list ')'
                 { $$ = new CompositeExprNode( $1, $3 ); }
+        // ambiguity with .0 so space required after field-selection, e.g.
+                //   struct S { int 0, 1; } s; s. 0 = 0; s. 1 = 1;
         | postfix_expression '.' no_attr_identifier
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), $1, new VarRefNode( $3 )); }
@@ -405 +407 @@
         no_attr_identifier
                 { $$ = new VarRefNode( $1 ); }
+        // 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 CompositeExprNode( new OperatorNode( OperatorNode::FieldSel ), new VarRefNode( $1 ), $3 ); }