From 0acf5555a8e96b168cfe526f5866c67bc5172dde Mon Sep 17 00:00:00 2001
From: IgorCielniak <igorcielniak.contact@gmail.com>
Date: Fri, 9 Jan 2026 11:10:18 +0100
Subject: [PATCH] added goto

---
 main.py             | 36 ++++++++++++++++++++++++++++++++++++
 tests/goto.expected |  3 +++
 tests/goto.sl       | 12 ++++++++++++
 tests/goto.test     |  1 +
 4 files changed, 52 insertions(+)
 create mode 100644 tests/goto.expected
 create mode 100644 tests/goto.sl
 create mode 100644 tests/goto.test

diff --git a/main.py b/main.py
index a2a0c69..625b2e6 100644
--- a/main.py
+++ b/main.py
@@ -2080,6 +2080,40 @@ def macro_inline(ctx: MacroContext) -> Optional[List[Op]]:
     return None
 
 
+def _require_definition_context(parser: "Parser", word_name: str) -> Definition:
+    if not parser.context_stack or not isinstance(parser.context_stack[-1], Definition):
+        raise ParseError(f"'{word_name}' can only appear inside a definition")
+    return parser.context_stack[-1]
+
+
+def macro_label(ctx: MacroContext) -> Optional[List[Op]]:
+    parser = ctx.parser
+    if parser._eof():
+        raise ParseError("label name missing after 'label'")
+    tok = parser.next_token()
+    name = tok.lexeme
+    if not _is_identifier(name):
+        raise ParseError(f"invalid label name '{name}'")
+    definition = _require_definition_context(parser, "label")
+    if any(node.op == "label" and node.data == name for node in definition.body):
+        raise ParseError(f"duplicate label '{name}' in definition '{definition.name}'")
+    parser.emit_node(Op(op="label", data=name))
+    return None
+
+
+def macro_goto(ctx: MacroContext) -> Optional[List[Op]]:
+    parser = ctx.parser
+    if parser._eof():
+        raise ParseError("label name missing after 'goto'")
+    tok = parser.next_token()
+    name = tok.lexeme
+    if not _is_identifier(name):
+        raise ParseError(f"invalid label name '{name}'")
+    _require_definition_context(parser, "goto")
+    parser.emit_node(Op(op="jump", data=name))
+    return None
+
+
 def macro_compile_time(ctx: MacroContext) -> Optional[List[Op]]:
     """Run the next word at compile time and still emit it for runtime."""
     parser = ctx.parser
@@ -2864,6 +2898,8 @@ def bootstrap_dictionary() -> Dictionary:
     dictionary.register(Word(name="immediate", immediate=True, macro=macro_immediate))
     dictionary.register(Word(name="compile-only", immediate=True, macro=macro_compile_only))
     dictionary.register(Word(name="inline", immediate=True, macro=macro_inline))
+    dictionary.register(Word(name="label", immediate=True, macro=macro_label))
+    dictionary.register(Word(name="goto", immediate=True, macro=macro_goto))
     dictionary.register(Word(name="compile-time", immediate=True, macro=macro_compile_time))
     dictionary.register(Word(name="here", immediate=True, macro=macro_here))
     dictionary.register(Word(name="with", immediate=True, macro=macro_with))
diff --git a/tests/goto.expected b/tests/goto.expected
new file mode 100644
index 0000000..2d6976f
--- /dev/null
+++ b/tests/goto.expected
@@ -0,0 +1,3 @@
+3
+2
+1
diff --git a/tests/goto.sl b/tests/goto.sl
new file mode 100644
index 0000000..33eb008
--- /dev/null
+++ b/tests/goto.sl
@@ -0,0 +1,12 @@
+import stdlib/stdlib.sl
+import stdlib/io.sl
+
+word main
+    3
+    label loop
+    dup puti cr
+    1 -
+    dup 0 >
+    if goto loop end
+    drop
+end
\ No newline at end of file
diff --git a/tests/goto.test b/tests/goto.test
new file mode 100644
index 0000000..cc74592
--- /dev/null
+++ b/tests/goto.test
@@ -0,0 +1 @@
+python main.py tests/goto.sl -o /tmp/goto > /dev/null && /tmp/goto
\ No newline at end of file