Changeset 294647b for src/Common

Timestamp:

Feb 14, 2017, 2:54:51 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

138e29e

Parents:

eafb094

Message:

Filename and linenumber handling for parsing errors

Location:

src/Common

Files:

• SemanticError.cc (modified) (2 diffs)
• SemanticError.h (modified) (2 diffs)
• utility.h (modified) (2 diffs)

src/Common/SemanticError.cc

@@ -34 +34 @@
 
 void SemanticError::append( const std::string & msg ) {
-  errors.push_back( std::string( "Error: ") + msg );
+  using std::to_string;
+  const std::string loc = location.linenumber >= 0 ? "At \"" + to_string(location) + "\" " : "";
+  errors.push_back( loc + "Error: " + msg );
 }
 
@@ -45 +47 @@
 }
 
+void SemanticError::set_location( const CodeLocation& location ) {
+  this->location = location;
+  using std::to_string;
+  const std::string loc = location.linenumber >= 0 ? "At \"" + to_string(location) + "\" " : "";
+  auto& error = *errors.begin();
+  error.insert( 0, loc.c_str());
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/Common/SemanticError.h

@@ -23 +23 @@
 #include <iostream>
 
+#include "utility.h"
+
 class SemanticError : public std::exception {
   public:
@@ -35 +37 @@
         void print( std::ostream &os );
 
+        void set_location( const CodeLocation& location );
         // constructs an exception using the given message and the printed
         // representation of the obj (T must have a print method)
   private:
         std::list< std::string > errors;
+        CodeLocation location;
 };
 

src/Common/utility.h

@@ -25 +25 @@
 #include <sstream>
 #include <string>
+
 #include <cassert>
-
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -303 +303 @@
         return group_iterate_t<Args...>(args...);
 }
+
+struct CodeLocation {
+        int linenumber;
+        std::string filename;
+
+        CodeLocation() 
+                : linenumber( -1 )
+                , filename("")
+        {}
+
+        CodeLocation( const char* filename, int lineno )
+                : linenumber( lineno )
+                , filename(filename ? filename : "")
+        {}
+};
+
+inline std::string to_string( const CodeLocation& location ) {
+        return location.filename + ":" + std::to_string(location.linenumber);
+}
 #endif // _UTILITY_H