unify upvalue and table tracking

Author: CapsAdmin

nattlua/analyzer/analyzer.lua

@@ -340,15 +340,13 @@ function META.New(config)
 			max_iterations = false,
 			break_out_scope = false,
 			_continue_ = false,
-			tracked_tables = false,
 			inverted_index_tracking = false,
 			deferred_calls = false,
 			function_scope = false,
 			call_stack = false,
 			self_arg_stack = false,
-			tracked_upvalues_done = false,
-			tracked_upvalues = false,
-			tracked_tables_done = false,
+			tracked_objects_done = false,
+			tracked_objects = false,
 			scope = false,
 			current_statement = false,
 			left_assigned = false,

nattlua/analyzer/base/lexical_scope.lua

@@ -161,48 +161,43 @@ function META:Copy()
 	return copy
 end
 
-META:GetSet("TrackedUpvalues", false)
-META:GetSet("TrackedTables", false)
+META:GetSet("TrackedNarrowings", false)
 
 function META:FindTrackedUpvalue(upvalue)
-	local upvalues = self:GetTrackedUpvalues()
+	local objects = self:GetTrackedNarrowings()
 
-	if not upvalues then return false end
+	if not objects then return false end
 
-	for _, data in ipairs(upvalues) do
-		if data.upvalue == upvalue then return data end
+	for _, data in ipairs(objects) do
+		if data.kind == "upvalue" and data.upvalue == upvalue then return data end
 	end
 end
 
 function META:TracksSameAs(scope, obj)
-	local upvalues_a, tables_a = self:GetTrackedUpvalues(), self:GetTrackedTables()
-	local upvalues_b, tables_b = scope:GetTrackedUpvalues(), scope:GetTrackedTables()
-
-	if not upvalues_a or not upvalues_b then return false end
-
-	if not tables_a or not tables_b then return false end
-
-	for i, data_a in ipairs(upvalues_a) do
-		for i, data_b in ipairs(upvalues_b) do
-			if data_a.upvalue == data_b.upvalue then
-				if data_a.stack and data_b.stack then
-					local a = data_a.stack[#data_a.stack].truthy
-					local b = data_b.stack[#data_b.stack].truthy
-
-					if a:Equal(b) then return true end
-				else
-					return true
+	local objects_a = self:GetTrackedNarrowings()
+	local objects_b = scope:GetTrackedNarrowings()
+
+	if not objects_a or not objects_b then return false end
+
+	for i, data_a in ipairs(objects_a) do
+		for i, data_b in ipairs(objects_b) do
+			if data_a.kind == "upvalue" and data_b.kind == "upvalue" then
+				if data_a.upvalue == data_b.upvalue then
+					if data_a.stack and data_b.stack then
+						local a = data_a.stack[#data_a.stack].truthy
+						local b = data_b.stack[#data_b.stack].truthy
+
+						if a:Equal(b) then return true end
+					else
+						return true
+					end
 				end
+			elseif data_a.kind == "table" and data_b.kind == "table" then
+				if data_a.obj == data_b.obj and data_a.obj == obj then return true end
 			end
 		end
 	end
 
-	for i, data_a in ipairs(tables_a) do
-		for i, data_b in ipairs(tables_b) do
-			if data_a.obj == data_b.obj and data_a.obj == obj then return true end
-		end
-	end
-
 	return false
 end
 

nattlua/analyzer/control_flow.lua

@@ -58,7 +58,7 @@ return function(META--[[#: any]])
 			}
 			push_break_state(self, break_state)
 			self:PushScope(loop_scope)
-			self:ApplyMutationsAfterStatement(scope, true, scope:GetTrackedUpvalues(), scope:GetTrackedTables())
+			self:ApplyMutationsAfterStatement(scope, true, scope:GetTrackedNarrowings())
 			self:PopScope()
 		end
 
@@ -256,34 +256,27 @@ return function(META--[[#: any]])
 
 			if assert_expression and assert_expression:IsTruthy() then
 				-- track the assertion expression
-				local upvalues
-				local tracked = self:GetTrackedUpvalues(nil, frame.scope)
-
-				if tracked[1] then
-					upvalues = {}
-
-					for _, a in ipairs(tracked) do
-						for _, b in ipairs(self:GetTrackedUpvalues()) do
-							if a.upvalue == b.upvalue then table_insert(upvalues, a) end
-						end
-					end
-				end
-
-				local tables
-				local tracked = self:GetTrackedTables(nil, frame.scope)
-
-				if tracked[1] then
-					tables = {}
-
-					for _, a in ipairs(tracked) do
-						for _, b in ipairs(self:GetTrackedTables()) do
-							if a.obj == b.obj then table_insert(tables, a) end
+				local tracked_objects
+				local tracked_from_scope = self:GetTrackedObjects(nil, frame.scope)
+
+				if tracked_from_scope[1] then
+					local current_tracked = self:GetTrackedObjects()
+					tracked_objects = {}
+
+					for _, a in ipairs(tracked_from_scope) do
+						for _, b in ipairs(current_tracked) do
+							if
+								(a.kind == "upvalue" and b.kind == "upvalue" and a.upvalue == b.upvalue) or
+								(a.kind == "table" and b.kind == "table" and a.obj == b.obj)
+							then
+								table_insert(tracked_objects, a)
+							end
 						end
 					end
 				end
 
 				self:PushScope(function_scope)
-				self:ApplyMutationsAfterStatement(frame.scope, false, upvalues, tables)
+				self:ApplyMutationsAfterStatement(frame.scope, false, tracked_objects)
 				self:PopScope()
 				return
 			end
@@ -292,8 +285,7 @@ return function(META--[[#: any]])
 			self:ApplyMutationsAfterStatement(
 				frame.scope,
 				true,
-				frame.scope:GetTrackedUpvalues(),
-				frame.scope:GetTrackedTables()
+				frame.scope:GetTrackedNarrowings()
 			)
 			self:PopScope()
 		end
@@ -323,9 +315,9 @@ return function(META--[[#: any]])
 		end
 
 		local scope = self:GetScope()
-		local u, t = self:GetTrackedUpvalues(old), self:GetTrackedTables()
+		local tracked = self:GetTrackedObjects(old)
 		self:PushScope(self:GetScope():GetNearestFunctionScope())
-		self:ApplyMutationsAfterStatement(scope, false, u, t)
+		self:ApplyMutationsAfterStatement(scope, false, tracked)
 		self:PopScope()
 
 		if not no_report then
@@ -391,7 +383,7 @@ return function(META--[[#: any]])
 		end
 
 		self:PushScope(function_scope)
-		self:ApplyMutationsAfterStatement(scope, true, scope:GetTrackedUpvalues(), scope:GetTrackedTables())
+		self:ApplyMutationsAfterStatement(scope, true, scope:GetTrackedNarrowings())
 		self:PopScope()
 	end