topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

remove formatted

Browse Source
This commit is contained in:
TopchetoEU 2023-08-26 11:56:14 +03:00
parent 51789efd90
commit 33d96429f4
No known key found for this signature in database
GPG Key ID: 24E57B2E9C61AD19
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/topchetoeu/jscript/engine/values/Values.java
View File

@ -426,7 +426,7 @@ public class Values {
if (clazz == Void.class) return null; if (clazz == Void.class) return null;
if (clazz == null || clazz == Object.class) return (T)obj; if (clazz == null || clazz == Object.class) return (T)obj;
var err = new IllegalArgumentException("Cannot convert '%s' to '%s'.".formatted(type(obj), clazz.getName())); var err = new IllegalArgumentException(String.format("Cannot convert '%s' to '%s'.", type(obj), clazz.getName()));
if (obj instanceof NativeWrapper) { if (obj instanceof NativeWrapper) {
var res = ((NativeWrapper)obj).wrapped; var res = ((NativeWrapper)obj).wrapped;

2
src/me/topchetoeu/jscript/exceptions/SyntaxException.java
View File

@ -7,7 +7,7 @@ public class SyntaxException extends RuntimeException {
public final String msg; public final String msg;
public SyntaxException(Location loc, String msg) { public SyntaxException(Location loc, String msg) {
super("Syntax error (at %s): %s".formatted(loc, msg)); super(String.format("Syntax error (at %s): %s", loc, msg));
this.loc = loc; this.loc = loc;
this.msg = msg; this.msg = msg;
} }

10
src/me/topchetoeu/jscript/json/JSONMap.java
View File

@ -51,7 +51,7 @@ public class JSONMap implements Map<String, JSONElement> {
public JSONMap map(String path) { public JSONMap map(String path) {
var el = get(path); var el = get(path);
if (el == null) throw new IllegalStateException("'%s' doesn't exist.".formatted(path)); if (el == null) throw new IllegalStateException(String.format("'%s' doesn't exist.", path));
return el.map(); return el.map();
} }
public JSONMap map(String path, JSONMap defaultVal) { public JSONMap map(String path, JSONMap defaultVal) {
@ -63,7 +63,7 @@ public class JSONMap implements Map<String, JSONElement> {
public JSONList list(String path) { public JSONList list(String path) {
var el = get(path); var el = get(path);
if (el == null) throw new IllegalStateException("'%s' doesn't exist.".formatted(path)); if (el == null) throw new IllegalStateException(String.format("'%s' doesn't exist.", path));
return el.list(); return el.list();
} }
public JSONList list(String path, JSONList defaultVal) { public JSONList list(String path, JSONList defaultVal) {
@ -75,7 +75,7 @@ public class JSONMap implements Map<String, JSONElement> {
public String string(String path) { public String string(String path) {
var el = get(path); var el = get(path);
if (el == null) throw new IllegalStateException("'%s' doesn't exist.".formatted(path)); if (el == null) throw new IllegalStateException(String.format("'%s' doesn't exist.", path));
return el.string(); return el.string();
} }
public String string(String path, String defaultVal) { public String string(String path, String defaultVal) {
@ -87,7 +87,7 @@ public class JSONMap implements Map<String, JSONElement> {
public double number(String path) { public double number(String path) {
var el = get(path); var el = get(path);
if (el == null) throw new IllegalStateException("'%s' doesn't exist.".formatted(path)); if (el == null) throw new IllegalStateException(String.format("'%s' doesn't exist.", path));
return el.number(); return el.number();
} }
public double number(String path, double defaultVal) { public double number(String path, double defaultVal) {
@ -99,7 +99,7 @@ public class JSONMap implements Map<String, JSONElement> {
public boolean bool(String path) { public boolean bool(String path) {
var el = get(path); var el = get(path);
if (el == null) throw new IllegalStateException("'%s' doesn't exist.".formatted(path)); if (el == null) throw new IllegalStateException(String.format("'%s' doesn't exist.", path));
return el.bool(); return el.bool();
} }
public boolean bool(String path, boolean defaultVal) { public boolean bool(String path, boolean defaultVal) {

14
src/me/topchetoeu/jscript/parsing/Parsing.java
View File

@ -374,7 +374,7 @@ public class Parsing {
currStage = CURR_STRING; currStage = CURR_STRING;
continue; continue;
} }
else throw new SyntaxException(new Location(line, start, filename), "Unrecognized character %s.".formatted(c)); else throw new SyntaxException(new Location(line, start, filename), String.format("Unrecognized character %s.", c));
} }
// if we got here, we know that we have encountered the end of a token // if we got here, we know that we have encountered the end of a token
@ -542,7 +542,7 @@ public class Parsing {
else res.add(Token.number(el.line, el.start, Double.parseDouble(el.value))); break; else res.add(Token.number(el.line, el.start, Double.parseDouble(el.value))); break;
case OPERATOR: case OPERATOR:
Operator op = Operator.parse(el.value); Operator op = Operator.parse(el.value);
if (op == null) throw new SyntaxException(loc, "Unrecognized operator '%s'.".formatted(el.value)); if (op == null) throw new SyntaxException(loc, String.format("Unrecognized operator '%s'.", el.value));
res.add(Token.operator(el.line, el.start, op)); res.add(Token.operator(el.line, el.start, op));
break; break;
case STRING: case STRING:
@ -959,7 +959,7 @@ public class Parsing {
var res = parseValue(filename, tokens, n + i, 14); var res = parseValue(filename, tokens, n + i, 14);
if (res.isSuccess()) return ParseRes.res(new OperationStatement(loc, operation, res.result), n + res.n); if (res.isSuccess()) return ParseRes.res(new OperationStatement(loc, operation, res.result), n + res.n);
else return ParseRes.error(loc, "Expected a value after the unary operator '%s'.".formatted(op.value), res); else return ParseRes.error(loc, String.format("Expected a value after the unary operator '%s'.", op.value), res);
} }
public static ParseRes<ChangeStatement> parsePrefixChange(String filename, List<Token> tokens, int i) { public static ParseRes<ChangeStatement> parsePrefixChange(String filename, List<Token> tokens, int i) {
var loc = getLoc(filename, tokens, i); var loc = getLoc(filename, tokens, i);
@ -1029,7 +1029,7 @@ public class Parsing {
if (literal.result.equals("async")) return ParseRes.error(loc, "'async' is not supported."); if (literal.result.equals("async")) return ParseRes.error(loc, "'async' is not supported.");
if (literal.result.equals("const")) return ParseRes.error(loc, "'const' declarations are not supported."); if (literal.result.equals("const")) return ParseRes.error(loc, "'const' declarations are not supported.");
if (literal.result.equals("let")) return ParseRes.error(loc, "'let' declarations are not supported."); if (literal.result.equals("let")) return ParseRes.error(loc, "'let' declarations are not supported.");
return ParseRes.error(loc, "Unexpected identifier '%s'.".formatted(literal.result)); return ParseRes.error(loc, String.format("Unexpected identifier '%s'.", literal.result));
} }
return ParseRes.res(new VariableStatement(loc, literal.result), 1); return ParseRes.res(new VariableStatement(loc, literal.result), 1);
@ -1106,7 +1106,7 @@ public class Parsing {
if (!(prev instanceof AssignableStatement)) return ParseRes.error(loc, "Invalid expression on left hand side of assign operator."); if (!(prev instanceof AssignableStatement)) return ParseRes.error(loc, "Invalid expression on left hand side of assign operator.");
var res = parseValue(filename, tokens, i + n, 2); var res = parseValue(filename, tokens, i + n, 2);
if (!res.isSuccess()) return ParseRes.error(loc, "Expected value after assignment operator '%s'.".formatted(op.value), res); if (!res.isSuccess()) return ParseRes.error(loc, String.format("Expected value after assignment operator '%s'.", op.value), res);
n += res.n; n += res.n;
Operation operation = null; Operation operation = null;
@ -1245,7 +1245,7 @@ public class Parsing {
if (op.isAssign()) return parseAssign(filename, tokens, i + n - 1, prev, precedence); if (op.isAssign()) return parseAssign(filename, tokens, i + n - 1, prev, precedence);
var res = parseValue(filename, tokens, i + n, op.precedence + (op.reverse ? 0 : 1)); var res = parseValue(filename, tokens, i + n, op.precedence + (op.reverse ? 0 : 1));
if (!res.isSuccess()) return ParseRes.error(loc, "Expected a value after the '%s' operator.".formatted(op.value), res); if (!res.isSuccess()) return ParseRes.error(loc, String.format("Expected a value after the '%s' operator.", op.value), res);
n += res.n; n += res.n;
if (op == Operator.LAZY_AND) { if (op == Operator.LAZY_AND) {
@ -1337,7 +1337,7 @@ public class Parsing {
if (!nameRes.isSuccess()) return ParseRes.error(loc, "Expected a variable name."); if (!nameRes.isSuccess()) return ParseRes.error(loc, "Expected a variable name.");
if (!checkVarName(nameRes.result)) { if (!checkVarName(nameRes.result)) {
return ParseRes.error(loc, "Unexpected identifier '%s'.".formatted(nameRes.result)); return ParseRes.error(loc, String.format("Unexpected identifier '%s'.", nameRes.result));
} }
Statement val = null; Statement val = null;

2
src/me/topchetoeu/jscript/polyfills/PolyfillEngine.java
View File

@ -73,7 +73,7 @@ public class PolyfillEngine extends Engine {
return Values.call(ctx, values[0], ctx); return Values.call(ctx, values[0], ctx);
} }
finally { finally {
System.out.println("Function took %s ms".formatted((System.nanoTime() - start) / 1000000.)); System.out.println(String.format("Function took %s ms", (System.nanoTime() - start) / 1000000.));
} }
})); }));
global().define(true, new NativeFunction("isNaN", (ctx, thisArg, args) -> { global().define(true, new NativeFunction("isNaN", (ctx, thisArg, args) -> {