Changeset d48e529 for src/Common

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/Common

Files:

• CodeLocation.h (modified) (4 diffs)
• SemanticError.h (modified) (1 diff)

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;
                 }