Changeset 235b41f for src/Parser/parser.yy

Timestamp:

Sep 5, 2017, 3:41:04 PM (8 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:

416cc86

Parents:

800d275 (diff), 3f8dd01 (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) (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 : Mon Aug 28 13:24:10 2017
-// Update Count     : 2720
+// Last Modified On : Sun Sep  3 20:43:19 2017
+// Update Count     : 2742
 //
 
@@ -48 +48 @@
 #include <cstdio>
 #include <stack>
+using namespace std;
+
 #include "ParseNode.h"
 #include "TypedefTable.h"
 #include "TypeData.h"
 #include "LinkageSpec.h"
-using namespace std;
+#include "Common/SemanticError.h"                                               // error_str
 
 extern DeclarationNode * parseTree;
@@ -98 +100 @@
         StatementNode * sn;
         WaitForStmt * wfs;
-        ConstantExpr * constant;
+        Expression * constant;
         IfCtl * ifctl;
         ForCtl * fctl;
@@ -534 +536 @@
                                 $$ = new ExpressionNode( build_unary_val( $1, $2 ) );
                                 break;
+                          case OperKinds::And:
+                                $$ = new ExpressionNode( new AddressExpr( build_addressOf( $2 ) ) );
+                                break;
                           default:
                                 assert( false );
@@ -560 +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 ) ); }
         ;
 
@@ -3133 +3136 @@
 // ----end of grammar----
 
-extern char *yytext;
-
-void yyerror( const char * ) {
-        if ( yyfilename ) {
-                cout << yyfilename << ":";
-        } // if
-        cout << yylineno << ":1 syntax error at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << endl;
-}
-
 // Local Variables: //
 // mode: c++ //