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
17 changes: 15 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ jobs:
go install gotest.tools/gotestsum@latest

- name: Install npm dependencies
run: npm ci
run: |
npm ci
cd extern/tstl && npm ci

- name: Cache Lua runtimes
id: lua-cache
Expand All @@ -74,7 +76,18 @@ jobs:
- name: Tests
run: |
export PATH="$PWD/.lua-runtimes/bin:$PATH"
FORCE_COLOR=1 gotestsum --format short ./internal/transpiler/ ./internal/lua/... ./internal/tstltest/ -skip TestCodegen_
FORCE_COLOR=1 gotestsum --format short -- \
-coverpkg=./internal/transpiler/,./internal/lua/ \
-coverprofile=coverage.out \
-covermode=atomic \
./internal/transpiler/ ./internal/lua/... ./internal/luatest/ ./internal/tstltest/ \
-skip TestCodegen_

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage.out

golangci-lint:
runs-on: ubuntu-latest
Expand Down
146 changes: 146 additions & 0 deletions internal/luatest/labeled_loops_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
package luatest

import (
"strings"
"testing"
)

func TestLabeledBreak(t *testing.T) {
t.Parallel()

cases := []struct {
name string
body string
want string
}{
{
"labeled break exits outer loop",
`let result = "";
outer: for (let i = 0; i < 3; i++) {
for (let j = 0; j < 3; j++) {
if (j === 1) break outer;
result += i + "," + j + " ";
}
}
return result.trim();`,
`"0,0"`,
},
{
"labeled break on while",
`let count = 0;
outer: while (true) {
let inner = 0;
while (true) {
inner++;
if (inner > 2) break outer;
}
count++;
}
return count;`,
`0`,
},
{
"labeled break skips else branch",
`let result = 0;
outer: for (let i = 0; i < 5; i++) {
for (let j = 0; j < 5; j++) {
if (i * j > 6) break outer;
result += 1;
}
}
return result;`,
`14`,
},
}

for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
ExpectFunction(t, tc.body, tc.want, Opts{})
})
}
}

func TestLabeledContinue(t *testing.T) {
t.Parallel()

cases := []struct {
name string
body string
want string
}{
{
"labeled continue skips to outer loop",
`let result = "";
outer: for (let i = 0; i < 3; i++) {
for (let j = 0; j < 3; j++) {
if (j === 1) continue outer;
result += i + "," + j + " ";
}
}
return result.trim();`,
`"0,0 1,0 2,0"`,
},
{
"labeled continue on while loop",
`let sum = 0;
let i = 0;
outer: while (i < 3) {
i++;
let j = 0;
while (j < 3) {
j++;
if (j === 2) continue outer;
sum += j;
}
}
return sum;`,
`3`,
},
}

for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
ExpectFunction(t, tc.body, tc.want, Opts{})
})
}
}

func TestLabeledStatement_NoBreakOrContinue(t *testing.T) {
t.Parallel()
// Label that isn't targeted by break/continue should just emit the inner statement
ExpectFunction(t, `
let x = 0;
myLabel: for (let i = 0; i < 3; i++) {
x += i;
}
return x;
`, `3`, Opts{})
}

func TestLabeledStatement_Codegen(t *testing.T) {
t.Parallel()
// Verify labeled break emits goto labels
code := `export function __main() {
let result = 0;
outer: for (let i = 0; i < 3; i++) {
for (let j = 0; j < 3; j++) {
if (j === 1) break outer;
result += 1;
}
}
return result;
}`
results := TranspileTS(t, code, Opts{})
for _, r := range results {
if strings.HasSuffix(r.FileName, "main.ts") {
if !strings.Contains(r.Lua, "::__break_outer::") {
t.Errorf("expected goto break label in output, got:\n%s", r.Lua)
}
if !strings.Contains(r.Lua, "goto __break_outer") {
t.Errorf("expected goto statement in output, got:\n%s", r.Lua)
}
}
}
}
3 changes: 2 additions & 1 deletion internal/luatest/lualib_transpile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ io.write(type(lb) .. ":" .. type(lb.Map))

for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
luaCode := fmt.Sprintf(`package.path = %q .. "/?.lua;" .. package.path
luaCode := fmt.Sprintf(`package.loaded["lualib_bundle"] = nil
package.path = %q .. "/?.lua;" .. package.path
%s`, tmpDir, tc.lua)

if e, ok := Evaluators[luaRuntime]; ok {
Expand Down
Loading
Loading