Fixing "set key not found in map" error

Author: Christine Zhou

Src/PChecker/CheckerCore/PRuntime/Values/PrtSet.cs

@@ -37,6 +37,19 @@ private bool IsDirty
             }
         }
 
+        public override int GetHashCode()
+        {
+            if (!IsDirty)
+            {
+                return hashCode;
+            }
+
+            hashCode = ComputeHashCode();
+            IsDirty = false;
+
+            return hashCode;
+        }
+
         public IEnumerator<IPrtValue> GetEnumerator()
         {
             return set.GetEnumerator();

Src/PCompiler/CompilerCore/TypeChecker/Scope.cs

@@ -1,5 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using Antlr4.Runtime;
 using Plang.Compiler.TypeChecker.AST;
@@ -603,7 +605,7 @@ public SafetyTest Put(string name, PParser.SafetyTestDeclContext tree)
             string filePath = config.LocationResolver.GetLocation(tree).File.FullName;
             foreach (var dependencyPath in config.ProjectDependencies)
             {
-                if (filePath.StartsWith(dependencyPath))
+                if (filePath.StartsWith($"{dependencyPath}{Path.DirectorySeparatorChar}"))
                 {
                     return null;
                 }

Tst/RegressionTests/Integration/Correct/TestMapSet/TestMapSet.p

@@ -0,0 +1,29 @@
+  // Recreating set in map error
+
+machine Main
+{
+  start state Init {
+    entry {
+      ReplicateMapSet();
+    }
+  }
+}
+
+fun ReplicateMapSet()
+{
+  var seqmap: map[seq[int], int]; // Creating example for comparison
+  var mapmap: map[map[int, int], int];
+  var setmap: map[set[int], int]; 
+
+  seqmap[default(seq[int])] = 0;
+  mapmap[default(map[int,int])] = 1;
+  setmap[default(set[int])] = 2;
+
+  print format("seqmap: {0}", seqmap[default(seq[int])]);
+  print format("mapmap: {0}", mapmap[default(map[int,int])]);
+  print format("setmap: {0}", setmap[default(set[int])]);
+}
+
+// module TestMapSet = { TestMapSet };
+
+// test tcMapSet [main=TestMapSet]: TestMapSet;