Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/compiler/jsgen.js
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,11 @@ class JSGenerator {
break;
case StackOpcode.CONTROL_REPEAT: {
const i = this.localVariables.next();
this.source += `for (var ${i} = ${this.descendInput(node.times)}; ${i} >= 0.5; ${i}--) {\n`;
if (node.times.isAlwaysType(InputType.NUMBER_INT | InputType.NUMBER_INF)) {
this.source += `for (var ${i} = ${this.descendInput(node.times)}; ${i} > 0; ${i}--) {\n`;
} else {
this.source += `for (var ${i} = ${this.descendInput(node.times)}; ${i} >= 0.5; ${i}--) {\n`;
}
this.descendStack(node.do, new Frame(true));
this.yieldLoop();
this.source += `}\n`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ return "";
(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
const b0 = stage.variables["`jEk@4|i[#Fk?(8x)AV.-my variable"];
return function* genXYZ () {
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
yield;
}
b0.value = "random";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ return function* genXYZ_run_test () {
thread.procedures["Wsetup values"]();
b0.value = 0;
b1.value = 0;
for (var a0 = b2.value.length; a0 >= 0.5; a0--) {
for (var a0 = b2.value.length; a0 > 0; a0--) {
b1.value = ((+b1.value || 0) + 1);
b3.value = 0;
for (var a1 = b2.value.length; a1 >= 0.5; a1--) {
for (var a1 = b2.value.length; a1 > 0; a1--) {
b3.value = ((+b3.value || 0) + 1);
b0.value = ((+b0.value || 0) + 1);
if (!compareEqual(compareGreaterThan(listGet(b2.value, b1.value), (b2.value[(b3.value | 0) - 1] ?? "")), (b4.value[(b0.value | 0) - 1] ?? ""))) {
Expand Down
2 changes: 1 addition & 1 deletion test/snapshot/__snapshots__/tw-counter.sb3.tw-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runtime.ext_scratch3_control._counter = 0;
if ((runtime.ext_scratch3_control._counter === 0)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass clear = 0",}, b0, false, false, "w", null);
}
for (var a0 = 10; a0 >= 0.5; a0--) {
for (var a0 = 10; a0 > 0; a0--) {
runtime.ext_scratch3_control._counter++;
yield;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ retire(); return;
// Sprite1 Zsomething that yields
(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
return function* genXYZ_something_that_yield () {
for (var a0 = 2; a0 >= 0.5; a0--) {
for (var a0 = 2; a0 > 0; a0--) {
yield;
}
return "";
Expand All @@ -30,7 +30,7 @@ return "";
(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
const b0 = stage.variables["`jEk@4|i[#Fk?(8x)AV.-my variable"];
return function* genXYZ () {
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
yield;
}
b0.value = "random";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ retire(); return;
const b0 = runtime.getOpcodeFunction("music_restForBeats");
const b1 = runtime.getOpcodeFunction("music_playDrumForBeats");
return function* genXYZ_no_refresh () {
for (var a0 = 30; a0 >= 0.5; a0--) {
for (var a0 = 30; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand All @@ -53,7 +53,7 @@ return "";
const b0 = runtime.getOpcodeFunction("music_restForBeats");
const b1 = runtime.getOpcodeFunction("music_playDrumForBeats");
return function* genXYZ_has_refresh () {
for (var a0 = 30; a0 >= 0.5; a0--) {
for (var a0 = 30; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const b0 = stage.variables["EF^k=u-t@S)w60;RP?dZ-list-list"];
const b1 = stage.variables["rQq!wAuU2T9DV9,S[/s."];
return function funXYZ_run () {
b0.value = [];
for (var a0 = 100; a0 >= 0.5; a0--) {
for (var a0 = 100; a0 > 0; a0--) {
b0.value.push((b1.value[(b0.value.length + 1) - 1] ?? ""));
b0._monitorUpToDate = false;
}
Expand All @@ -36,7 +36,7 @@ const b4 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_validate () {
b0.value = 1;
b1.value = 1;
for (var a0 = b2.value.length; a0 >= 0.5; a0--) {
for (var a0 = b2.value.length; a0 > 0; a0--) {
if (!compareEqual((b2.value[(b1.value | 0) - 1] ?? ""), (b3.value[(b1.value | 0) - 1] ?? ""))) {
b0.value = 0;
yield* executeInCompatibilityLayer({"MESSAGE":("fail mismatch at index " + ("" + b1.value)),}, b4, true, false, ",", null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const b2 = stage.variables["l^q!%fq]Bv;72dlGf}^Z"];
return function* genXYZ () {
b0.value = 0;
yield* executeInCompatibilityLayer({"MESSAGE":"plan 0",}, b1, false, false, "}fY]VN(X|v/[G`P0?@s2", null);
for (var a0 = 30; a0 >= 0.5; a0--) {
for (var a0 = 30; a0 > 0; a0--) {
b2.value = runtime.ioDevices.clock.projectTimer();
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const b0 = stage.variables["PsAI*C{QHI3*4?O8p#TM"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_return_stops_the_scr () {
b0.value = 0;
for (var a0 = 100; a0 >= 0.5; a0--) {
for (var a0 = 100; a0 > 0; a0--) {
b0.value = (b0.value + 1);
if ((b0.value === 25)) {
return "stopped!";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const b0 = stage.variables["Go=PJS7BFXYo_qi2S:kQ"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_non_warp () {
b0.value = 0;
for (var a0 = 5; a0 >= 0.5; a0--) {
for (var a0 = 5; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand All @@ -56,7 +56,7 @@ if ((("" + (yield* thread.procedures["Wverify runs warp %s"]((yield* thread.proc
yield* executeInCompatibilityLayer({"MESSAGE":"pass non warp and warp mix",}, b1, false, false, "S", null);
}
b0.value = 0;
for (var a2 = 5; a2 >= 0.5; a2--) {
for (var a2 = 5; a2 > 0; a2--) {
thread.timer = timer();
var a3 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand All @@ -79,7 +79,7 @@ const b0 = stage.variables["Go=PJS7BFXYo_qi2S:kQ"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_verify_runs_warp_ (p0) {
b0.value = 0;
for (var a0 = 5; a0 >= 0.5; a0--) {
for (var a0 = 5; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand All @@ -101,7 +101,7 @@ const b0 = stage.variables["Go=PJS7BFXYo_qi2S:kQ"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_verify_runs_non_warp (p0) {
b0.value = 0;
for (var a0 = 5; a0 >= 0.5; a0--) {
for (var a0 = 5; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const b2 = stage.variables["JbF5exWEi*m?-UEmkASS"];
return function* genXYZ () {
b0.value = 0;
yield* executeInCompatibilityLayer({"MESSAGE":"plan 15",}, b1, false, false, "0/2-)Gp^^=haQ1OMD.xb", null);
for (var a0 = 15; a0 >= 0.5; a0--) {
for (var a0 = 15; a0 > 0; a0--) {
if (((+b2.value || 0) === 200)) {
b2.value = 50;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (compareEqual(b0.value, 0)) {
b0.value = 1;
startHats("event_whenbroadcastreceived", { BROADCAST_OPTION: "message1" });
b1.value = 1;
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
yield;
}
b1.value = 2;
Expand Down
4 changes: 2 additions & 2 deletions test/snapshot/__snapshots__/tw-unsafe-equals.sb3.tw-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass 4",}, b0, false, false, "8]2
if (((+b1.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 5",}, b0, false, false, "ZU^{OfKTg|+Au$$q0[]u", null);
}
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
if (((+b1.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 6",}, b0, false, false, "HB+_IN}6=K[*ksxKXH0`", null);
}
Expand All @@ -47,7 +47,7 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass 10",}, b0, false, false, "B`
if (((+b2.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 11",}, b0, false, false, "TJ:#TkYBys*!RYiKLXb)", null);
}
for (var a1 = 1; a1 >= 0.5; a1--) {
for (var a1 = 1; a1 > 0; a1--) {
if (((+b2.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 12",}, b0, false, false, ",Z,~10Qo~j;(+VL+I3q:", null);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ return "";
(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
const b0 = stage.variables["`jEk@4|i[#Fk?(8x)AV.-my variable"];
return function* genXYZ () {
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
yield;
}
b0.value = "random";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ return function* genXYZ_run_test () {
thread.procedures["Wsetup values"]();
b0.value = 0;
b1.value = 0;
for (var a0 = b2.value.length; a0 >= 0.5; a0--) {
for (var a0 = b2.value.length; a0 > 0; a0--) {
b1.value = ((+b1.value || 0) + 1);
b3.value = 0;
for (var a1 = b2.value.length; a1 >= 0.5; a1--) {
for (var a1 = b2.value.length; a1 > 0; a1--) {
b3.value = ((+b3.value || 0) + 1);
b0.value = ((+b0.value || 0) + 1);
if (!compareEqual(compareGreaterThan(listGet(b2.value, b1.value), (b2.value[(b3.value | 0) - 1] ?? "")), (b4.value[(b0.value | 0) - 1] ?? ""))) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runtime.ext_scratch3_control._counter = 0;
if ((runtime.ext_scratch3_control._counter === 0)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass clear = 0",}, b0, false, false, "w", null);
}
for (var a0 = 10; a0 >= 0.5; a0--) {
for (var a0 = 10; a0 > 0; a0--) {
runtime.ext_scratch3_control._counter++;
yield;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ retire(); return;
// Sprite1 Zsomething that yields
(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
return function* genXYZ_something_that_yield () {
for (var a0 = 2; a0 >= 0.5; a0--) {
for (var a0 = 2; a0 > 0; a0--) {
yield;
}
return "";
Expand All @@ -30,7 +30,7 @@ return "";
(function factoryXYZ(thread) { const target = thread.target; const runtime = target.runtime; const stage = runtime.getTargetForStage();
const b0 = stage.variables["`jEk@4|i[#Fk?(8x)AV.-my variable"];
return function* genXYZ () {
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
yield;
}
b0.value = "random";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ retire(); return;
const b0 = runtime.getOpcodeFunction("music_restForBeats");
const b1 = runtime.getOpcodeFunction("music_playDrumForBeats");
return function* genXYZ_no_refresh () {
for (var a0 = 30; a0 >= 0.5; a0--) {
for (var a0 = 30; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand Down Expand Up @@ -54,7 +54,7 @@ return "";
const b0 = runtime.getOpcodeFunction("music_restForBeats");
const b1 = runtime.getOpcodeFunction("music_playDrumForBeats");
return function* genXYZ_has_refresh () {
for (var a0 = 30; a0 >= 0.5; a0--) {
for (var a0 = 30; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const b0 = stage.variables["EF^k=u-t@S)w60;RP?dZ-list-list"];
const b1 = stage.variables["rQq!wAuU2T9DV9,S[/s."];
return function* genXYZ_run () {
b0.value = [];
for (var a0 = 100; a0 >= 0.5; a0--) {
for (var a0 = 100; a0 > 0; a0--) {
b0.value.push((b1.value[(b0.value.length + 1) - 1] ?? ""));
b0._monitorUpToDate = false;
if (isStuck()) yield;
Expand All @@ -37,7 +37,7 @@ const b4 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_validate () {
b0.value = 1;
b1.value = 1;
for (var a0 = b2.value.length; a0 >= 0.5; a0--) {
for (var a0 = b2.value.length; a0 > 0; a0--) {
if (!compareEqual(listGet(b2.value, b1.value), listGet(b3.value, b1.value))) {
b0.value = 0;
yield* executeInCompatibilityLayer({"MESSAGE":("fail mismatch at index " + ("" + b1.value)),}, b4, true, false, ",", null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const b2 = stage.variables["l^q!%fq]Bv;72dlGf}^Z"];
return function* genXYZ () {
b0.value = 0;
yield* executeInCompatibilityLayer({"MESSAGE":"plan 0",}, b1, false, false, "}fY]VN(X|v/[G`P0?@s2", null);
for (var a0 = 30; a0 >= 0.5; a0--) {
for (var a0 = 30; a0 > 0; a0--) {
b2.value = runtime.ioDevices.clock.projectTimer();
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const b0 = stage.variables["PsAI*C{QHI3*4?O8p#TM"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_return_stops_the_scr () {
b0.value = 0;
for (var a0 = 100; a0 >= 0.5; a0--) {
for (var a0 = 100; a0 > 0; a0--) {
b0.value = ((+b0.value || 0) + 1);
if ((b0.value === 25)) {
return "stopped!";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const b0 = stage.variables["Go=PJS7BFXYo_qi2S:kQ"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_non_warp () {
b0.value = 0;
for (var a0 = 5; a0 >= 0.5; a0--) {
for (var a0 = 5; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand All @@ -56,7 +56,7 @@ if ((("" + (yield* thread.procedures["Wverify runs warp %s"]((yield* thread.proc
yield* executeInCompatibilityLayer({"MESSAGE":"pass non warp and warp mix",}, b1, false, false, "S", null);
}
b0.value = 0;
for (var a2 = 5; a2 >= 0.5; a2--) {
for (var a2 = 5; a2 > 0; a2--) {
thread.timer = timer();
var a3 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand All @@ -79,7 +79,7 @@ const b0 = stage.variables["Go=PJS7BFXYo_qi2S:kQ"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_verify_runs_warp_ (p0) {
b0.value = 0;
for (var a0 = 5; a0 >= 0.5; a0--) {
for (var a0 = 5; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand All @@ -102,7 +102,7 @@ const b0 = stage.variables["Go=PJS7BFXYo_qi2S:kQ"];
const b1 = runtime.getOpcodeFunction("looks_say");
return function* genXYZ_verify_runs_non_warp (p0) {
b0.value = 0;
for (var a0 = 5; a0 >= 0.5; a0--) {
for (var a0 = 5; a0 > 0; a0--) {
thread.timer = timer();
var a1 = Math.max(0, 1000 * 0);
runtime.requestRedraw();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const b2 = stage.variables["JbF5exWEi*m?-UEmkASS"];
return function* genXYZ () {
b0.value = 0;
yield* executeInCompatibilityLayer({"MESSAGE":"plan 15",}, b1, false, false, "0/2-)Gp^^=haQ1OMD.xb", null);
for (var a0 = 15; a0 >= 0.5; a0--) {
for (var a0 = 15; a0 > 0; a0--) {
if (((+b2.value || 0) === 200)) {
b2.value = 50;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (compareEqual(b0.value, 0)) {
b0.value = 1;
startHats("event_whenbroadcastreceived", { BROADCAST_OPTION: "message1" });
b1.value = 1;
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
yield;
}
b1.value = 2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass 4",}, b0, false, false, "8]2
if (((+b1.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 5",}, b0, false, false, "ZU^{OfKTg|+Au$$q0[]u", null);
}
for (var a0 = 1; a0 >= 0.5; a0--) {
for (var a0 = 1; a0 > 0; a0--) {
if (((+b1.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 6",}, b0, false, false, "HB+_IN}6=K[*ksxKXH0`", null);
}
Expand All @@ -47,7 +47,7 @@ yield* executeInCompatibilityLayer({"MESSAGE":"pass 10",}, b0, false, false, "B`
if (((+b2.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 11",}, b0, false, false, "TJ:#TkYBys*!RYiKLXb)", null);
}
for (var a1 = 1; a1 >= 0.5; a1--) {
for (var a1 = 1; a1 > 0; a1--) {
if (((+b2.value || 0) === 10)) {
yield* executeInCompatibilityLayer({"MESSAGE":"pass 12",}, b0, false, false, ",Z,~10Qo~j;(+VL+I3q:", null);
}
Expand Down