Code changes to accommodate the compiler

usethesource · Feb 7, 2024 · 8e0f7b2 · 8e0f7b2
1 parent b6847c4
commit 8e0f7b2
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/org/rascalmpl/library/Location.rsc b/src/org/rascalmpl/library/Location.rsc
@@ -77,13 +77,17 @@ Strict containment between two locations `inner` and `outer` holds when
 }
 
 bool isStrictlyContainedIn(loc inner, loc outer){
+    if(inner == outer){
+        return false;
+    }
     if(isSameFile(inner, outer)){
        if(inner.offset?){
-          return outer.offset? ==> (  inner.offset == outer.offset && inner.offset + inner.length <  outer.offset + outer.length
-                                   || inner.offset >  outer.offset && inner.offset + inner.length <= outer.offset + outer.length
-                                   );
-       } else {
-         return inner.offset > 0 && !outer.offset?;
+          if(outer.offset?){
+            return    inner.offset == outer.offset && inner.offset + inner.length <  outer.offset + outer.length
+                   || inner.offset >  outer.offset && inner.offset + inner.length <= outer.offset + outer.length;
+          } else {
+            return inner.offset > 0;
+          }
        }
     }
     return false;
@@ -102,7 +106,11 @@ Containment between two locations `inner` and `outer` holds when
 bool isContainedIn(loc inner, loc outer){
     if(isSameFile(inner, outer)){
        if(inner.offset?){
-          return outer.offset? ==> (inner.offset >= outer.offset && inner.offset + inner.length <= outer.offset + outer.length);
+          if(outer.offset?){
+            return (inner.offset >= outer.offset && inner.offset + inner.length <= outer.offset + outer.length);
+          } else {
+            return true;
+          }
        } else {
          return !outer.offset?;
        }