some fixes and add some last resort "timeout" check to prevent analyzer from getting stuck forever

Author: CapsAdmin

nattlua/analyzer/analyzer.lua

@@ -144,6 +144,7 @@ do
 		elseif node.kind == "postfix_expression_index" then
 			local val = self:Assert(self:AnalyzeExpression(node.left))
 			local obj = self:Assert(self:AnalyzeExpression(node.expression))
+
 			if not self:IsTypesystem() then
 				val = self:GetFirstValue(val)
 				obj = self:GetFirstValue(obj)
@@ -209,6 +210,7 @@ do
 
 	function META:AnalyzeExpression(node)
 		self:PushCurrentExpression(node)
+		self:CheckTimeout()
 		local obj, err = self:AnalyzeRuntimeExpression(node)
 		self:PopCurrentExpression()
 
@@ -222,6 +224,37 @@ do
 		node.scope = self:GetScope()
 		return obj, err
 	end
+
+	function META:CheckTimeout()
+		self.check_count = (self.check_count or 0) + 1
+		local count = self.check_count
+
+		if count < 90000 then return end
+
+		self.timeout = self.timeout or {}
+		local node = self:GetCurrentStatement() or self:GetCurrentExpression()
+		self.timeout[node] = (self.timeout[node] or 0) + 1
+
+		if count < 100000 then return end
+
+		local top = {}
+
+		for node, count in pairs(self.timeout) do
+			if count > 5 then table.insert(top, {node = node, count = count}) end
+		end
+
+		table.sort(top, function(a, b)
+			return a.count > b.count
+		end)
+
+		for i, info in ipairs(top) do
+			if i > 10 then break end
+
+			self:Warning({info.node, " was crawled ", info.count, " times"})
+		end
+
+		self:FatalError("too many iterations, stopping execution")
+	end
 end
 
 function META:OnDiagnostic() end

nattlua/analyzer/operators/binary.lua

@@ -241,6 +241,7 @@ local function Binary(self, node, l, r, op)
 			l = self:Assert(self:AnalyzeExpression(node.left))
 			r = self:Assert(self:AnalyzeExpression(node.right))
 		end
+
 		self:TrackUpvalue(l)
 		self:TrackUpvalue(r)
 

nattlua/analyzer/operators/newindex.lua

@@ -124,9 +124,7 @@ return {
 		end
 
 		function META:NewIndexOperator(obj, key, val, raw)
-			if obj.Type == "any" then
-				return true
-			end
+			if obj.Type == "any" then return true end
 
 			if
 				val.Type == "function" and
@@ -164,9 +162,7 @@ return {
 				ok, err = obj:Set(key, val)
 			end
 
-			if not ok then 
-				self:Error(err) 
-			end
+			if not ok then self:Error(err) end
 		end
 	end,
 }

nattlua/analyzer/statements/assignment.lua

@@ -143,7 +143,7 @@ return {
 			-- local a: >>number<< = 1
 			if exp_key.type_expression then
 				self:PushAnalyzerEnvironment("typesystem")
-				local contract = self:AnalyzeExpression(exp_key.type_expression)
+				local contract = self:Assert(self:AnalyzeExpression(exp_key.type_expression))
 				self:PopAnalyzerEnvironment()
 
 				if right[left_pos] then
@@ -237,7 +237,7 @@ return {
 				else
 					-- TODO: refactor out to mutation assignment?
 					-- index assignment: foo[a] = 1
-					local obj = self:AnalyzeExpression(exp_key.left)
+					local obj = self:Assert(self:AnalyzeExpression(exp_key.left))
 					self:ClearTracked()
 
 					if self:IsRuntime() then key = self:GetFirstValue(key) or Nil() end

nattlua/compiler.lua

@@ -100,6 +100,8 @@ function META:OnDiagnostic(code, msg, severity, start, stop, node, ...)
 		msg = "\x1b[0;31m" .. msg .. "\x1b[0m"
 	elseif severity == "warning" then
 		msg = "\x1b[0;33m" .. msg .. "\x1b[0m"
+	elseif severity == "fatal" then
+		msg = "\x1b[0;35m" .. msg .. "\x1b[0m"
 	end
 
 	if not _G.TEST then

test/tests/nattlua/analyzer/complex/ffibuild.nlua

@@ -1,4 +1,6 @@
-do return end
+do
+	return
+end
 
 do
 	_G[jit.os:upper()] = true

test/tests/nattlua/analyzer/lua.lua

@@ -241,10 +241,8 @@ analyze("attest.equal(((1 or false) and true) or false, true)")
 
 do --- allcases
 	local basiccases = {
-		{"nil", nil},
 		{"false", false},
 		{"true", true},
-		{"10", 10},
 	}
 	local mem = {basiccases} -- for memoization
 	local function allcases(n)