Changeset dbc733e for src/Parser

Timestamp:

Sep 1, 2017, 9:53:19 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

f43df73

Parents:

ba2a68b (diff), b0dfbc4 (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 plg2:software/cfa/cfa-cc

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (3 diffs)
• ParseNode.h (modified) (1 diff)
• parser.yy (modified) (2 diffs)

src/Parser/ExpressionNode.cc

@@ -230 +230 @@
         //      ret = new UntypedExpr( new NameExpr( units ), { ret } );
         // } // if
-                
+
         delete &str;                                                                            // created by lex
         return ret;
@@ -282 +282 @@
 } // build_varref
 
-
+// TODO: get rid of this and OperKinds and reuse code from OperatorTable
 static const char * OperName[] = {                                              // must harmonize with OperKinds
         // diadic
@@ -290 +290 @@
         "?[?]", "...",
         // monadic
-        "+?", "-?", "AddressOf", "*?", "!?", "~?", "++?", "?++", "--?", "?--", "&&"
+        "+?", "-?", "AddressOf", "*?", "!?", "~?", "++?", "?++", "--?", "?--",
 }; // OperName
 

src/Parser/ParseNode.h

@@ -154 +154 @@
         Index, Range,
         // monadic
-        UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress,
+        UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost,
         Ctor, Dtor,
 }; // OperKinds

src/Parser/parser.yy

@@ -536 +536 @@
                                 $$ = new ExpressionNode( build_unary_val( $1, $2 ) );
                                 break;
+                          case OperKinds::And:
+                                $$ = new ExpressionNode( new AddressExpr( build_addressOf( $2 ) ) );
+                                break;
                           default:
                                 assert( false );
@@ -562 +565 @@
         | ATTR_IDENTIFIER '(' type ')'
                 { $$ = new ExpressionNode( build_attrtype( build_varref( $1 ), $3 ) ); }
-//      | ANDAND IDENTIFIER                                                                     // GCC, address of label
-//              { $$ = new ExpressionNode( new OperatorNode( OperKinds::LabelAddress ), new ExpressionNode( build_varref( $2 ) ); }
         ;