Changeset d48e529

Timestamp:

Sep 19, 2017, 1:22:51 PM (7 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:

a9a4771

Parents:

4e8949f

Message:

Begin to introduce support for yylloc in the parser and extend CodeLocation? to include start column and end column/line number information

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• Common/CodeLocation.h (modified) (4 diffs)
• Common/SemanticError.h (modified) (1 diff)
• ControlStruct/ExceptTranslate.cc (modified) (2 diffs)
• Parser/ParseNode.h (modified) (2 diffs)
• Parser/lex.ll (modified) (1 diff)
• Parser/parser.yy (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -89 +89 @@
                 } else if ( currentLocation.followedBy( to, 1 ) ) {
                         output << "\n" << indent;
-                        currentLocation.linenumber += 1;
+                        currentLocation.first_line += 1;
                 } else if ( currentLocation.followedBy( to, 2 ) ) {
                         output << "\n\n" << indent;
-                        currentLocation.linenumber += 2;
-                } else {
-                        output << "\n# " << to.linenumber << " \"" << to.filename
+                        currentLocation.first_line += 2;
+                } else {
+                        output << "\n# " << to.first_line << " \"" << to.filename
                                << "\"\n" << indent;
                         currentLocation = to;

src/Common/CodeLocation.h

@@ -20 +20 @@
 
 struct CodeLocation {
-        int linenumber;
-        std::string filename;
+        int first_line = -1, first_column = -1, last_line = -1, last_column = -1;
+        std::string filename = "";
 
         /// Create a new unset CodeLocation.
-                CodeLocation()
-                : linenumber( -1 )
-                , filename("")
-        {}
+        CodeLocation() = default;
 
         /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
-                : linenumber( lineno )
+                : first_line( lineno )
                 , filename(filename ? filename : "")
         {}
@@ -38 +35 @@
 
         bool isSet () const {
-                return -1 != linenumber;
+                return -1 != first_line;
         }
 
@@ -46 +43 @@
 
         bool followedBy( CodeLocation const & other, int seperation ) {
-                return (linenumber + seperation == other.linenumber &&
+                return (first_line + seperation == other.first_line &&
                         filename == other.filename);
         }
@@ -61 +58 @@
 inline std::ostream & operator<<( std::ostream & out, const CodeLocation & location ) {
         // Column number ":1" allows IDEs to parse the error message and position the cursor in the source text.
-        return location.isSet() ? out << location.filename << ":" << location.linenumber << ":1 " : out;
+        return location.isSet() ? out << location.filename << ":" << location.first_line << ":1 " : out;
 }

src/Common/SemanticError.h

@@ -32 +32 @@
 
         void maybeSet( const CodeLocation & location ) {
-                if( this->location.linenumber < 0 ) {
+                if( this->location.isUnset() ) {
                         this->location = location;
                 }

src/ControlStruct/ExceptTranslate.cc

@@ -622 +622 @@
                                 assertf(false, "Invalid throw in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
-                                        throwStmt->location.linenumber);
+                                        throwStmt->location.first_line);
                                 return nullptr;
                         }
@@ -633 +633 @@
                                 assertf(false, "Invalid throwResume in %s at %i\n",
                                         throwStmt->location.filename.c_str(),
-                                        throwStmt->location.linenumber);
+                                        throwStmt->location.first_line);
                                 return nullptr;
                         }

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