Treat boolean literals as booleans

Previously the text probe parser would treat boolean literals as
strings. This doesn't matter for assertions, as all int/string/bools are
compared as strings. However, it does matter for arguments to methods.
Changed it so that booleans are treated as booleans.

Author: Kevlanche

addnum/AddNum.jar

@@ -87,6 +87,12 @@ public String toString() {
 		return getClass().getSimpleName();
 	}
 
+	public String valueToString(boolean hex) {
+		return hex //
+				? Integer.toHexString(value()) //
+				: Integer.toString(value());
+	}
+
 	@Override
 	public Node clone() throws CloneNotSupportedException {
 		return (Node) super.clone();

addnum/src/addnum/ast/Node.java

@@ -67,6 +67,7 @@
      [10:6->10:9] Expected parameter types: [java.lang.String, java.lang.Object...]
      [11:6->11:9] Expected parameter types: [java.lang.String, java.lang.Object...]
   ✅ ts/ok_add.addn
+  ✅ ts/ok_boolarg.addn
   ✅ ts/ok_boolstrcomparison.addn
   ✅ ts/ok_bumps.addn
   ✅ ts/ok_clone.addn
@@ -84,4 +85,4 @@
   ✅ ts/ok_vars.addn
   ✅ ts/ok_varspaces.addn
   ✅ ts/ok_varvar.addn
-Done: 99 pass, 46 fail
+Done: 101 pass, 46 fail

addnum/workspace/expected_test_output.txt

@@ -0,0 +1,3 @@
+123 // [[$n:=Num]]
+// [[$n.valueToString(true)=7b]]
+// [[$n.valueToString(false)=123]]

addnum/workspace/ts/ok_boolarg.addn

@@ -216,6 +216,9 @@ private void checkQueryCompletion(Query q) {
 					case STRING:
 						cval = DecorationsHandler.wrapLiteralValueInQuotesIfNecessary(String.valueOf(cv.asString()));
 						break;
+					case BOOLEAN:
+						cval = String.valueOf(cv.asBoolean());
+						break;
 					default:
 						return TraversalResult.CONTINUE;
 					}

server/src-test/codeprober/ExistingTextProbeTest.java

@@ -329,6 +329,7 @@ private static CompleteRes completePropAccess(TextProbeEnvironment env, Query qu
 							case any: // a.k.a "Object"
 							case integer:
 							case string:
+							case bool:
 								return true;
 							default:
 								return false;

server/src/codeprober/requesthandler/CompleteHandler.java

@@ -244,6 +244,11 @@ public QueryResult evaluateQuery(Query query, boolean automaticallyExtractErrors
 							argValues.add(arg.asString());
 							break;
 
+						case BOOLEAN:
+							argTypes.add(Boolean.TYPE);
+							argValues.add(arg.asBoolean());
+							break;
+
 						case QUERY:
 							final QueryResult qval = evaluateQuery(arg.asQuery());
 							if (qval == null) {
@@ -359,6 +364,9 @@ public boolean evaluateComparison(Query tam, QueryResult lhsBody) {
 		case STRING:
 			rhsBody = new QueryResult(qassert.expectedValue.asString(), String.class);
 			break;
+		case BOOLEAN:
+			rhsBody = new QueryResult(qassert.expectedValue.asBoolean(), Boolean.TYPE);
+			break;
 		default:
 			throw new IllegalArgumentException("Unknown ExpectedValue " + qassert.expectedValue.type);
 		}

server/src/codeprober/textprobe/TextProbeEnvironment.java

@@ -316,9 +316,16 @@ private static Expr parseExpr(Position start, ParserSource src, boolean allowLit
 				Position numEnd = new Position(start.line, start.column + src.getOffset() - 1);
 				return Expr.fromInt(numStart, numEnd, litNum);
 			}
-			for (String kw : new String[] { "true", "false", "null" }) {
+			for (String boolLit : new String[] { "true", "false" }) {
+				if (src.accept(boolLit)) {
+					Position strStart = new Position(start.line, start.column + argOffset);
+					Position strEnd = new Position(start.line, start.column + src.getOffset() - 1);
+					return Expr.fromBoolean(strStart, strEnd, boolLit.equals("true"));
+				}
+			}
+			for (String kw : new String[] { "null" }) {
 				if (src.accept(kw)) {
-					Position strStart = new Position(start.line, start.column + argOffset + 1);
+					Position strStart = new Position(start.line, start.column + argOffset);
 					Position strEnd = new Position(start.line, start.column + src.getOffset() - 1);
 					return Expr.fromString(strStart, strEnd, kw);
 				}

textprobe/src/codeprober/textprobe/Parser.java

@@ -5,7 +5,7 @@
 public class Expr extends AbstractASTNode {
 
 	public static enum Type {
-		INT, STRING, QUERY,
+		INT, STRING, BOOLEAN, QUERY,
 	}
 
 	public final Type type;
@@ -31,6 +31,10 @@ public static Expr fromString(Position start, Position end, String value) {
 		return new Expr(Type.STRING, start, end, value);
 	}
 
+	public static Expr fromBoolean(Position start, Position end, boolean value) {
+		return new Expr(Type.BOOLEAN, start, end, value);
+	}
+
 	public static Expr fromQuery(Query value) {
 		return new Expr(Type.QUERY, value);
 	}
@@ -48,6 +52,10 @@ public String asString() {
 		return (String) value;
 	}
 
+	public boolean asBoolean() {
+		return (boolean) value;
+	}
+
 	public Query asQuery() {
 		return (Query) value;
 	}
@@ -59,6 +67,8 @@ public String pp() {
 			return String.valueOf(asInt());
 		case STRING:
 			return "\"" + asString() + "\"";
+		case BOOLEAN:
+			return String.valueOf(asBoolean());
 		case QUERY:
 			return asQuery().pp();
 		default:

textprobe/src/codeprober/textprobe/ast/Expr.java

@@ -1,5 +1,5 @@
-{{A.b=true}}   // [[Expr.type="STRING"]] [[Expr.asString="true"]]
-{{A.b=false}}  // [[Expr.type="STRING"]] [[Expr.asString="false"]]
+{{A.b=true}}   // [[Expr.type="BOOLEAN"]] [[Expr.asBoolean="true"]] [[Expr.asBoolean=true]]
+{{A.b=false}}  // [[Expr.type="BOOLEAN"]] [[Expr.asBoolean="false"]] [[Expr.asBoolean=false]]
 {{A.b=null}}   // [[Expr.type="STRING"]] [[Expr.asString="null"]]
 {{A.b=123}}    // [[Expr.type="INT"]]
 {{A.b=foo}}