From dea1955aec5a8a7b1a4efb4f10e1ccfec65ed950 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Fri, 18 Dec 2015 16:47:41 -0800
Subject: [PATCH] allow empty words on stack in push/pop

---
 lips.lua | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lips.lua b/lips.lua
index dc397ba..d6d602a 100644
--- a/lips.lua
+++ b/lips.lua
@@ -800,6 +800,7 @@ end
 
 function Parser:number()
     if self.tt ~= 'NUM' then
+        -- FIXME: self.line can be nil in DEFINEs
         self:error('expected number')
     end
     local value = self.tok
@@ -1034,31 +1035,37 @@ function Parser:instruction()
         local addi = instructions['ADDI']
         local w = instructions[h == 'PUSH' and 'SW' or 'LW']
         local jr = instructions['JR']
-        local registers = {}
+        local stack = {}
         while not self:is_EOL() do
-            local r = self:register()
-            table.insert(registers, r)
+            if self.tt == 'NUM' then
+                if self.tok < 0 then
+                    self:error("can't push a negative number of spaces")
+                end
+                for i=1,self.tok do
+                    table.insert(stack, '')
+                end
+                self:advance()
+            else
+                table.insert(stack, self:register())
+            end
             if not self:is_EOL() then
                 self:optional_comma()
             end
         end
-        if #registers == 0 then
+        if #stack == 0 then
             self:error(h..' requires at least one argument')
         end
-        if #registers >= 0x8000/4 then
-            self:error("that's way too many registers bub")
-        end
         local args = {}
         if h == 'PUSH' then
             args.rt = 'SP'
             args.rs = 'SP'
-            args.immediate = {'NEGATE', {'NUM', #registers*4}}
+            args.immediate = {'NEGATE', {'NUM', #stack*4}}
             self:format_out(addi[3], addi[1], args, addi[4], addi[5])
         end
         args.base = 'SP'
-        for i, r in ipairs(registers) do
+        for i, r in ipairs(stack) do
             args.rt = r
-            if r ~= 'R0' then
+            if r ~= '' then
                 args.offset = {'NUM', (i - 1)*4}
                 self:format_out(w[3], w[1], args, w[4], w[5])
             end
@@ -1070,7 +1077,7 @@ function Parser:instruction()
         if h == 'POP' or h == 'JPOP' then
             args.rt = 'SP'
             args.rs = 'SP'
-            args.immediate = {'NUM', #registers*4}
+            args.immediate = {'NUM', #stack*4}
             self:format_out(addi[3], addi[1], args, addi[4], addi[5])
         end
     elseif h == 'NAND' then