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

Create environments #4

Merged
TopchetoEU merged 14 commits from TopchetoEU/environments into master 2023-09-09 15:55:49 +00:00
Conversation 0 Commits 14 Files Changed 100 +2 -13
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fea17d944b - Show all commits

3
src/me/topchetoeu/jscript/compilation/control/SwitchStatement.java
View File

@ -66,9 +66,6 @@ public class SwitchStatement extends Statement {
if (instr.type == Type.NOP && instr.is(0, "break") && instr.get(1) == null) {
target.set(i, Instruction.jmp(target.size() - i).locate(instr.location));
}
if (instr.type == Type.NOP && instr.is(0, "try_break") && instr.get(1) == null) {
target.set(i, Instruction.signal("jmp_" + (target.size() - (Integer)instr.get(2))).locate(instr.location));
}
}
for (var el : caseMap.entrySet()) {
var loc = target.get(el.getKey()).location;

8
src/me/topchetoeu/jscript/compilation/control/WhileStatement.java
View File

@ -81,14 +81,6 @@ public class WhileStatement extends Statement {
target.set(i, Instruction.jmp(breakPoint - i));
target.get(i).location = instr.location;
}
if (instr.type == Type.NOP && instr.is(0, "try_cont") && (instr.get(1) == null || instr.is(1, label))) {
target.set(i, Instruction.signal("jmp_" + (continuePoint - (Integer)instr.get(2))));
target.get(i).location = instr.location;
}
if (instr.type == Type.NOP && instr.is(0, "try_break") && (instr.get(1) == null || instr.is(1, label))) {
target.set(i, Instruction.signal("jmp_" + (breakPoint - (Integer)instr.get(2))));
target.get(i).location = instr.location;
}
}
}

4
src/me/topchetoeu/jscript/compilation/values/FunctionStatement.java
View File

@ -28,10 +28,10 @@ public class FunctionStatement extends Statement {
public static void checkBreakAndCont(List<Instruction> target, int start) {
for (int i = start; i < target.size(); i++) {
if (target.get(i).type == Type.NOP) {
if (target.get(i).is(0, "break") || target.get(i).is(0, "try_break")) {
if (target.get(i).is(0, "break") ) {
throw new SyntaxException(target.get(i).location, "Break was placed outside a loop.");
}
if (target.get(i).is(0, "cont") || target.get(i).is(0, "try_cont")) {
if (target.get(i).is(0, "cont")) {
throw new SyntaxException(target.get(i).location, "Continue was placed outside a loop.");
}
}