Changeset 9ed4f94 for src/Common

Timestamp:

Aug 30, 2017, 8:08:01 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

e5fccf4

Parents:

fc1ef62

Message:

update error message printing and add column to parsing errors

Location:

src/Common

Files:

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

src/Common/SemanticError.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 07:21:25 2015
-// Update Count     : 1
+// Last Modified On : Tue Aug 29 18:17:35 2017
+// Update Count     : 3
 //
 
-#include <cstdio>            // for fileno, stderr
-#include <unistd.h>          // for isatty
-#include <iostream>          // for basic_ostream, operator<<, ostream
-#include <list>              // for list, _List_iterator
-#include <string>            // for string, operator<<, operator+, to_string
+#include <cstdio>                                                                               // for fileno, stderr
+#include <unistd.h>                                                                             // for isatty
+#include <iostream>                                                                             // for basic_ostream, operator<<, ostream
+#include <list>                                                                                 // for list, _List_iterator
+#include <string>                                                                               // for string, operator<<, operator+, to_string
 
-#include "Common/utility.h"  // for to_string, CodeLocation (ptr only)
+#include "Common/utility.h"                                                             // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
-
-inline const std::string& error_str() {
-        static std::string str = isatty( fileno(stderr) ) ? "\e[31merror:\e[39m " : "error: ";
-        return str;
-}
 
 SemanticError::SemanticError() {
@@ -49 +44 @@
 void SemanticError::print( std::ostream &os ) {
         using std::to_string;
-        for(auto err : errors) {
-                os << to_string( err.location ) << err.description << '\n';
+        for( auto err : errors ) {
+                os << to_string( err.location ) << err.description << std::endl;
         }
 }

src/Common/SemanticError.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 14:01:00 2017
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Aug 29 22:03:36 2017
+// Update Count     : 17
 //
 
 #pragma once
 
-#include <exception>  // for exception
-#include <iostream>   // for ostream
-#include <list>       // for list
-#include <string>     // for string
+#include <exception>                                                                    // for exception
+#include <iostream>                                                                             // for ostream
+#include <list>                                                                                 // for list
+#include <string>                                                                               // for string
+#include <unistd.h>                                                                             // for isatty
 
-#include "CodeLocation.h"  // for CodeLocation, toString
+#include "CodeLocation.h"                                                               // for CodeLocation, toString
 
 struct error {
@@ -28 +29 @@
 
         error() = default;
-        error( const std::string& str ) : description( str ) {}
+        error( const std::string & str ) : description( str ) {}
 
-        void maybeSet( const CodeLocation& location ) {
+        void maybeSet( const CodeLocation & location ) {
                 if( this->location.linenumber < 0 ) {
                         this->location = location;
@@ -41 +42 @@
         SemanticError();
         SemanticError( std::string error );
-        template< typename T > SemanticError( const std::string &error, const T *obj );
+        template< typename T > SemanticError( const std::string & error, const T * obj );
         ~SemanticError() throw() {}
 
-        void append( SemanticError &other );
+        static inline const std::string & error_str() {
+                static std::string str = isatty( STDERR_FILENO ) ? "\e[31merror:\e[39m " : "error: ";
+                return str;
+        }
+
+        void append( SemanticError & other );
         void append( const std::string & );
         bool isEmpty() const;
-        void print( std::ostream &os );
+        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)
+        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< error > errors;
@@ -57 +63 @@
 
 template< typename T >
-SemanticError::SemanticError( const std::string &error, const T *obj ) {
+SemanticError::SemanticError( const std::string & error, const T * obj ) {
         append( toString( error, obj ) );
 }