Changeset 58fe85a for src/Common/CodeLocation.h

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 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:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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 park_unpark

File:

• src/Common/CodeLocation.h (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);
         }