fix: compiler error when using MENU with no arguments (#469)

inseven · Dec 7, 2024 · e4e08f8 · e4e08f8
1 parent 8ab5005
commit e4e08f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/compiler.lua b/src/compiler.lua
@@ -1690,15 +1690,15 @@ function handleFn_MEAN(exp, procState)
 end
 
 function handleFn_MENU(exp, procState)
-    for i, arg in ipairs(exp.args) do
-        procState:emitExpression(arg, Callables.MENU.args[i])
-    end
-    if #exp.args == 0 then
-        procState:emit("BB", opcodes.CallFunction, fncodes.Menu)
-    else
+    if exp.args and #exp.args > 0 then
+        for i, arg in ipairs(exp.args) do
+            procState:emitExpression(arg, Callables.MENU.args[i])
+        end
         procState:emit("BB", opcodes.CallFunction, fncodes.MenuWithMemory)
+        procState:popStack(#exp.args)
+    else
+        procState:emit("BB", opcodes.CallFunction, fncodes.Menu)
     end
-    procState:popStack(#exp.args)
     procState:pushStack(Int)
 end
 

diff --git a/src/tcompiler.lua b/src/tcompiler.lua
@@ -601,6 +601,11 @@ checkCode('mPOPUP(1, 2, 0, "a", 0)', {
     op"DropInt",
 })
 
+checkCode('MENU', {
+    fn"Menu",
+    op"DropInt",
+})
+
 checkSyntaxError("ALERT()", "1: Zero-argument calls should not have ()")
 
 checkSyntaxError("alert(a$, b$, c$, d$, e$, f$)", "1: Wrong number of arguments to ALERT")