Changeset 138e29e

Timestamp:

Feb 14, 2017, 3:53:52 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

9bb90a86

Parents:

294647b

Message:

Implemented filename and linenumber errors in most cases, only missing constructor errors apparently

Location:

src

Files:

• Common/SemanticError.cc (modified) (2 diffs)
• Common/SemanticError.h (modified) (2 diffs)
• Common/utility.h (modified) (1 diff)
• GenPoly/Box.cc (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/Type.h (modified) (1 diff)
• SynTree/Visitor.h (modified) (2 diffs)

src/Common/SemanticError.cc

@@ -22 +22 @@
 #include "SemanticError.h"
 
+#include <unistd.h>
+
+inline const std::string& error_str() {
+        static std::string str = isatty( fileno(stderr) ) ? "\e[31merror:\e[39m " : "error: ";
+        return str;
+}
+
 SemanticError::SemanticError() {
 }
 
 SemanticError::SemanticError( std::string error ) {
-  append( error );
+        append( error );
 }
 
 void SemanticError::append( SemanticError &other ) {
-  errors.splice( errors.end(), other.errors );
+        errors.splice( errors.end(), other.errors );
 }
 
 void SemanticError::append( const std::string & msg ) {
-  using std::to_string;
-  const std::string loc = location.linenumber >= 0 ? "At \"" + to_string(location) + "\" " : "";
-  errors.push_back( loc + "Error: " + msg );
+        errors.emplace_back( error_str() + msg );
 }
 
@@ -44 +49 @@
 
 void SemanticError::print( std::ostream &os ) {
-        std::copy( errors.begin(), errors.end(), std::ostream_iterator< std::string >( os, "\n" ) );
+        using std::to_string;
+        for(auto err : errors) {
+                os << to_string( err.location ) << err.description << '\n';
+        }
 }
 
 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());
+        errors.begin()->maybeSet( location );
 }
 

src/Common/SemanticError.h

@@ -25 +25 @@
 #include "utility.h"
 
+struct error {
+        std::string description;
+        CodeLocation location;
+
+        error() = default;
+        error( const std::string& str ) : description( str ) {}
+
+        void maybeSet( const CodeLocation& location ) {
+                if( this->location.linenumber < 0 ) {
+                        this->location = location;
+                }
+        }
+};
+
 class SemanticError : public std::exception {
   public:
@@ -41 +55 @@
         // representation of the obj (T must have a print method)
   private:
-        std::list< std::string > errors;
-        CodeLocation location;
+        std::list< error > errors;
 };
 

src/Common/utility.h

@@ -320 +320 @@
 
 inline std::string to_string( const CodeLocation& location ) {
-        return location.filename + ":" + std::to_string(location.linenumber);
+        return location.linenumber >= 0 ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
 }
 #endif // _UTILITY_H

src/GenPoly/Box.cc

@@ -236 +236 @@
                                 } // if
                         } catch( SemanticError &e ) {
+                                e.set_location( (*i)->location );
                                 errors.append( e );
                         } // try

src/InitTweak/FixInit.cc

@@ -313 +313 @@
                                         translationUnit.splice( i, fixer.staticDtorDecls );
                                 } catch( SemanticError &e ) {
+                                        e.set_location( (*i)->location );
                                         errors.append( e );
                                 } // try

src/Parser/DeclarationNode.cc

@@ -988 +988 @@
                         * out++ = cur->buildType();
                 } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
                         errors.append( e );
                 } // try

src/ResolvExpr/Resolver.cc

@@ -86 +86 @@
                 Resolver resolver;
                 acceptAll( translationUnit, resolver );
-#if 0
-                resolver.print( cerr );
-                for ( std::list< Declaration * >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
-                        (*i)->print( std::cerr );
-                        (*i)->accept( resolver );
-                } // for
-#endif
         }
 

src/SynTree/Mutator.h

@@ -139 +139 @@
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 } // try

src/SynTree/Type.h

@@ -17 +17 @@
 #define TYPE_H
 
+#include "BaseSyntaxNode.h"
+#include "Mutator.h"
 #include "SynTree.h"
 #include "Visitor.h"
-#include "Mutator.h"
 #include "Common/utility.h"
 
-class Type {
+class Type : public BaseSyntaxNode {
   public:
         struct Qualifiers {

src/SynTree/Visitor.h

@@ -133 +133 @@
                         }
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
                         errors.append( e );
                 }
@@ -159 +160 @@
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );                       
                         errors.append( e );
                 } // try