fix more cdata type related bugs

Author: CapsAdmin

examples/projects/luajit/src/main.nlua

@@ -7,6 +7,6 @@ end
 
 print(assert(fs.get_current_directory()))
 
-for k, v in pairs((assert(fs.get_attributes("nlconfig.lua")))) do
+for k, v in pairs((assert(fs.get_attributes("README.md")))) do
 	print(k, v)
 end

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

@@ -118,13 +118,15 @@ do
 			local ret = follow_link and stat_link(path, buff) or stat(path, buff)
 
 			if ret == 0 then
+				local s = assert(buff[0])
+				local xxx = s.st_atime
 				return {
-					last_accessed = tonumber(buff[0].st_atime),
-					last_changed = tonumber(buff[0].st_ctime),
-					last_modified = tonumber(buff[0].st_mtime),
-					creation_time = tonumber(buff[0].st_mtime),
-					size = tonumber(buff[0].st_size),
-					type = bit.band(buff[0].st_mode, DIRECTORY) ~= 0 and "directory" or "file",
+					last_accessed = tonumber(s.st_atime),
+					last_changed = tonumber(s.st_ctime),
+					last_modified = tonumber(s.st_mtime),
+					creation_time = tonumber(s.st_mtime),
+					size = tonumber(s.st_size),
+					type = bit.band(s.st_mode, DIRECTORY) ~= 0 and "directory" or "file",
 				}
 			end
 
@@ -166,7 +168,7 @@ do
 
 	local dot = string.byte(".")
 
-	local function is_dots(ptr: {[number] = number}) --FFIArray<|3, number|>)
+	local function is_dots(ptr: ffi.new("char*"))
 		if ptr[0] == dot then
 			if ptr[1] == dot and ptr[2] == 0 then return true end
 
@@ -186,7 +188,6 @@ do
 
 		while true do
 			local dir_info = ffi.C.readdir(ptr)
-			dir_info = dir_info
 
 			if dir_info == nil then break end
 

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

@@ -50,7 +50,7 @@ do
 		struct
 	)
 
-	local function POSIX_TIME(time: number)
+	local function POSIX_TIME(time: number): number
 		return tonumber(time / 10000000 - 11644473600)
 	end
 
@@ -73,18 +73,20 @@ do
 		temporary = 0x100, -- A file that is being used for temporary storage. File systems avoid writing data back to mass storage if sufficient cache memory is available, because typically, an application deletes a temporary file after the handle is closed. In that scenario, the system can entirely avoid writing the data. Otherwise, the data is written after the handle is closed.
 		virtual = 0x10000, -- This value is reserved for system use.
 	}
+	local box = ffi.typeof("$[1]", struct)
 
 	function fs.get_attributes(path, follow_link)
-		local info = ffi.new("$[1]", struct)
+		local info = box()
 
 		if ffi.C.GetFileAttributesExA(path, 0, info) ~= 0 then
+			local s = assert(info[0])
 			return {
-				creation_time = POSIX_TIME(info[0].ftCreationTime),
-				last_accessed = POSIX_TIME(info[0].ftLastAccessTime),
-				last_modified = POSIX_TIME(info[0].ftLastWriteTime),
+				creation_time = POSIX_TIME(s.ftCreationTime),
+				last_accessed = POSIX_TIME(s.ftLastAccessTime),
+				last_modified = POSIX_TIME(s.ftLastWriteTime),
 				last_changed = -1, -- last permission changes
-				size = tonumber(info[0].nFileSize),
-				type = bit.band(info[0].dwFileAttributes, flags.directory) == flags.directory and
+				size = assert(tonumber(s.nFileSize)),
+				type = bit.band(s.dwFileAttributes, flags.directory) == flags.directory and
 					"directory" or
 					"file",
 			}
@@ -122,7 +124,7 @@ do
 	)
 	local dot = string.byte(".")
 
-	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
+	local function is_dots(ptr: ffi.new("const char *")) -- 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
 
@@ -133,13 +135,14 @@ do
 	end
 
 	local INVALID_FILE = ffi.cast("void *", 0xFFFFFFFFFFFFFFFFULL)
+	local box = ffi.typeof("$[1]", struct)
 
 	function fs.get_files(path)
 		if path == "" then path = "." end
 
 		if path:sub(-1) ~= "/" then path = path .. "/" end
 
-		local data = ffi.new("$[1]", struct)
+		local data = box()
 		local handle = ffi.C.FindFirstFileA(path .. "*", data)
 
 		if handle == nil then return nil, last_error() end
@@ -170,7 +173,7 @@ do
 	]])
 
 	function fs.set_current_directory(path)
-		if ffi.C.chdir(path) == 0 then return true end
+		if ffi.C.SetCurrentDirectoryA(path) == 0 then return true end
 
 		return nil, last_error()
 	end

nattlua/c_declarations/main.lua

@@ -62,6 +62,16 @@ local function gen(parser, ...)
 			error("expected ctype or value to fill $ or ? at argument #" .. i, 2)
 		end
 
+		if ct.Type == "union" then
+			local u = {}
+
+			for i, obj in ipairs(ct:GetData()) do
+				u[i] = assert(obj:Get(LString("T")))
+			end
+
+			ct = Union(u)
+		end
+
 		if ct.Type == "table" then ct = assert(ct:Get(LString("T"))) end
 
 		table.insert(new, ct)

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

@@ -1400,7 +1400,7 @@ do
 		address_len: nil | number
 	)
 		size = size or 64000
-		local buff = ffi.new("char[?]", size) as any
+		local buff = ffi.new("char[?]", size as number)
 
 		if self.on_receive then return self:on_receive(buff, size, flags) end
 

test/tests/nattlua/c_declarations/typed_ffi.lua

@@ -524,24 +524,60 @@ analyze[=[
     end
 ]=]
 analyze[=[
-ffi.cdef[[void FormatMessageA(void*);]]
-local a = ffi.C.FormatMessageA
-ffi.cdef[[int GetLastError();]]
-attest.equal(ffi.C.FormatMessageA, a)
+	ffi.cdef[[void FormatMessageA(void*);]]
+	local a = ffi.C.FormatMessageA
+	ffi.cdef[[int GetLastError();]]
+	attest.equal(ffi.C.FormatMessageA, a)
 ]=]
 analyze[[
-local function foo(x: ffi.typeof_arg("void*")) end
-local y = _ as TCData<|{["s_addr"] = number}|>
-foo(y)
+	local function foo(x: ffi.typeof_arg("void*")) end
+	local y = _ as TCData<|{["s_addr"] = number}|>
+	foo(y)
 ]]
 analyze[=[
-ffi.cdef([[
-struct wwww {
-	int ai_flags;
-	int ai_family;
-};
-]])
-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)
+	ffi.cdef([[
+	struct wwww {
+		int ai_flags;
+		int ai_family;
+	};
+	]])
+	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)
+]=]
+analyze[=[
+	local stat_struct
+	local OSX = ffi.os == "OSX"
+	local X64 = ffi.arch == "x64"
+
+	if OSX then
+		stat_struct = ffi.typeof([[
+				struct {
+					uint32_t st_dev;
+					uint16_t st_mode;
+				}
+			]])
+	else
+		if X64 then
+			stat_struct = ffi.typeof([[
+					struct {
+						uint64_t st_dev;
+						uint64_t st_ino;
+					}
+				]])
+		else
+			stat_struct = ffi.typeof([[
+					struct {
+						uint64_t st_dev;
+						uint32_t __st_ino;
+					}
+				]])
+		end
+	end
+
+	local statbox = ffi.typeof("$[1]", stat_struct)
+	local buff = statbox()
+	local s = assert(buff[0])
+	attest.equal(s.st_dev, _ as number)
+
 ]=]

test/tests/nattlua/project.lua

@@ -1,8 +1,3 @@
---PENDING_TEST
-do
-	return
-end
-
 local nl = require("nattlua")
 local builder = assert(
 	nl.File(