Changeset 8135d4c for src/Common

Timestamp:

Aug 22, 2017, 7:31:52 PM (8 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:

9aaac6e9

Parents:

fc56cdbf (diff), b3d413b (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' into references

Location:

src/Common

Files:

• CodeLocation.h (added)
• PassVisitor.h (modified) (1 diff)
• SemanticError.h (modified) (2 diffs)
• utility.h (modified) (3 diffs)

src/Common/PassVisitor.h

@@ -1 +1 @@
 #pragma once
+
+// IWYU pragma: private, include "Common/PassVisitor.h"
 
 #include <stack>

src/Common/SemanticError.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:18:59 2017
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 17 14:01:00 2017
+// Update Count     : 7
 //
 
@@ -21 +21 @@
 #include <string>     // for string
 
-#include "utility.h"  // for CodeLocation, toString
+#include "CodeLocation.h"  // for CodeLocation, toString
 
 struct error {

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:19:13 2017
-// Update Count     : 33
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 17 11:38:00 2017
+// Update Count     : 34
 //
 
@@ -27 +27 @@
 
 #include <cassert>
+
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -347 +348 @@
 }
 
-struct CodeLocation {
-        int linenumber;
-        std::string filename;
-
-        /// Create a new unset CodeLocation.
-        CodeLocation()
-                : linenumber( -1 )
-                , filename("")
-        {}
-
-        /// Create a new CodeLocation with the given values.
-        CodeLocation( const char* filename, int lineno )
-                : linenumber( lineno )
-                , filename(filename ? filename : "")
-        {}
-
-        CodeLocation( const CodeLocation& rhs ) = default;
-
-        bool isSet () const {
-                return -1 != linenumber;
-        }
-
-        bool isUnset () const {
-                return !isSet();
-        }
-
-        void unset () {
-                linenumber = -1;
-                filename = "";
-        }
-
-        // Use field access for set.
-};
-
-inline std::string to_string( const CodeLocation& location ) {
-        return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
-}
-
 // Local Variables: //
 // tab-width: 4 //