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

Major code base cleanup #12

Merged
TopchetoEU merged 35 commits from TopchetoEU/cleanup into master 2024-01-06 16:28:11 +00:00
Conversation 0 Commits 35 Files Changed 98 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 34276d720c - Show all commits

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

@ -1178,8 +1178,7 @@ public class Parsing {
prevArg = true; prevArg = true;
} }
else if (argRes.isError()) return argRes.transform(); else if (argRes.isError()) return argRes.transform();
else if (isOperator(tokens, i + n, Operator.COMMA)) { else if (prevArg && isOperator(tokens, i + n, Operator.COMMA)) {
if (!prevArg) args.add(null);
prevArg = false; prevArg = false;
n++; n++;
} }
@ -1187,7 +1186,7 @@ public class Parsing {
n++; n++;
break; break;
} }
else return ParseRes.failed(); else return ParseRes.error(getLoc(filename, tokens, i + n), prevArg ? "Expected a comma or a closing paren." : "Expected an expression or a closing paren.");
} }
return ParseRes.res(new CallStatement(loc, false, prev, args.toArray(Statement[]::new)), n); return ParseRes.res(new CallStatement(loc, false, prev, args.toArray(Statement[]::new)), n);