Changeset f1ee72e for src/Parser/parser.yy

Timestamp:

Jun 23, 2016, 12:23:00 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

4d3ca1d8

Parents:

c2931ea (diff), d56c05d0 (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 ctor

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 : Mon Jun 13 15:00:23 2016
-// Update Count     : 1578
+// Last Modified On : Wed Jun 22 21:20:17 2016
+// Update Count     : 1584
 //
 
@@ -31 +31 @@
 // two levels of extensions. The first extensions cover most of the GCC C extensions, except for:
 //
-// 1. nested functions
-// 2. generalized lvalues
-// 3. designation with and without '=' (use ':' instead)
-// 4. attributes not allowed in parenthesis of declarator
+// 1. designation with and without '=' (use ':' instead)
+// 2. attributes not allowed in parenthesis of declarator
 //
 // All of the syntactic extensions for GCC C are marked with the comment "GCC". The second extensions are for Cforall
@@ -79 +77 @@
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
-%token OTYPE FTYPE DTYPE TRAIT                                          // CFA
+%token OTYPE FTYPE DTYPE TRAIT                                                  // CFA
 %token SIZEOF OFFSETOF
 %token ATTRIBUTE EXTENSION                                                              // GCC
@@ -106 +104 @@
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
 
-%token ATassign         REFassign                                                       // @=   :=
+%token ATassign                                                                                 // @=
 
 // Types declaration
@@ -577 +575 @@
         | unary_expression '=' assignment_expression
                 { $$ =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), $1, $3 ); }
-        | unary_expression REFassign assignment_expression
-                { $$ =new CompositeExprNode( new OperatorNode( OperatorNode::Assign ), $1, $3 ); } // FIX ME
         | unary_expression assignment_operator assignment_expression
                 { $$ =new CompositeExprNode( $2, $1, $3 ); }