numbers with max should not be considered literals

Author: CapsAdmin

examples/projects/luajit/src/platforms/unix/filesystem.nlua

@@ -183,7 +183,7 @@ do
 
 	local dot = string.byte(".")
 
-	local function is_dots(ptr: FFIArray<|3, number|>)
+	local function is_dots(ptr: {[number] = number})--FFIArray<|3, number|>)
 		if ptr[0] == dot then
 			if ptr[1] == dot and ptr[2] == 0 then return true end
 

examples/projects/luajit/src/platforms/windows/filesystem.nlua

@@ -122,7 +122,7 @@ do
 	)
 	local dot = string.byte(".")
 
-	local function is_dots(ptr: FFIArray<|3, number|>)
+	local function is_dots(ptr: {[number] = number}) -- todo: maybe FFIArray<|12, number|> should be ok to pass when the argument contract is FFIArray<|3, number|> , because it's at least 3 in length
 		if ptr[0] == dot then
 			if ptr[1] == dot and ptr[2] == 0 then return true end
 

nattlua/analyzer/operators/index.lua

@@ -99,7 +99,7 @@ local function index_table(analyzer, self, key, raw)
 	if key:IsLiteral() then
 		local found_key = self:FindKeyValReverse(key)
 
-		if found_key and not found_key.key:IsLiteral() then
+		if found_key and not found_key.key:IsLiteral() and not (found_key.key.Max) then
 			val = Union({Nil(), val})
 		end
 	end

nattlua/types/number.lua

@@ -99,7 +99,7 @@ function META.Equal(a--[[#: TNumber]], b--[[#: TBaseType]])
 end
 
 function META:IsLiteral()
-	return self.Data ~= false
+	return self.Data ~= false and self.Max == false
 end
 
 META:IsSet("DontWiden", false)
@@ -108,25 +108,28 @@ function META:Widen()
 	return Number()
 end
 
-function META:CopyLiteralness(num--[[#: TBaseType]])
-	if self.ReferenceType == num.ReferenceType and self.Data == num.Data then
+function META:CopyLiteralness(obj--[[#: TBaseType]])
+	if self.ReferenceType == obj.ReferenceType and self.Data == obj.Data then
 		return self
 	end
 
 	local self = self:Copy()
 
-	if num.Type ~= "number" or not num.Max then
-		if num:IsReferenceType() then
-			self:SetReferenceType(true)
-		else
-			if not num:IsLiteral() then self.Data = false end
-		end
+	if obj:IsReferenceType() then
+		self:SetReferenceType(true)
 	else
-		if self:IsSubsetOf(num) then
-			if num:IsReferenceType() then self:SetReferenceType(true) end
+		if  obj.Max then
+
+		else
+			if obj.Type == "union" then
+				local x = (obj --[[#as any]]):GetType("number")
+
+				if x then
+					if x.Max then return self end
+				end
+			end
 
-			self:SetData(num.Data)
-			self:SetMax(num.Max)
+			if not obj:IsLiteral() then self.Data = false end
 		end
 	end
 

test/tests/nattlua/analyzer/list.lua

@@ -38,7 +38,7 @@ analyze([[local a: {[number] = any} = {foo = 1}]], [[has no key "foo"]])
 -- {[1 .. inf]: any}
 check(
 	analyze[[local a: {[1 .. inf] = any} = {[1234] = 1}]],
-	"{ [1..inf] = number as any }"
+	"{ [1234 as 1..inf] = number as any }"
 )
 
 check(analyze([[local a: {["a" | "b" | "c"] = 1 | 2 | 3} = {a = 2}]]), [[{ ["a" as "a" | "b" | "c"] = 2 as 1 | 2 | 3 }]])