Changeset fbcb354 for src/Parser

Timestamp:

Aug 31, 2017, 3:33:11 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

058f549

Parents:

326338ae (diff), 2ad507b8 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/Parser

Files:

• StatementNode.cc (modified) (2 diffs)
• lex.ll (modified) (8 diffs)
• parser.yy (modified) (3 diffs)

src/Parser/StatementNode.cc

@@ -212 +212 @@
         WaitForStmt::Target target;
         target.function = maybeBuild<Expression>( targetExpr );
-        buildMoveList< Expression >( targetExpr, target.arguments );
+
+        ExpressionNode * next = dynamic_cast<ExpressionNode *>( targetExpr->get_next() );
+        targetExpr->set_next( nullptr );
+        buildMoveList< Expression >( next, target.arguments );
+
         delete targetExpr;
 
@@ -226 +230 @@
 WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when, WaitForStmt * node ) {
         WaitForStmt::Target target;
-
         target.function = maybeBuild<Expression>( targetExpr );
-        buildMoveList< Expression >( targetExpr, target.arguments );
+
+        ExpressionNode * next = dynamic_cast<ExpressionNode *>( targetExpr->get_next() );
+        targetExpr->set_next( nullptr );
+        buildMoveList< Expression >( next, target.arguments );
+
         delete targetExpr;
 

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Tue Aug 22 22:43:39 2017
- * Update Count     : 558
+ * Last Modified On : Wed Aug 30 17:35:21 2017
+ * Update Count     : 584
  */
 
@@ -19 +19 @@
 
 %{
-// This lexer assumes the program has been preprocessed by cpp. Hence, all user level preprocessor directive have been
+// The lexer assumes the program has been preprocessed by cpp. Hence, all user level preprocessor directive have been
 // performed and removed from the source. The only exceptions are preprocessor directives passed to the compiler (e.g.,
 // line-number directives) and C/C++ style comments, which are ignored.
@@ -25 +25 @@
 //**************************** Includes and Defines ****************************
 
+unsigned int column = 0;                                                                // position of the end of the last token parsed
+#define YY_USER_ACTION column += yyleng;                                // trigger before each matching rule's action
+
 #include <string>
 #include <cstdio>                                                                               // FILENAME_MAX
+using namespace std;
 
 #include "ParseNode.h"
@@ -32 +36 @@
 
 char *yyfilename;
-std::string *strtext;                                                                   // accumulate parts of character and string constant value
+string *strtext;                                                                                // accumulate parts of character and string constant value
 
 #define RETURN_LOCN(x)          yylval.tok.loc.file = yyfilename; yylval.tok.loc.line = yylineno; return( x )
-#define RETURN_VAL(x)           yylval.tok.str = new std::string( yytext ); RETURN_LOCN( x )
+#define RETURN_VAL(x)           yylval.tok.str = new string( yytext ); RETURN_LOCN( x )
 #define RETURN_CHAR(x)          yylval.tok.str = nullptr; RETURN_LOCN( x )
 #define RETURN_STR(x)           yylval.tok.str = strtext; RETURN_LOCN( x )
 
 #define WHITE_RETURN(x)         // do nothing
-#define NEWLINE_RETURN()        WHITE_RETURN( '\n' )
+#define NEWLINE_RETURN()        column = 0; WHITE_RETURN( '\n' )
 #define ASCIIOP_RETURN()        RETURN_CHAR( (int)yytext[0] ) // single character operator
 #define NAMEDOP_RETURN(x)       RETURN_CHAR( x )                        // multichar operator, with a name
@@ -154 +158 @@
                 memcpy( &filename, begin_string + 1, length );  // copy file name from yytext
                 filename[ length ] = '\0';                                              // terminate string with sentinel
-                //std::cout << "file " << filename << " line " << lineno << std::endl;
+                //cout << "file " << filename << " line " << lineno << endl;
                 yylineno = lineno;
                 yyfilename = filename;
@@ -302 +306 @@
 
                                 /* character constant, allows empty value */
-({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
+({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
 <QUOTE>['\n]    { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
@@ -308 +312 @@
 
                                 /* string constant */
-({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new std::string( yytext, yyleng ); }
+({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
 <STRING>["\n]   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
@@ -422 +426 @@
 }
 
-                                /* unknown characters */
-.                               { printf("unknown character(s):\"%s\" on line %d\n", yytext, yylineno); }
+                                /* unknown character */
+.                               { yyerror( "unknown character" ); }
 
 %%
+// ----end of lexer----
+
+void yyerror( const char * errmsg ) {
+        cout << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
+                 << ": " << SemanticError::error_str() << errmsg << " at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
+}
 
 // Local Variables: //

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 26 17:50:19 2017
-// Update Count     : 2712
+// Last Modified On : Wed Aug 30 07:04:19 2017
+// Update Count     : 2740
 //
 
@@ -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;
@@ -3133 +3135 @@
 // ----end of grammar----
 
-extern char *yytext;
-
-void yyerror( const char * ) {
-        cout << "Error ";
-        if ( yyfilename ) {
-                cout << "in file " << yyfilename << " ";
-        } // if
-        cout << "at line " << yylineno << " reading token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << "\"" << endl;
-}
-
 // Local Variables: //
 // mode: c++ //