Changeset d41280e for src/Parser/parser.yy

Timestamp:

Feb 8, 2016, 10:07:42 AM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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

Children:

c44e622

Parents:

00ede9e (diff), bd85400 (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' into gc_noraii

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 : Thu Oct  8 17:17:54 2015
-// Update Count     : 1473
+// Last Modified On : Mon Feb  1 18:22:42 2016
+// Update Count     : 1483
 // 
 
@@ -78 +78 @@
 %token ENUM STRUCT UNION
 %token TYPE FTYPE DTYPE CONTEXT                                                 // CFA
-%token SIZEOF
+%token SIZEOF OFFSETOF
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
@@ -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 ); }
@@ -443 +447 @@
         | SIZEOF '(' type_name_no_function ')'
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( $3 )); }
+        | OFFSETOF '(' type_name_no_function ',' no_attr_identifier ')'
+        { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( $3 ), new VarRefNode( $5 )); }
         | ATTR_IDENTIFIER
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 )); }