more work and fixes around cdata types

Author: CapsAdmin

nattlua/analyzer/statements/assignment.lua

@@ -228,7 +228,9 @@ return {
 
 							if contract then
 								val = val:CopyLiteralness(contract)
+								self:PushCurrentExpression(exp_key)
 								self:ErrorIfFalse(check_type_against_contract(val, contract))
+								self:PopCurrentExpression()
 								val:SetContract(contract)
 							end
 						end

nattlua/c_declarations/analyzer.lua

@@ -105,7 +105,7 @@ local function cast(self, node)
 				node.of.modifiers[1] == "const" and
 				node.of.modifiers[2] == "char"
 			then
-				return Union({arr, Nil(), String()})
+				arr.is_string = true
 			end
 		end
 

nattlua/c_declarations/main.lua

@@ -119,20 +119,23 @@ local function TCData(obj, ...)
 end
 
 local function process_arg(obj)
-	if obj.Type == "table" then
+	if obj.Type == "number" then
+		return Union({TCData(obj), obj})
+	elseif obj.Type == "table" then
 		local typ = obj:Get(Number())
+
 		if typ then
-			return Union({TCData(typ:Copy()), Nil(), TCData(obj)})
+			if typ.Type == "number" then
+				return Union({Nil(), TCData(obj), obj.is_string and String() or nil})
+			end
+
+			return Union({TCData(typ:Copy()), Nil(), TCData(obj), obj.is_string and String() or nil})
 		end
 	elseif obj.Type == "union" then
 		local u = {}
 
 		for i, obj in ipairs(obj:GetData()) do
-			if obj.Type == "table" then
-				u[i] = TCData(obj)
-			else
-				u[i] = obj
-			end
+			if obj.Type == "table" then u[i] = TCData(obj) else u[i] = obj end
 		end
 
 		return Union(u)
@@ -143,9 +146,8 @@ local function process_type(key, obj, is_typedef, mode)
 	if obj.Type == "function" then
 		for i, v in ipairs(obj:GetInputSignature():GetData()) do
 			local newtype = process_arg(v)
-			if newtype then
-				obj:GetInputSignature():Set(i, newtype)
-			end
+
+			if newtype then obj:GetInputSignature():Set(i, newtype) end
 		end
 
 		local ret = obj:GetOutputSignature():GetFirstValue()
@@ -235,7 +237,7 @@ function cparser.reset()
 	types = Table()
 	local analyzer = assert(analyzer_context:GetCurrentAnalyzer(), "no analyzer in context")
 	local env = analyzer:GetScopeHelper(analyzer.function_scope)
-	analyzer:ErrorIfFalse(env.typesystem.ffi:Set(ConstString("C"), Table()))
+	--analyzer:ErrorIfFalse(env.typesystem.ffi:Set(ConstString("C"), Table()))
 	analyzer:ErrorIfFalse(env.runtime.ffi:Set(ConstString("C"), Table()))
 end
 

nattlua/definitions/lua/luajit.nlua

@@ -11,7 +11,7 @@ function TCData<|T: ConstructorArgument, ...: ...any|>
 	-- this assumes keys are in order, which in the typesystem they SHOULD be
 	if ... then
 		if is_array then
-			local tbl = ...
+			local tbl = copy<|...|>
 
 			if type(tbl) == "table" then
 				if #tbl - 1 > keysof<|T|> then error<|"too many initializers", 2|> end
@@ -24,7 +24,13 @@ function TCData<|T: ConstructorArgument, ...: ...any|>
 						error("expected type '" .. tostring(contract) .. "' at index " .. (i - 1), 2)
 					end
 
-					T[i - 1] = v & contract
+					local obj = copy<|v|>
+
+					for k, v in pairs(contract) do
+						if rawget(obj, k) == nil then obj[k] = v end
+					end
+
+					T[i - 1] = obj
 				end
 			end
 		elseif type(T) == "table" then
@@ -78,16 +84,16 @@ function TCData<|T: ConstructorArgument, ...: ...any|>
 
 			return TCData<|obj|>
 		end,
-		__le = function <|self: self, other: self|>
+		__le = function <|self: self, other: self | number | any|>
 			return boolean
 		end,
-		__lt = function <|self: self, other: self|>
+		__lt = function <|self: self, other: self | number | any|>
 			return boolean
 		end,
-		__add = function <|self: self, other: self | number|>
+		__add = function <|self: self, other: self | number | any|>
 			return TCData<|T|>
 		end,
-		__sub = function <|self: self, other: self | number|>
+		__sub = function <|self: self, other: self | number | any|>
 			return TCData<|T|>
 		end,
 	}
@@ -156,13 +162,12 @@ type Modules["ffi"] = {
 	arch = "x86" | "x64" | "arm" | "ppc" | "ppcspe" | "mips",
 	C = {},
 	abi = function=(string)>(boolean),
-	copy = function=(any, any, number | nil)>(nil),
+	copy = function=(any, any, number | nil | TCData<|number|>)>(),
 	alignof = function=(ctype)>(number),
-	string = function=(cdata, number | nil)>(string),
 	gc = function=(ctype, Function)>(cdata),
 	istype = function=(ctype, any)>(boolean),
-	fill = function=(cdata, number, any)>(nil),
-	offsetof = function=(cdata, number)>(number),
+	fill = function=(cdata, number | TCData<|number|>, any)>(),
+	offsetof = function=(cdata, number | TCData<|number|>)>(number),
 }
 --type Modules["ffi"].C.@Name = "FFI_C"
 type Modules["jit.vmdef"] = {
@@ -326,7 +331,7 @@ function FFIType<|str: string|>
 	return number
 end
 
-type ffi.string = function=(TCData<|{[number] = number}|> | string, number | nil)>(string)
+type ffi.string = function=(TCData<|{[number] = number}|> | string, TCData<|number|> | number | nil)>(string)
 
 do
 	type ffi.C = ffi.load("")

nattlua/types/tuple.lua

@@ -773,7 +773,7 @@ return {
 
 				if v and v.Type == "tuple" or is_inf then
 					-- inf tuple
-					temp[i] = v
+					temp[i] = v or Any()
 
 					break
 				end

nattlua/types/union.lua

@@ -453,11 +453,11 @@ function META.IsSubsetOf(a--[[#: TUnion]], b--[[#: any]])
 	for _, a_val in ipairs(a.Data) do
 		a.suppress = true
 		local b_val, reason
-
+		local ok
 		if b.Type == "union" then
 			b_val, reason = b:IsTypeObjectSubsetOf(a_val)
 		else
-			local ok, reason = a_val:IsSubsetOf(b)
+			ok, reason = a_val:IsSubsetOf(b)
 
 			if ok then
 				b_val = b

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

@@ -59,7 +59,7 @@ end
 local gbuf_n = 1024
 local gbuf = ffi.new("char [?]", gbuf_n)
 
-local function buf_grow(len: number, nokeep: boolean | nil)
+local function buf_grow(len: ffi.typeof_arg("int"), nokeep: boolean | nil)
 	if len > gbuf_n then
 		gbuf_n = len
 		local newbuf = ffi.new("char [?]", gbuf_n)
@@ -95,9 +95,9 @@ function _M.replace(automate: ac_t, str: string, replacement: string, ignore_cas
 	-- you can change this to gbuf_p = gbuf to observe another kind of bug behaviour
 	local gbuf_p = ffi.new("char *", gbuf)
 
-	if not gbuf_p then error("uh oh") end
-
 	while true do
+		if _ as boolean then break end
+
 		local r = ac.ac_match(automate, compare_str_p, str_n)
 
 		if r.match_begin >= 0 then
@@ -114,7 +114,7 @@ function _M.replace(automate: ac_t, str: string, replacement: string, ignore_cas
 			C.strncpy(gbuf_p, str_p, str_n)
 			gbuf_p = gbuf_p + str_n
 			-- you can also try call ffi.string(gbuf, tonumber(gbuf_p - gbuf))
-			return ffi.string(gbuf, (gbuf_p - gbuf) as number) --  lol
+			return ffi.string(gbuf, (gbuf_p - gbuf)) --  lol
 		end
 	-- here, add print of info also changes behaviour
 	-- print(tostring(ffi.typeof(gbuf_p)))
@@ -173,6 +173,8 @@ function _M.mask(automate: ac_t, str: string, p: string, ignore_case: boolean)
 	local gbuf_p = gbuf
 
 	while true do
+		if _ as boolean then break end
+
 		local r = ac.ac_match(automate, compare_str_p, str_n)
 
 		if r.match_begin >= 0 then

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

@@ -1,4 +1,5 @@
 --ANALYZE
+ffi.C = {}
 local type print = any
 local ffi = require("ffi")
 local socket = {}
@@ -992,7 +993,7 @@ function M.get_address_info(
 			tbl,
 			addrinfo_to_table(res as ffi.new<|"struct addrinfo *"|>, data.host, data.service)
 		)
-		res = res.ai_next
+		res = assert(res.ai_next)
 	end
 
 	--ffi.C.freeaddrinfo(out[0])
@@ -1497,7 +1498,9 @@ if TEST then
 	local socket = M
 
 	do
-		for _, info in ipairs((assert(socket.get_address_info({host = "www.google.com"})))) do
+		local x = socket.get_address_info({host = "www.google.com"})
+
+		for _, info in ipairs((assert(x))) do
 			print("================================")
 			print("host: ", info.host)
 			print("service: ", info.service)

test/tests/nattlua/c_declarations/typed_ffi.lua

@@ -53,7 +53,7 @@ analyze[=[
 		int foo(int, bool, lol);
 	]])
 
-	attest.equal(ffi.C.foo, _ as function=(number, boolean, number)>(number))
+	attest.equal(ffi.C.foo, _ as function=(number|TCData<|number|>, boolean, TCData<|number|> | number)>(number))
 ]=]
 analyze[=[
 	local struct
@@ -94,18 +94,18 @@ analyze[=[
 
 	if LINUX then
 		ffi.cdef("void foo(int a);")
-		attest.equal(ffi.C.foo, _ as function=(number)>(()))
+		attest.equal(ffi.C.foo, _ as function=(number|TCData<|number|>)>())
 	else
 		if X64 then
 			ffi.cdef("void foo(const char *a);")
-			attest.equal(ffi.C.foo, _ as function=(string | nil | ffi.new<|"const char*"|>)>(()))
+			attest.equal(ffi.C.foo, _ as function=(string | nil | ffi.new<|"const char*"|>)>())
 		else
 			ffi.cdef("int foo(int a);")
-			attest.equal(ffi.C.foo, _ as function=(number)>((number)))
+			attest.equal(ffi.C.foo, _ as function=(number|TCData<|number|>)>(number))
 		end	
 	end
 
-	attest.equal(ffi.C.foo, _ as function=(number)>() | function=(number)>(number) | function=(nil | string | ffi.new<|"const char*"|>)>())
+	attest.equal(ffi.C.foo, _ as function=(number|TCData<|number|>)>() | function=(number|TCData<|number|>)>(number) | function=(nil | string | ffi.new<|"const char*"|>)>())
 ]=]
 analyze[=[
 	ffi.cdef("void foo(void *ptr, int foo, const char *test);")
@@ -520,7 +520,7 @@ analyze[=[
     
     if ffi.os == "Windows" then
         local x = ffi.C.strerror
-        attest.equal(x, _ as function=(number)>())
+        attest.equal(x, _ as function=(number | TCData<|number|>)>())
     end
 ]=]
 analyze[=[
@@ -536,17 +536,12 @@ foo(y)
 ]]
 analyze[=[
 ffi.cdef([[
-struct sockaddr {
-	uint16_t sa_family;
-	char sa_data[14];
-};
-
-struct addrinfo {
+struct wwww {
 	int ai_flags;
 	int ai_family;
 };
 ]])
-local res = ffi.new("struct addrinfo[1]", {{ai_flags = 0}})
-attest.equal(res[0].ai_flags, _ as number)
+local res = ffi.new("struct wwww[1]", {{ai_flags = 0}})
+attest.equal(res[0].ai_flags, _ as 0)
 attest.equal(res[0].ai_family, _ as number)
 ]=]