adding failsafe to break optimizer loop

src/ast_optimizer.lua

@@ -35,6 +35,10 @@ function Optimizer:optimize_iteratively(ast)
     self:log(string.format(
           "Iteration: %d finished. Number of optimizations: %d",
           iterations, num_of_optimizations))
+    if iterations > 100 then
+      print("Aborting optimizer. This is likely a bug.")
+      break
+    end
   until num_of_optimizations == 0
   return ast
 end

src/equinox_bundle.lua

@@ -577,6 +577,10 @@ function Optimizer:optimize_iteratively(ast)
     self:log(string.format(
           "Iteration: %d finished. Number of optimizations: %d",
           iterations, num_of_optimizations))
+    if iterations > 100 then
+      print("Aborting optimizer. This is likely a bug.")
+      break
+    end
   until num_of_optimizations == 0
   return ast
 end
@@ -2804,19 +2808,15 @@ end
 
 function pop()
   local size = #stack
-  if size == 0 then
-    error("Stack underflow: " .. name)
-  end
+  if size == 0 then error("Stack underflow: " .. name) end
   local item = stack[size]
   stack[size] = nil
   if item ~= NIL then return item else return nil end
 end
 
 function pop2nd()
   local n = #stack
-  if n < 2 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 2 then error("Stack underflow: " .. name) end
   local item = stack[n - 1]
   stack[n -1] = stack[n]
   stack[n] = nil
@@ -2825,79 +2825,61 @@ end
 
 function pop3rd()
   local n = #stack
-  if n < 3 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 3 then error("Stack underflow: " .. name) end
   local item = table.remove(stack, n - 2)
   if item ~= NIL then return item else return nil end
 end
 
 function swap()
   local n = #stack
-  if n < 2 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 2 then error("Stack underflow: " .. name) end
   stack[n], stack[n - 1] = stack[n - 1], stack[n]
 end
 
 function rot()
   local n = #stack
-  if n < 3 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 3 then error("Stack underflow: " .. name) end
   local new_top = stack[n -2]
   table.remove(stack, n - 2)
   stack[n] = new_top
 end
 
 function mrot()
   local n = #stack
-  if n < 3 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 3 then error("Stack underflow: " .. name) end
   local temp = stack[n]
   stack[n] = nil
   table.insert(stack, n - 2, temp)
 end
 
 function over()
   local n = #stack
-  if n < 2 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 2 then error("Stack underflow: " .. name) end
   stack[n + 1] = stack[n - 1]
 end
 
 function tuck()
   local n = #stack
-  if n < 2 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 2 then error("Stack underflow: " .. name) end
   table.insert(stack, n - 1, stack[n])
 end
 
 function nip()
   local n = #stack
-  if n < 2 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 2 then error("Stack underflow: " .. name) end
   stack[n - 1] = stack[n]
   stack[n] = nil
 end
 
 function dup()
   local n = #stack
-  if n < 1 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 1 then error("Stack underflow: " .. name) end
   stack[n + 1] = stack[n]
 end
 
 function dup2()
   local n = #stack
-  if n < 2 then
-    error("Stack underflow: " .. name)
-  end
+  if n < 2 then error("Stack underflow: " .. name) end
   local tos1 = stack[n]
   local tos2 = stack[n - 1]
   stack[n + 1] = tos2
@@ -2906,17 +2888,13 @@ end
 
 function tos()
   local item = stack[#stack]
-  if item == nil then
-    error("Stack underflow: " .. name)
-  end
+  if item == nil then error("Stack underflow: " .. name) end
   if item ~= NIL then return item else return nil end
 end
 
 function tos2()
   local item = stack[#stack - 1]
-  if item == nil then
-    error("Stack underflow: " .. name)
-  end
+  if item == nil then error("Stack underflow: " .. name) end
   if item ~= NIL then return item else return nil end
 end
 
@@ -2936,9 +2914,7 @@ end
 
 function pick(index)
   local item = stack[#stack - index]
-  if item == nil then
-    error("Stack underflow: " .. name)
-  end
+  if item == nil then error("Stack underflow: " .. name) end
   if item ~= NIL then return item else return nil end
 end
 
@@ -3081,7 +3057,7 @@ return utils
 end
 end
 
-__VERSION__="0.1-109"
+__VERSION__="0.1-110"
 
 local Compiler = require("compiler")
 local Optimizer = require("ast_optimizer")

src/version/version.txt

@@ -1 +1 @@
-0.1-109
+0.1-110