From 1ec847c7222b8adb9a70264c98a44dc9911d65d3 Mon Sep 17 00:00:00 2001 From: bd-912 Date: Sun, 7 Apr 2024 12:26:47 -0600 Subject: More bugfixes in ST, changes to scoping --- stTest.java | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'stTest.java') 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 scope_main = new ArrayList<>(); + scope_main.add(symt.getClass("Factorial")); + ArrayList scope_computefac = new ArrayList<>(); + scope_computefac.add(symt.getClass("Fac")); + ArrayList scope_uselessvar = new ArrayList<>(); + scope_uselessvar.add(symt.getClass("Fac")); + ArrayList scope_num = new ArrayList<>(); + scope_num.add(symt.getMethod("ComputeFac")); + ArrayList 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(); } -- cgit v1.2.3