more work on ranges

Author: CapsAdmin

nattlua/analyzer/mutation_tracking.lua

@@ -175,6 +175,7 @@ return function(META)
 			end
 
 			function META:TrackUpvalueUnion(obj, truthy_union, falsy_union, inverted)
+				if not truthy_union or not falsy_union then debug.trace() error() end
 				local upvalue = obj:GetUpvalue()
 
 				if not upvalue then return end
@@ -468,8 +469,12 @@ return function(META)
 
 								union:SetUpvalue(data.upvalue)
 							end
-
-							self:MutateUpvalue(data.upvalue, union, true)
+								
+							if data.stack[#data.stack] and data.stack[#data.stack].falsy and data.stack[#data.stack].falsy.Type == "range" then								
+								self:MutateUpvalue(data.upvalue, data.stack[#data.stack].falsy:Copy(), true)
+							else
+								self:MutateUpvalue(data.upvalue, union, true)
+							end
 						end
 					end
 				end

nattlua/analyzer/operators/binary.lua

@@ -146,11 +146,13 @@ end
 local intersect_comparison = require("nattlua.analyzer.intersect_comparison")
 
 local function number_comparison(self, l, r, op, invert)
-	local nl, nr = intersect_comparison(l, r, op, invert)
-
-	if nl and nr then self:TrackUpvalueUnion(l, nl, nr) end
+	local nl, nr, nl2, nr2 = intersect_comparison(l, r, op, invert)
+	
+	if nl and nr then 
+		self:TrackUpvalueUnion(l, nl, nr) 
+	end
 
-	if nr and nl then self:TrackUpvalueUnion(r, nr, nl) end
+	if nl2 and nr2 then self:TrackUpvalueUnion(r, nl2, nr2) end
 
 	if nl and nr then
 		if nl:IsNan() or nr:IsNan() then

test/tests/nattlua/analyzer/function.lua

@@ -979,7 +979,7 @@ do
 				local left = i * len + 1
 				local right = left + len - 1
 				attest.equal(left, _  as 1 .. inf)
-				attest.equal(right, _  as 0 .. inf)
+				attest.equal(right, _  as 1 .. inf)
 				local res = str:sub(left, right)
 				attest.equal(res, _  as string)
 

test/tests/nattlua/analyzer/number.lua

@@ -82,7 +82,7 @@ analyze[[
 ]]
 analyze[[
     local n = _  as 0 .. 5
-    if n > 1 then attest.equal(n, _  as 2 .. 5) else attest.equal(n, _  as 0 .. 5) end
+    if n > 1 then attest.equal(n, _  as 2 .. 5) else attest.equal(n, _  as 0 .. 1) end
 ]]
 analyze[[
     local a = _ as 1 .. 2