Fix test discrepancy; moved trying to runFrom to use parseExceptionCa…

…llback; moved pollEvents to end of loop; SVVal test fix.
SerrpentDagger · Aug 31, 2023 · 358278b · 358278b
1 parent 3350716
commit 358278b
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 47 deletions.
diff --git a/src/commands/Scajl.java b/src/commands/Scajl.java
@@ -2289,60 +2289,61 @@ public synchronized void forceKill()
 	}
 	public void run(VarSet... varSets)
 	{
-		try
-		{
-			keyIn = new Scanner(System.in);
-			runFrom(GLOBAL, varSets);
-		}
-		catch (ScajlException e)
-		{
-			this.parseExceptionCallback.accept(e, e.getMessage());
-		}
-		catch (Throwable e)
-		{
-			e.printStackTrace();
-			this.exceptionCallback.accept(e);
-		}
+		keyIn = new Scanner(System.in);
+		runFrom(GLOBAL, varSets);
 	}
 	private int labelsDeep = 0;
 	public void runFrom(Label label, VarSet... varSets)
 	{
-		pushStack(label);
-		for (VarSet var : varSets)
-			putVar(var.var, var.set);
-		if (keyIn == null)
-			keyIn = new Scanner(System.in);
-
-		Bool breakIf = new Bool(false);
-		while(parseLine < lines.length && !stack.isEmpty() && !forceKill.get())
+		try
 		{
-			if (pollEvents != null)
-				pollEvents.run();
-			String line = lines[parseLine];
-			if (!line.isEmpty())
+			pushStack(label);
+			for (VarSet var : varSets)
+				putVar(var.var, var.set);
+			if (keyIn == null)
+				keyIn = new Scanner(System.in);
+
+			Bool breakIf = new Bool(false);
+			while(parseLine < lines.length && !stack.isEmpty() && !forceKill.get())
 			{
-				if (line.startsWith(LABEL) || line.startsWith(SCOPED_LABEL))
-					labelsDeep++;
-				else if (labelsDeep == 0)
+				String line = lines[parseLine];
+				if (!line.isEmpty())
 				{
-					if (line.equals(HELP_CHAR_STR))
-						PRINT_COMMANDS.func.cmd(this, (Object[]) null);
-					else if (startsWith(line, SCOPE_S) && LEGAL_ANON_SCOPE_MATCHER.matcher(line).matches())
-						scope.push(scope.getLast().getLabelTree().getFor(anonScope.get(parseLine)));
-					else if (endsWith(line, SCOPE_E) && LEGAL_ANON_SCOPE_MATCHER.matcher(line).matches())
-						scope.pop();
-					else
+					if (line.startsWith(LABEL) || line.startsWith(SCOPED_LABEL))
+						labelsDeep++;
+					else if (labelsDeep == 0)
 					{
-						CommandResult res = runExecutable(line, breakIf, null);
-						if (res.shouldBreak)
-							break;
+						if (line.equals(HELP_CHAR_STR))
+							PRINT_COMMANDS.func.cmd(this, (Object[]) null);
+						else if (startsWith(line, SCOPE_S) && LEGAL_ANON_SCOPE_MATCHER.matcher(line).matches())
+							scope.push(scope.getLast().getLabelTree().getFor(anonScope.get(parseLine)));
+						else if (endsWith(line, SCOPE_E) && LEGAL_ANON_SCOPE_MATCHER.matcher(line).matches())
+							scope.pop();
+						else
+						{
+							CommandResult res = runExecutable(line, breakIf, null);
+							if (res.shouldBreak)
+								break;
+						}
 					}
+					else if (endsLabel(line))
+						labelsDeep--;
 				}
-				else if (endsLabel(line))
-					labelsDeep--;
+				parseLine++;
+				if (pollEvents != null)
+					pollEvents.run();
 			}
-			parseLine++;
 		}
+		catch (ScajlException e)
+		{
+			this.parseExceptionCallback.accept(e, e.getMessage());
+		}
+		catch (Throwable e)
+		{
+			e.printStackTrace();
+			this.exceptionCallback.accept(e);
+		}
+
 	}
 	protected CommandResult runExecutable(String executableLine, SVMember selfCtx)
 	{

diff --git a/src/commands/ScajlVariable.java b/src/commands/ScajlVariable.java
@@ -184,10 +184,7 @@ public String raw()
 		public boolean test(ScajlVariable other, Scajl ctx)
 		{
 			if (modless.equals("null"))
-				if (other instanceof SVVal)
-					return other.equals(NULL) || CmdArg.BOOLEAN.parse(other, ctx) != null || CmdArg.DOUBLE.parse(other, ctx) != null;
-				else
-					return true;
+				return true;
 			boolean t = other instanceof SVVal && other != NULL;
 			if (!t)
 				return false;
@@ -1422,7 +1419,6 @@ public static void putVar(String name, ScajlVariable var, Scajl ctx, SVMember se
 
 	public static boolean test(Variable var, ScajlVariable pat, Scajl ctx)
 	{
-		//return var.name != null && (!isVar(var.name, ctx) || !pat.test(var.var, ctx));
 		return var.name != null && isVar(var.name, ctx) && pat.test(var.var, ctx);
 	}