move the whole ffi cdecl parser to type definitions

Author: CapsAdmin

nattlua/definitions/lua/ffi.nlua

@@ -1,3 +1,5 @@
+§ context.cdecl_parser = require("nattlua.definitions.lua.ffi.main")
+
 local type ConstructorArgument = boolean | number | AnyFunction | nil | {[string | number] = self | number | AnyFunction | boolean | nil}
 
 function TCData<|T: ConstructorArgument, ...: ...any|>
@@ -159,47 +161,47 @@ local type ffi = require("ffi")
 type _G.ffi = ffi
 
 analyzer function ffi.sizeof(cdecl: any, len: nil | number)
-	return cdecl_parser.sizeof(cdecl, len)
+	return context.cdecl_parser.sizeof(cdecl, len)
 end
 
 analyzer function ffi.cdef(cdecl: string, ...: ...any)
-	cdecl_parser.cdef(cdecl, ...)
+	context.cdecl_parser.cdef(cdecl, ...)
 end
 
 SetPreventInputExpansionOnFunction<|ffi.cdef, true|>
 
 analyzer function ffi.cast(cdecl: string | any, src: string | any)
-	return cdecl_parser.cast(cdecl, src)
+	return context.cdecl_parser.cast(cdecl, src)
 end
 
 analyzer function ffi.typeof(cdecl: string | TCType<|any|>, ...: ...any)
-	return cdecl_parser.typeof(cdecl, ...)
+	return context.cdecl_parser.typeof(cdecl, ...)
 end
 
 analyzer function ffi.typeof_arg(cdecl: string | TCType<|any|>, ...: ...any)
-	return cdecl_parser.typeof_arg(cdecl, ...)
+	return context.cdecl_parser.typeof_arg(cdecl, ...)
 end
 
 SetPreventInputExpansionOnFunction<|ffi.typeof, true|>
 
 analyzer function ffi.get_type(cdecl: string, ...: ...any)
-	return cdecl_parser.get_type(cdecl, ...)
+	return context.cdecl_parser.get_type(cdecl, ...)
 end
 
 analyzer function ffi.get_raw_type(cdecl: string, ...: ...any)
-	return cdecl_parser.get_raw_type(cdecl, ...)
+	return context.cdecl_parser.get_raw_type(cdecl, ...)
 end
 
 analyzer function ffi.new(cdecl: any, ...: ...any)
-	return cdecl_parser.new(cdecl, ...)
+	return context.cdecl_parser.new(cdecl, ...)
 end
 
 analyzer function ffi.metatype(ctype: any, meta: any)
-	return cdecl_parser.metatype(ctype, meta)
+	return context.cdecl_parser.metatype(ctype, meta)
 end
 
 analyzer function ffi.load(lib: string, global: boolean | nil)
-	return cdecl_parser.load(lib)
+	return context.cdecl_parser.load(lib)
 end
 
 analyzer function ffi.gc(obj: cdata, callback: Function)

nattlua/c_declarations/analyzer.lua renamed to nattlua/definitions/lua/ffi/analyzer.lua

@@ -23,7 +23,7 @@ local Boolean = require("nattlua.types.union").Boolean
 local Union = require("nattlua.types.union").Union
 local Any = require("nattlua.types.any").Any
 local ERROR_REDECLARE = false
-local walk_cdeclarations = require("nattlua.c_declarations.ast_walker")
+local walk_cdeclarations = require("nattlua.definitions.lua.ffi.ast_walker")
 require("nattlua.other.context_mixin")(META)
 local valid_qualifiers = {
 	["double"] = true,

nattlua/c_declarations/ast_walker.lua renamed to nattlua/definitions/lua/ffi/ast_walker.lua

@@ -30,9 +30,9 @@ local Nilable = require("nattlua.types.union").Nilable
 local Tuple = require("nattlua.types.tuple").Tuple
 local Boolean = require("nattlua.types.union").Boolean
 local Lexer = require("nattlua.lexer.lexer").New
-local Parser = require("nattlua.c_declarations.parser").New
-local Emitter = require("nattlua.c_declarations.emitter").New
-local Analyzer = require("nattlua.c_declarations.analyzer").New
+local Parser = require("nattlua.definitions.lua.ffi.parser").New
+local Emitter = require("nattlua.definitions.lua.ffi.emitter").New
+local Analyzer = require("nattlua.definitions.lua.ffi.analyzer").New
 local Code = require("nattlua.code").New
 local Compiler = require("nattlua.compiler")
 local variables = Table()

nattlua/c_declarations/emitter.lua renamed to nattlua/definitions/lua/ffi/emitter.lua

@@ -432,7 +432,6 @@ return function(META)
 			{key = "nl", path = "nattlua.init"},
 			{key = "types", path = "nattlua.types.types"},
 			{key = "context", path = "nattlua.analyzer.context"},
-			{key = "cdecl_parser", path = "nattlua.c_declarations.main"},
 			{
 				key = "type_errors",
 				path = "nattlua.types.error_messages",

nattlua/c_declarations/main.lua renamed to nattlua/definitions/lua/ffi/main.lua

@@ -212,10 +212,10 @@ do -- these override existing commands and should probably be made more generic
 						package.preload.nattlua = package.preload["nattlua.init"]
 					end
 					
-					require("nattlua.c_declarations.parser")
-					require("nattlua.c_declarations.emitter")
-					require("nattlua.c_declarations.analyzer")
-					require("nattlua.c_declarations.main")
+					require("nattlua.definitions.lua.ffi.parser")
+					require("nattlua.definitions.lua.ffi.emitter")
+					require("nattlua.definitions.lua.ffi.analyzer")
+					require("nattlua.definitions.lua.ffi.main")
 					require("examples.util")
 		
 					return require("nattlua")

nattlua/c_declarations/parser.lua renamed to nattlua/definitions/lua/ffi/parser.lua

@@ -1,18 +1,18 @@
 local analyzer function cdef(str: string, ...: ...any)
-	return require("nattlua.c_declarations.main").cdef(str, ...)
+	return require("nattlua.definitions.lua.ffi.main").cdef(str, ...)
 end
 
 local analyzer function cdef_error(str: string, expect: string, ...: ...any)
 	local args = {...}
 	local ok, err = pcall(function()
-		return require("nattlua.c_declarations.main").cdef(str, unpack(args))
+		return require("nattlua.definitions.lua.ffi.main").cdef(str, unpack(args))
 	end)
 	assert(ok == false)
 	assert(err:find(expect:GetData()))
 end
 
 local function reset()
-	§require("nattlua.c_declarations.main").reset()
+	§require("nattlua.definitions.lua.ffi.main").reset()
 
 	local ffi = require("ffi")
 	ffi.C = {}