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

Module support #11

Merged
TopchetoEU merged 20 commits from TopchetoEU/modules into master 2023-12-26 12:20:55 +00:00
Conversation 0 Commits 20 Files Changed 117 +11 -6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3d275c52c0 - Show all commits

3
src/me/topchetoeu/jscript/parsing/ParseRes.java
View File

@ -69,6 +69,9 @@ public class ParseRes<T> {
@SafeVarargs
public static <T> ParseRes<? extends T> any(ParseRes<? extends T> ...parsers) {
return any(List.of(parsers));
}
public static <T> ParseRes<? extends T> any(List<ParseRes<? extends T>> parsers) {
ParseRes<? extends T> best = null;
ParseRes<? extends T> error = ParseRes.failed();

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

@ -216,8 +216,10 @@ public class Parsing {
currToken.append(c);
continue;
case CURR_SCIENTIFIC_NOT:
if (c == '-') currStage = CURR_NEG_SCIENTIFIC_NOT;
else if (!isDigit(c)) {
if (c == '-') {
if (currToken.toString().endsWith("e")) currStage = CURR_NEG_SCIENTIFIC_NOT;
}
if (currStage == CURR_SCIENTIFIC_NOT && !isDigit(c)) {
i--; start--;
break;
}
@ -565,7 +567,8 @@ public class Parsing {
}
private static double parseNumber(Location loc, String value) {
var res = parseNumber(false, value);
if (res == null) throw new SyntaxException(loc, "Invalid number format.");
if (res == null)
throw new SyntaxException(loc, "Invalid number format.");
else return res;
}
@ -1022,9 +1025,8 @@ public class Parsing {
return ParseRes.res(res.result, n);
}
@SuppressWarnings("all")
public static ParseRes<? extends Statement> parseSimple(Filename filename, List<Token> tokens, int i, boolean statement) {
var res = new ArrayList<>();
var res = new ArrayList<ParseRes<? extends Statement>>();
if (!statement) {
res.add(parseObject(filename, tokens, i));
@ -1047,7 +1049,7 @@ public class Parsing {
parseDelete(filename, tokens, i)
));
return ParseRes.any(res.toArray(ParseRes[]::new));
return ParseRes.any(res);
}
public static ParseRes<VariableStatement> parseVariable(Filename filename, List<Token> tokens, int i) {