Skip to content

fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tetsuo-cpp merged 2 commits into from
Feb 21, 2026
Merged

fix(translate): validate control flow stack before popping #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f63df0
fix(translate): validate control flow stack before popping
tetsuo-cpp Feb 21, 2026
f2ec8d6
fix(translate): detect unclosed control flow and add REPEAT mismatch …
tetsuo-cpp Feb 21, 2026
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
29 changes: 29 additions & 0 deletions lib/Translation/ForthToMLIR/ForthToMLIR.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

// Pop the false-path block (from IF) - this becomes else-body start.
if (cfStack.empty())
return emitError("ELSE without matching IF");
auto [tag, joinBlock] = cfStack.pop_back_val();
if (tag != CFTag::Orig)
return emitError("ELSE without matching IF");

// Push merge block for THEN to pick up.
cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
consume();

// Pop the join/merge block.
if (cfStack.empty())
return emitError("THEN without matching IF");
auto [tag, joinBlock] = cfStack.pop_back_val();
if (tag != CFTag::Orig)
return emitError("THEN without matching IF");

// Branch from current block to join.
builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

auto [s1, flag] = emitPopFlag(loc, stack);

if (cfStack.empty())
return emitError("UNTIL without matching BEGIN");
auto [tag, loopBlock] = cfStack.pop_back_val();
if (tag != CFTag::Dest)
return emitError("UNTIL without matching BEGIN");

auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

auto [s1, flag] = emitPopFlag(loc, stack);

if (cfStack.empty())
return emitError("WHILE without matching BEGIN");
auto [tag, loopBlock] = cfStack.pop_back_val();
if (tag != CFTag::Dest)
return emitError("WHILE without matching BEGIN");

auto *bodyBlock = createStackBlock(parentRegion, loc);
auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
consume();

// Pop loop header (from WHILE's re-push).
if (cfStack.empty())
return emitError("REPEAT without matching WHILE");
auto [destTag, loopBlock] = cfStack.pop_back_val();
if (destTag != CFTag::Dest)
return emitError("REPEAT without matching WHILE");

// Branch back to loop header.
builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

// Pop exit block (from WHILE).
if (cfStack.empty())
return emitError("REPEAT without matching WHILE");
auto [origTag, exitBlock] = cfStack.pop_back_val();
if (origTag != CFTag::Orig)
return emitError("REPEAT without matching WHILE");

// Continue after exit.
builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
}
}

if (!cfStack.empty()) {
cfStack.clear();
return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
}

return success();
}

Expand Down
4 changes: 4 additions & 0 deletions test/Translation/Forth/begin-begin-repeat-mismatch-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT
4 changes: 4 additions & 0 deletions test/Translation/Forth/begin-then-mismatch-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN
4 changes: 4 additions & 0 deletions test/Translation/Forth/else-without-if-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE
4 changes: 4 additions & 0 deletions test/Translation/Forth/if-repeat-mismatch-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT
4 changes: 4 additions & 0 deletions test/Translation/Forth/if-until-mismatch-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL
4 changes: 4 additions & 0 deletions test/Translation/Forth/repeat-without-while-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT
4 changes: 4 additions & 0 deletions test/Translation/Forth/then-without-if-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN
4 changes: 4 additions & 0 deletions test/Translation/Forth/unclosed-begin-while-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42
4 changes: 4 additions & 0 deletions test/Translation/Forth/unclosed-if-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42
4 changes: 4 additions & 0 deletions test/Translation/Forth/until-without-begin-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL
4 changes: 4 additions & 0 deletions test/Translation/Forth/while-without-begin-error.forth
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(translate): validate control flow stack before popping by tetsuo-cpp · Pull Request #40 · tetsuo-cpp/warpforth · GitHub
Skip to content
fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tetsuo-cpp
merged 2 commits into

from

Feb 21, 2026
 Merged


fix(translate): validate control flow stack before popping
#40
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1f63df0

fix(translate): validate control flow stack before popping


tetsuo-cpp Feb 21, 2026
f2ec8d6

fix(translate): detect unclosed control flow and add REPEAT mismatch …


tetsuo-cpp Feb 21, 2026

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


29 changes: 29 additions & 0 deletions
lib/Translation/ForthToMLIR/ForthToMLIR.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

 // Pop the false-path block (from IF) - this becomes else-body start.
 if (cfStack.empty())
 return emitError("ELSE without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("ELSE without matching IF");

 // Push merge block for THEN to pick up.
 cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop the join/merge block.
 if (cfStack.empty())
 return emitError("THEN without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("THEN without matching IF");

 // Branch from current block to join.
 builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("UNTIL without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("UNTIL without matching BEGIN");

 auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("WHILE without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("WHILE without matching BEGIN");

 auto *bodyBlock = createStackBlock(parentRegion, loc);
 auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop loop header (from WHILE's re-push).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [destTag, loopBlock] = cfStack.pop_back_val();
 if (destTag != CFTag::Dest)
 return emitError("REPEAT without matching WHILE");

 // Branch back to loop header.
 builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

 // Pop exit block (from WHILE).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [origTag, exitBlock] = cfStack.pop_back_val();
 if (origTag != CFTag::Orig)
 return emitError("REPEAT without matching WHILE");

 // Continue after exit.
 builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 }
 }

 if (!cfStack.empty()) {
 cfStack.clear();
 return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
 }

 return success();
}

Expand Down

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-begin-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-then-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/else-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-until-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/repeat-without-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/then-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-begin-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/until-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/while-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(translate): validate control flow stack before popping by tetsuo-cpp · Pull Request #40 · tetsuo-cpp/warpforth · GitHub
Skip to content
fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tetsuo-cpp
merged 2 commits into

from

Feb 21, 2026
 Merged


fix(translate): validate control flow stack before popping
#40
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1f63df0

fix(translate): validate control flow stack before popping


tetsuo-cpp Feb 21, 2026
f2ec8d6

fix(translate): detect unclosed control flow and add REPEAT mismatch …


tetsuo-cpp Feb 21, 2026

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


29 changes: 29 additions & 0 deletions
lib/Translation/ForthToMLIR/ForthToMLIR.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

 // Pop the false-path block (from IF) - this becomes else-body start.
 if (cfStack.empty())
 return emitError("ELSE without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("ELSE without matching IF");

 // Push merge block for THEN to pick up.
 cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop the join/merge block.
 if (cfStack.empty())
 return emitError("THEN without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("THEN without matching IF");

 // Branch from current block to join.
 builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("UNTIL without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("UNTIL without matching BEGIN");

 auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("WHILE without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("WHILE without matching BEGIN");

 auto *bodyBlock = createStackBlock(parentRegion, loc);
 auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop loop header (from WHILE's re-push).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [destTag, loopBlock] = cfStack.pop_back_val();
 if (destTag != CFTag::Dest)
 return emitError("REPEAT without matching WHILE");

 // Branch back to loop header.
 builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

 // Pop exit block (from WHILE).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [origTag, exitBlock] = cfStack.pop_back_val();
 if (origTag != CFTag::Orig)
 return emitError("REPEAT without matching WHILE");

 // Continue after exit.
 builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 }
 }

 if (!cfStack.empty()) {
 cfStack.clear();
 return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
 }

 return success();
}

Expand Down

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-begin-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-then-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/else-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-until-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/repeat-without-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/then-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-begin-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/until-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/while-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(translate): validate control flow stack before popping by tetsuo-cpp · Pull Request #40 · tetsuo-cpp/warpforth · GitHub
Skip to content
fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tetsuo-cpp
merged 2 commits into

from

Feb 21, 2026
 Merged


fix(translate): validate control flow stack before popping
#40
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1f63df0

fix(translate): validate control flow stack before popping


tetsuo-cpp Feb 21, 2026
f2ec8d6

fix(translate): detect unclosed control flow and add REPEAT mismatch …


tetsuo-cpp Feb 21, 2026

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


29 changes: 29 additions & 0 deletions
lib/Translation/ForthToMLIR/ForthToMLIR.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

 // Pop the false-path block (from IF) - this becomes else-body start.
 if (cfStack.empty())
 return emitError("ELSE without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("ELSE without matching IF");

 // Push merge block for THEN to pick up.
 cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop the join/merge block.
 if (cfStack.empty())
 return emitError("THEN without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("THEN without matching IF");

 // Branch from current block to join.
 builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("UNTIL without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("UNTIL without matching BEGIN");

 auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("WHILE without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("WHILE without matching BEGIN");

 auto *bodyBlock = createStackBlock(parentRegion, loc);
 auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop loop header (from WHILE's re-push).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [destTag, loopBlock] = cfStack.pop_back_val();
 if (destTag != CFTag::Dest)
 return emitError("REPEAT without matching WHILE");

 // Branch back to loop header.
 builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

 // Pop exit block (from WHILE).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [origTag, exitBlock] = cfStack.pop_back_val();
 if (origTag != CFTag::Orig)
 return emitError("REPEAT without matching WHILE");

 // Continue after exit.
 builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 }
 }

 if (!cfStack.empty()) {
 cfStack.clear();
 return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
 }

 return success();
}

Expand Down

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-begin-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-then-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/else-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-until-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/repeat-without-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/then-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-begin-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/until-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/while-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(translate): validate control flow stack before popping by tetsuo-cpp · Pull Request #40 · tetsuo-cpp/warpforth · GitHub
Skip to content
fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tetsuo-cpp
merged 2 commits into

from

Feb 21, 2026
 Merged


fix(translate): validate control flow stack before popping
#40
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1f63df0

fix(translate): validate control flow stack before popping


tetsuo-cpp Feb 21, 2026
f2ec8d6

fix(translate): detect unclosed control flow and add REPEAT mismatch …


tetsuo-cpp Feb 21, 2026

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


29 changes: 29 additions & 0 deletions
lib/Translation/ForthToMLIR/ForthToMLIR.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

 // Pop the false-path block (from IF) - this becomes else-body start.
 if (cfStack.empty())
 return emitError("ELSE without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("ELSE without matching IF");

 // Push merge block for THEN to pick up.
 cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop the join/merge block.
 if (cfStack.empty())
 return emitError("THEN without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("THEN without matching IF");

 // Branch from current block to join.
 builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("UNTIL without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("UNTIL without matching BEGIN");

 auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("WHILE without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("WHILE without matching BEGIN");

 auto *bodyBlock = createStackBlock(parentRegion, loc);
 auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop loop header (from WHILE's re-push).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [destTag, loopBlock] = cfStack.pop_back_val();
 if (destTag != CFTag::Dest)
 return emitError("REPEAT without matching WHILE");

 // Branch back to loop header.
 builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

 // Pop exit block (from WHILE).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [origTag, exitBlock] = cfStack.pop_back_val();
 if (origTag != CFTag::Orig)
 return emitError("REPEAT without matching WHILE");

 // Continue after exit.
 builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 }
 }

 if (!cfStack.empty()) {
 cfStack.clear();
 return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
 }

 return success();
}

Expand Down

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-begin-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-then-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/else-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-until-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/repeat-without-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/then-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-begin-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/until-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/while-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(translate): validate control flow stack before popping by tetsuo-cpp · Pull Request #40 · tetsuo-cpp/warpforth · GitHub
Skip to content
fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tetsuo-cpp
merged 2 commits into

from

Feb 21, 2026
 Merged


fix(translate): validate control flow stack before popping
#40
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1f63df0

fix(translate): validate control flow stack before popping


tetsuo-cpp Feb 21, 2026
f2ec8d6

fix(translate): detect unclosed control flow and add REPEAT mismatch …


tetsuo-cpp Feb 21, 2026

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


29 changes: 29 additions & 0 deletions
lib/Translation/ForthToMLIR/ForthToMLIR.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

 // Pop the false-path block (from IF) - this becomes else-body start.
 if (cfStack.empty())
 return emitError("ELSE without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("ELSE without matching IF");

 // Push merge block for THEN to pick up.
 cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop the join/merge block.
 if (cfStack.empty())
 return emitError("THEN without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("THEN without matching IF");

 // Branch from current block to join.
 builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("UNTIL without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("UNTIL without matching BEGIN");

 auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("WHILE without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("WHILE without matching BEGIN");

 auto *bodyBlock = createStackBlock(parentRegion, loc);
 auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop loop header (from WHILE's re-push).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [destTag, loopBlock] = cfStack.pop_back_val();
 if (destTag != CFTag::Dest)
 return emitError("REPEAT without matching WHILE");

 // Branch back to loop header.
 builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

 // Pop exit block (from WHILE).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [origTag, exitBlock] = cfStack.pop_back_val();
 if (origTag != CFTag::Orig)
 return emitError("REPEAT without matching WHILE");

 // Continue after exit.
 builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 }
 }

 if (!cfStack.empty()) {
 cfStack.clear();
 return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
 }

 return success();
}

Expand Down

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-begin-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-then-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/else-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-until-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/repeat-without-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/then-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-begin-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/until-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/while-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(translate): validate control flow stack before popping by tetsuo-cpp · Pull Request #40 · tetsuo-cpp/warpforth · GitHub
Skip to content
fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tetsuo-cpp
merged 2 commits into

from

Feb 21, 2026
 Merged


fix(translate): validate control flow stack before popping
#40
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1f63df0

fix(translate): validate control flow stack before popping


tetsuo-cpp Feb 21, 2026
f2ec8d6

fix(translate): detect unclosed control flow and add REPEAT mismatch …


tetsuo-cpp Feb 21, 2026

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


29 changes: 29 additions & 0 deletions
lib/Translation/ForthToMLIR/ForthToMLIR.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

 // Pop the false-path block (from IF) - this becomes else-body start.
 if (cfStack.empty())
 return emitError("ELSE without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("ELSE without matching IF");

 // Push merge block for THEN to pick up.
 cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop the join/merge block.
 if (cfStack.empty())
 return emitError("THEN without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("THEN without matching IF");

 // Branch from current block to join.
 builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("UNTIL without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("UNTIL without matching BEGIN");

 auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("WHILE without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("WHILE without matching BEGIN");

 auto *bodyBlock = createStackBlock(parentRegion, loc);
 auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop loop header (from WHILE's re-push).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [destTag, loopBlock] = cfStack.pop_back_val();
 if (destTag != CFTag::Dest)
 return emitError("REPEAT without matching WHILE");

 // Branch back to loop header.
 builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

 // Pop exit block (from WHILE).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [origTag, exitBlock] = cfStack.pop_back_val();
 if (origTag != CFTag::Orig)
 return emitError("REPEAT without matching WHILE");

 // Continue after exit.
 builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 }
 }

 if (!cfStack.empty()) {
 cfStack.clear();
 return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
 }

 return success();
}

Expand Down

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-begin-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-then-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/else-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-until-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/repeat-without-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/then-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-begin-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/until-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/while-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(translate): validate control flow stack before popping by tetsuo-cpp · Pull Request #40 · tetsuo-cpp/warpforth · GitHub
Skip to content
fix(translate): validate control flow stack before popping#40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tetsuo-cpp
merged 2 commits into

from

Feb 21, 2026
 Merged


fix(translate): validate control flow stack before popping
#40
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
1f63df0

fix(translate): validate control flow stack before popping


tetsuo-cpp Feb 21, 2026
f2ec8d6

fix(translate): detect unclosed control flow and add REPEAT mismatch …


tetsuo-cpp Feb 21, 2026

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


29 changes: 29 additions & 0 deletions
lib/Translation/ForthToMLIR/ForthToMLIR.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -763,7 +763,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 builder.create<cf::BranchOp>(loc, mergeBlock, ValueRange{stack});

 // Pop the false-path block (from IF) - this becomes else-body start.
 if (cfStack.empty())
 return emitError("ELSE without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("ELSE without matching IF");

 // Push merge block for THEN to pick up.
 cfStack.push_back({CFTag::Orig, mergeBlock});
Expand All@@ -777,7 +781,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop the join/merge block.
 if (cfStack.empty())
 return emitError("THEN without matching IF");
 auto [tag, joinBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Orig)
 return emitError("THEN without matching IF");

 // Branch from current block to join.
 builder.create<cf::BranchOp>(loc, joinBlock, ValueRange{stack});
Expand DownExpand Up@@ -810,7 +818,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("UNTIL without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("UNTIL without matching BEGIN");

 auto *exitBlock = createStackBlock(parentRegion, loc);

Expand All@@ -829,7 +841,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {

 auto [s1, flag] = emitPopFlag(loc, stack);

 if (cfStack.empty())
 return emitError("WHILE without matching BEGIN");
 auto [tag, loopBlock] = cfStack.pop_back_val();
 if (tag != CFTag::Dest)
 return emitError("WHILE without matching BEGIN");

 auto *bodyBlock = createStackBlock(parentRegion, loc);
 auto *exitBlock = createStackBlock(parentRegion, loc);
Expand All@@ -851,13 +867,21 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 consume();

 // Pop loop header (from WHILE's re-push).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [destTag, loopBlock] = cfStack.pop_back_val();
 if (destTag != CFTag::Dest)
 return emitError("REPEAT without matching WHILE");

 // Branch back to loop header.
 builder.create<cf::BranchOp>(loc, loopBlock, ValueRange{stack});

 // Pop exit block (from WHILE).
 if (cfStack.empty())
 return emitError("REPEAT without matching WHILE");
 auto [origTag, exitBlock] = cfStack.pop_back_val();
 if (origTag != CFTag::Orig)
 return emitError("REPEAT without matching WHILE");

 // Continue after exit.
 builder.setInsertionPointToStart(exitBlock);
Expand DownExpand Up@@ -1007,6 +1031,11 @@ LogicalResult ForthParser::parseBody(Value &stack) {
 }
 }

 if (!cfStack.empty()) {
 cfStack.clear();
 return emitError("unclosed control flow (missing THEN, REPEAT, or UNTIL?)");
 }

 return success();
}

Expand Down

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-begin-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
BEGIN BEGIN REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/begin-then-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
BEGIN THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/else-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: ELSE without matching IF
\! kernel main
ELSE

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-repeat-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
1 IF REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/if-until-mismatch-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
IF UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/repeat-without-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: REPEAT without matching WHILE
\! kernel main
REPEAT

4 changes: 4 additions & 0 deletions
test/Translation/Forth/then-without-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: THEN without matching IF
\! kernel main
THEN

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-begin-while-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
BEGIN 1 WHILE 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/unclosed-if-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: unclosed control flow (missing THEN, REPEAT, or UNTIL?)
\! kernel main
1 IF 42

4 changes: 4 additions & 0 deletions
test/Translation/Forth/until-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: UNTIL without matching BEGIN
\! kernel main
UNTIL

4 changes: 4 additions & 0 deletions
test/Translation/Forth/while-without-begin-error.forth

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
\ RUN: %not %warpforth-translate --forth-to-mlir %s 2>&1 | %FileCheck %s
\ CHECK: WHILE without matching BEGIN
\! kernel main
WHILE