Changeset f980549 for src/Parser

Timestamp:

Sep 20, 2017, 12:24:45 PM (7 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:

b18830e

Parents:

764e009 (diff), 47b5b63 (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

Location:

src/Parser

Files:

• ParseNode.h (modified) (2 diffs)
• lex.ll (modified) (1 diff)
• parser.yy (modified) (2 diffs)

src/Parser/ParseNode.h

@@ -44 +44 @@
 //##############################################################################
 
+typedef CodeLocation YYLTYPE;
+#define YYLTYPE_IS_DECLARED 1 /* alert the parser that we have our own definition */
+
 extern char * yyfilename;
 extern int yylineno;
+extern YYLTYPE yylloc;
 
 class ParseNode {
@@ -73 +77 @@
         ParseNode * next = nullptr;
         std::string * name = nullptr;
-        CodeLocation location = { yyfilename, yylineno };
+        CodeLocation location = yylloc;
 }; // ParseNode
 

src/Parser/lex.ll

@@ -26 +26 @@
 
 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
+#define YY_USER_ACTION yylloc.first_line = yylineno; yylloc.first_column = column; column += yyleng; yylloc.last_column = column; yylloc.last_line = yylineno; yylloc.filename = yyfilename ? yyfilename : "";                          // trigger before each matching rule's action
 
 #include <string>

src/Parser/parser.yy

@@ -116 +116 @@
 
 bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
+
+# define YYLLOC_DEFAULT(Cur, Rhs, N)                            \
+do                                                              \
+        if (N) {                                                      \
+                (Cur).first_line   = YYRHSLOC(Rhs, 1).first_line;           \
+                (Cur).first_column = YYRHSLOC(Rhs, 1).first_column;         \
+                (Cur).last_line    = YYRHSLOC(Rhs, N).last_line;            \
+                (Cur).last_column  = YYRHSLOC(Rhs, N).last_column;          \
+                (Cur).filename     = YYRHSLOC(Rhs, 1).filename;             \
+        } else {                                                      \
+                (Cur).first_line   = (Cur).last_line   =                    \
+                        YYRHSLOC(Rhs, 0).last_line;                               \
+                (Cur).first_column = (Cur).last_column =                    \
+                        YYRHSLOC(Rhs, 0).last_column;                             \
+                (Cur).filename     = YYRHSLOC(Rhs, 0).filename;             \
+        }                                                             \
+while (0)
 %}
 
@@ -346 +363 @@
 %precedence ELSE        // token precedence for start of else clause in IF/WAITFOR statement
 
+%locations
 
 %start translation_unit                                                                 // parse-tree root