Changes in src/Common/CodeLocation.h [d48e529:b128d3e]

File:

• src/Common/CodeLocation.h (modified) (4 diffs)

src/Common/CodeLocation.h

@@ -16 +16 @@
 #pragma once
 
-#include <iostream>
 #include <string>
 
 struct CodeLocation {
-        int first_line = -1, first_column = -1, last_line = -1, last_column = -1;
-        std::string filename = "";
+        int linenumber;
+        std::string filename;
 
         /// Create a new unset CodeLocation.
-        CodeLocation() = default;
+                CodeLocation()
+                : linenumber( -1 )
+                , filename("")
+        {}
 
         /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
-                : first_line( lineno )
+                : linenumber( lineno )
                 , filename(filename ? filename : "")
         {}
@@ -35 +37 @@
 
         bool isSet () const {
-                return -1 != first_line;
+                return -1 != linenumber;
         }
 
@@ -42 +44 @@
         }
 
+        void unset () {
+                linenumber = -1;
+                filename = "";
+        }
+
+        // Use field access for set.
+
         bool followedBy( CodeLocation const & other, int seperation ) {
-                return (first_line + seperation == other.first_line &&
+                return (linenumber + seperation == other.linenumber &&
                         filename == other.filename);
         }
@@ -56 +65 @@
 };
 
-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;
+inline std::string to_string( const CodeLocation& location ) {
+    // Column number ":1" allows IDEs to parse the error message and position the cursor in the source text.
+    return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + ":1 " : "";
 }
+