Changeset ddcedfe for src

Timestamp:

Dec 2, 2020, 1:01:01 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b37515b

Parents:

833ba13

Message:

Errors are now sorted by code-location/description

Location:

src/Common

Files:

• CodeLocation.h (modified) (1 diff)
• SemanticError.cc (modified) (1 diff)

src/Common/CodeLocation.h

@@ -42 +42 @@
         }
 
-        bool followedBy( CodeLocation const & other, int seperation ) {
+        bool startsBefore( CodeLocation const & other ) const {
+                if( filename < other.filename ) return true;
+                if( filename > other.filename ) return false;
+
+                if( first_line < other.first_line ) return true;
+                if( first_line > other.first_line ) return false;
+
+                if( last_line < other.last_line ) return true;
+                return false;
+        }
+
+        bool followedBy( CodeLocation const & other, int seperation ) const {
                 return (first_line + seperation == other.first_line &&
                         filename == other.filename);
         }
 
-        bool operator==( CodeLocation const & other ) {
+        bool operator==( CodeLocation const & other ) const {
                 return followedBy( other, 0 );
         }
 
-        bool operator!=( CodeLocation const & other ) {
+        bool operator!=( CodeLocation const & other ) const {
                 return !(*this == other);
         }

src/Common/SemanticError.cc

@@ -90 +90 @@
 void SemanticErrorException::print() {
         using std::to_string;
+
+        errors.sort([](const error & lhs, const error & rhs) -> bool {
+                if(lhs.location.startsBefore(rhs.location)) return true;
+                if(rhs.location.startsBefore(lhs.location)) return false;
+
+                return lhs.description < rhs.description;
+        });
+
         for( auto err : errors ) {
                 std::cerr << ErrorHelpers::bold() << err.location << ErrorHelpers::error_str() << ErrorHelpers::reset_font() << err.description << std::endl;