More bugfixes in ST, changes to scoping

1 files changed, 15 insertions, 10 deletions

diff --git a/stTest.java b/stTest.java
index 793719f..b6fd7ae 100644
--- a/stTest.java
+++ b/stTest.java
@@ -73,18 +73,23 @@ public class stTest {
         System.out.println(symt.getClass("Fac").getExtend() == exts_fac);
         System.out.println(symt.getClass("Fac2").getExtend() == exts_fac2);
 
-        AbstractInstance scope_main = symt.getClass("Factorial");
-        AbstractInstance scope_computefac = symt.getClass("Fac");
-        AbstractInstance scope_uselessvar = symt.getClass("Fac");
-        AbstractInstance scope_num = symt.getMethod("ComputeFac");
-        AbstractInstance scope_numaux = symt.getMethod("ComputeFac");
+        ArrayList<AbstractInstance> scope_main = new ArrayList<>();
+        scope_main.add(symt.getClass("Factorial"));
+        ArrayList<AbstractInstance> scope_computefac = new ArrayList<>();
+        scope_computefac.add(symt.getClass("Fac"));
+        ArrayList<AbstractInstance> scope_uselessvar = new ArrayList<>();
+        scope_uselessvar.add(symt.getClass("Fac"));
+        ArrayList<AbstractInstance> scope_num = new ArrayList<>();
+        scope_num.add(symt.getMethod("ComputeFac"));
+        ArrayList<AbstractInstance> scope_numaux = new ArrayList<>();
+        scope_numaux.add(symt.getMethod("ComputeFac"));
 
         System.out.println("test scope");
-        System.out.println(symt.getMethod("main").getScope() == scope_main);
-        System.out.println(symt.getMethod("ComputeFac").getScope() == scope_computefac);
-        System.out.println(symt.getType("useless_var").getScope() == scope_uselessvar);
-        System.out.println(symt.getType("num").getScope() == scope_num);
-        System.out.println(symt.getType("num_aux").getScope() == scope_numaux);
+        System.out.println(symt.getMethod("main").getScope().equals(scope_main));
+        System.out.println(symt.getMethod("ComputeFac").getScope().equals(scope_computefac));
+        System.out.println(symt.getType("useless_var").getScope().equals(scope_uselessvar));
+        System.out.println(symt.getType("num").getScope().equals(scope_num));
+        System.out.println(symt.getType("num_aux").getScope().equals(scope_numaux));
         System.out.println();
     }