fix more issues with cdata types

Author: CapsAdmin

nattlua/definitions/lua/luajit.nlua

@@ -56,6 +56,7 @@ function TCData<|T: ConstructorArgument, ...: ...any|>
 	return {
 		T = T,
 		@MetaTable = self,
+		@TypeOverride = "cdata",
 		__is_cdata_number = type(T) == "number",
 		__tostring = function(self: self)
 			return "cdata<" .. tostring(T) .. (is_pointer and " *" or "") .. ">"
@@ -84,18 +85,21 @@ function TCData<|T: ConstructorArgument, ...: ...any|>
 
 			return TCData<|obj|>
 		end,
-		__le = function <|self: self, other: self | number | any|>
+		__le = function <|a: any, b: number | any|>
 			return boolean
 		end,
-		__lt = function <|self: self, other: self | number | any|>
+		__lt = function <|a: any, b: number | any|>
 			return boolean
 		end,
-		__add = function <|self: self, other: self | number | any|>
+		__add = function <|a: any, b: number | any|>
 			return TCData<|T|>
 		end,
-		__sub = function <|self: self, other: self | number | any|>
-			return TCData<|T|>
+		__sub = function <|a: any, b: number | any|>
+			if type(b) == "number" then return TCData<|T|> end
+
+			return number
 		end,
+		__newindex = function <|self: self, key: string | number, value: any|> end,
 	}
 end
 
@@ -104,6 +108,7 @@ function TCType<|T: ConstructorArgument|>
 	local type is_pointer = type(T) == "table" and keysof<|T|> == number
 	return {
 		T = T,
+		@TypeOverride = "cdata",
 		@MetaTable = self,
 		__is_pointer = is_pointer,
 		__tostring = function <|self: self|>
@@ -127,6 +132,11 @@ function TCType<|T: ConstructorArgument|>
 		__sub = function <|self: self, other: self | number|>
 			return TCType<|T|>
 		end,
+		-- TODO, __newindex is assigned and used while other fields are being assigned
+		-- so it has to be done at the end to prevent ie __add = from erroring
+		__newindex = function <|self: self, key: any, value: any|>
+			error<|"ctype does not support newindex", 2|>
+		end,
 	}
 end
 
@@ -154,8 +164,7 @@ function FFIArray<|size: number, T: any|>
 	return {[0 .. size - 1] = T}
 end
 
-type cdata = FFIPointer<|number|>
-type cdata.@TypeOverride = "cdata"
+type cdata = TCData<|any|>
 type Modules["ffi"] = {
 	errno = function=(nil | number)>(number),
 	os = "Windows" | "Linux" | "OSX" | "BSD" | "POSIX" | "Other",
@@ -323,8 +332,8 @@ analyzer function ffi.load(lib: string, global: boolean | nil)
 	return cdecl_parser.load(lib)
 end
 
-analyzer function ffi.gc(ctype: ctype, callback: Function): ctype
-	return ctype
+analyzer function ffi.gc(obj: cdata, callback: Function)
+	return obj
 end
 
 function FFIType<|str: string|>

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

@@ -1,6 +1,3 @@
-do
-	return
-end -- PENDING_TEST
 local ffi = require("ffi")
 local _M = {}
 ffi.cdef[[
@@ -62,7 +59,7 @@ local gbuf = ffi.new("char [?]", gbuf_n)
 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)
+		local newbuf = ffi.new("char [?]", gbuf_n as number)
 
 		if not nokeep then ffi.copy(newbuf, gbuf, gbuf_n) end
 
@@ -81,10 +78,6 @@ function _M.replace(automate: ac_t, str: string, replacement: string, ignore_cas
 		compare_str_p = ffi.new("const char *", compare_str)
 	end
 
-	if not compare_str_p then error("uh oh") end
-
-	if not str_p then error("uh oh") end
-
 	buf_grow(#str, true)
 	-- BUG HERE!
 	-- we cannot rely on (gbuf_p - gbuf) to calculate length. it seems like pointer arithmetic triggers bug of luajit
@@ -96,8 +89,6 @@ function _M.replace(automate: ac_t, str: string, replacement: string, ignore_cas
 	local gbuf_p = ffi.new("char *", 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
@@ -165,16 +156,10 @@ function _M.mask(automate: ac_t, str: string, p: string, ignore_case: boolean)
 		compare_str_p = ffi.new("const char *", compare_str)
 	end
 
-	if not compare_str_p then error("uh oh") end
-
-	if not str_p then error("uh oh") end
-
 	buf_grow(#str, true)
 	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