Changeset 80ac42d

Timestamp:

Sep 18, 2017, 4:56:22 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:

4e8949f

Parents:

698ec72

Message:

Begin to clean up CodeLocations?

Location:

src

Files:

• CodeTools/TrackLoc.cc (modified) (2 diffs)
• Common/CodeLocation.h (modified) (3 diffs)
• Common/SemanticError.cc (modified) (1 diff)

src/CodeTools/TrackLoc.cc

@@ -33 +33 @@
 
 namespace CodeTools {
-
-        std::ostream & operator<<(std::ostream & out, CodeLocation const & loc) {
-                return out << loc.filename << '[' << loc.linenumber << ']';
-        }
-
         class LocationPrinter {
                 size_t printLevel;
@@ -95 +90 @@
                 acceptAll( translationUnit, printer );
         }
-
 } // namespace CodeTools
 

src/Common/CodeLocation.h

@@ -16 +16 @@
 #pragma once
 
+#include <iostream>
 #include <string>
 
@@ -44 +45 @@
         }
 
-        void unset () {
-                linenumber = -1;
-                filename = "";
-        }
-
-        // Use field access for set.
-
         bool followedBy( CodeLocation const & other, int seperation ) {
                 return (linenumber + seperation == other.linenumber &&
@@ -65 +59 @@
 };
 
-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 " : "";
+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;
 }
-

src/Common/SemanticError.cc

@@ -45 +45 @@
         using std::to_string;
         for( auto err : errors ) {
-                os << to_string( err.location ) << err.description << std::endl;
+                os << err.location << err.description << std::endl;
         }
 }