Changeset d1f5054 for src/Common

Timestamp:

Aug 14, 2024, 11:55:20 AM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

960665c

Parents:

26d40a1 (diff), 2870cb6 (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/Common

Files:

• CodeLocation.hpp (modified) (3 diffs)
• Symbol.cpp (added)
• Symbol.hpp (added)
• module.mk (modified) (1 diff)

src/Common/CodeLocation.hpp

@@ -17 +17 @@
 
 #include <iostream>
-#include <string>
+#include "Symbol.hpp"
 
 struct CodeLocation {
         int first_line = -1, first_column = -1, last_line = -1, last_column = -1;
-        std::string filename = "";
+        Symbol filename = "";
 
         /// Create a new unset CodeLocation.
@@ -46 +46 @@
 
         bool startsBefore( CodeLocation const & other ) const {
-                if( filename < other.filename ) return true;
-                if( filename > other.filename ) return false;
+                if( filename.str() < other.filename.str() ) return true;
+                if( filename.str() > other.filename.str() ) return false;
 
                 if( first_line < other.first_line ) return true;
@@ -72 +72 @@
 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.first_line << ":1 " : out;
+        return location.isSet() ? out << location.filename.str() << ":" << location.first_line << ":1 " : out;
 }

src/Common/module.mk

@@ -48 +48 @@
         Common/Stats/Time.cpp \
         Common/Stats/Time.hpp \
+        Common/Symbol.cpp \
+        Common/Symbol.hpp \
         Common/ToString.hpp \
         Common/UniqueName.cpp \