Small compiler speedups, Add lua tests

data/expression2/tests/compiler/bench.lua

@@ -0,0 +1,24 @@
+local t = {}
+for i = 1, 600 do
+	t[i] = i
+end
+
+local script = "array(" .. table.concat(t, ",") .. ")"
+
+local o1, o2, o3 = debug.gethook()
+
+debug.sethook(error, "", 1e6)
+
+local _, code_ok, compiled = pcall(E2Lib.compileScript, script)
+
+debug.sethook(o1, o2, o3)
+
+assert(code_ok, "Took too long to compile!")
+
+debug.sethook(error, "", 1e6)
+
+local ok = pcall(compiled)
+
+debug.sethook(o1, o2, o3)
+
+assert(ok, "Took too long to run!")

lua/entities/gmod_wire_expression2/base/compiler.lua

@@ -10,6 +10,8 @@
 local Node, NodeVariant = E2Lib.Parser.Node, E2Lib.Parser.Variant
 local Operator = E2Lib.Operator
 
+local pairs, ipairs = pairs, ipairs
+
 local TickQuota = GetConVar("wire_expression2_quotatick"):GetInt()
 
 cvars.RemoveChangeCallback("wire_expression2_quotatick", "compiler_quota_check")
@@ -390,7 +392,7 @@
 
 	---@param data { [1]: Token<string>, [2]: Node, [3]: Node, [4]: Node?, [5]: Node } var start stop step block
 	[NodeVariant.For] = function (self, trace, data)
 		local var, start, stop, step = data[1], self:CompileExpr(data[2]), self:CompileExpr(data[3]), data[4] and self:CompileExpr(data[4]) or data[4]
 
 		local block = self:Scope(function(scope)
 			scope.data.loop = true
@@ -569,9 +571,9 @@
 
 					if state.__break__ then
 						state.__break__ = false
 						goto exit
 					elseif state.__return__ then -- Yes this should only be checked if the switch is inside a function, but I don't care enough about the performance of switch case to add another duplicated 30 lines to the file
 						goto exit
 					else -- Fallthrough, run every case until break found.
 						for j = i + 1, ncases do
 							cases[j][2](state)
@@ -1025,9 +1027,9 @@
 									state.GlobalScope[var], state.GlobalScope.vclk[var] = val, true
 
 									if state.GlobalScope.lookup[val] then
 										state.GlobalScope.lookup[val][var] = true
 									else
 										state.GlobalScope.lookup[val] = { [var] = true }
 									end
 								end
 							else
@@ -1819,7 +1821,7 @@
 								if fn.attributes.legacy then
 									local largs = { [1] = {}, [nargs + 2] = arg_types }
 									for i = 1, nargs do
 										largs[i + 1] = { [1] = function() return rargs[i] end }
 									end
 									return fn[3](state, largs, arg_types)
 								elseif varsig == "array(...)" then -- Need this since can't enforce compile time argument type restrictions on string calls. Woop. Array creation should not be a function..
@@ -2047,26 +2049,22 @@
 	end
 end
 
----@param node Node
----@return RuntimeOperator
----@return string expr_type
-function Compiler:CompileExpr(node)
-	assert(node.trace, "Incomplete node: " .. tostring(node))
-	local op, ty = assert(CompileVisitors[node.variant], "Unimplemented Compile Step: " .. node:instr())(self, node.trace, node.data, false)
+function Compiler:CompileExpr(node --[[@param node Node]]) ---@return RuntimeOperator, string
+	local op, ty = CompileVisitors[node.variant](self, node.trace, node.data, false) ---@cast op -nil # Expressions should never return nil function
 
-	if node.variant == NodeVariant.ExprDynCall then
-		self:Assert(ty, "Cannot use void in expression position ( Did you mean Call()[type] ? )", node.trace)
-	else
-		self:Assert(ty, "Cannot use void in expression position", node.trace)
-	end
+	if ty == nil then
+		if node.variant == NodeVariant.ExprDynCall then
+			self:Error("Cannot use void in expression position ( Did you mean Call()[type] ? )", node.trace)
+		else
+			self:Error("Cannot use void in expression position", node.trace)
+		end
+	end ---@cast ty -nil # LuaLS can't figure this out yet.
 
 	return op, ty
 end
 
----@return RuntimeOperator
-function Compiler:CompileStmt(node)
-	assert(node.trace, "Incomplete node: " .. tostring(node))
-	return assert(CompileVisitors[node.variant], "Unimplemented Compile Step: " .. node:instr())(self, node.trace, node.data, true)
+function Compiler:CompileStmt(node --[[@param node Node]])
+	return CompileVisitors[node.variant](self, node.trace, node.data, true)
 end
 
 ---@param ast Node