cpp2ffi: post skipped functions

README.md

@@ -106,10 +106,14 @@ Notes:
 # example bindings based on cimgui
 
 * [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui)
+* [cimgui-go](https://github.com/AllenDang/cimgui-go)
+* [Hexa.NET.ImGui](https://github.com/HexaEngine/Hexa.NET.ImGui)
+* [dear-imgui-rs](https://github.com/Latias94/dear-imgui-rs)
+* [CImGui.jl](https://github.com/Gnimuc/CImGui.jl)
 * [ImGui.NET](https://github.com/mellinoe/ImGui.NET)
+* [Zig-ImGui](https://github.com/SpexGuy/Zig-ImGui)
 * [nimgl/imgui](https://github.com/nimgl/imgui)
 * [kotlin-imgui](https://github.com/Dominaezzz/kotlin-imgui)
-* [CImGui.jl](https://github.com/Gnimuc/CImGui.jl)
 * [odin-imgui](https://github.com/ThisDrunkDane/odin-imgui)
 * [DerelictImgui](https://github.com/Extrawurst/DerelictImgui)
 * [BindBC-CimGui](https://github.com/MrcSnm/bindbc-cimgui)

generator/cpp2ffi.lua

@@ -207,6 +207,26 @@ local function check_template(code)
 	return ttype,template,te,code2
 end
 ----------------------------------------
+local CCCnum = 0
+local function getffiint32val(val)
+	local str = [[
+	local ffi = require"ffi"
+	ffi.cdef("static const int32_t CCC]]..CCCnum..[[ = ]]..val..[[;") return ffi.C.CCC]]..CCCnum
+	local f,err = loadstring(str)
+	assert(f,err)
+	CCCnum = CCCnum + 1
+	return f()
+end
+local function getffival(name,val)
+	local str = [[
+	local ffi = require"ffi"
+	ffi.cdef("static const int32_t ]]..name..[[ = ]]..val..[[;") return ffi.C.]]..name
+	print(str)
+	local f,err = loadstring(str)
+	assert(f,err)
+	return f()
+end
+
 local function parse_enum_value(value, allenums,dontpost)
 	local function clean(val)
 		if type(val)=="string" then
@@ -235,6 +255,13 @@ local function parse_enum_value(value, allenums,dontpost)
 		assert(not value:match("[%(%)]"),value)
 		
 		local numval = tonumber(value)
+		--check int32_t
+		-- if numval then
+			-- local ok,numval2 = pcall(getffiint32val,value)
+			-- if ok and numval~=numval2 then
+				-- print("===========",value,numval,numval2)
+			-- end
+		-- end
 		if numval then return numval end 
 		
 		local several,seps = strsplit(value,"([<>&|~%+%-]+)") 
@@ -749,8 +776,16 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		return 
 	end
 	
-    
     local ret = line:match("([^%(%):,]+[%*%s])%s?~?[_%w]+%b()")
+	
+    local rettt = line:match("(.+[%*%s])%s?~?[_%w]+%b()")
+	--if rettt and rettt:match"::" then print("rettt",rettt,ret);error"debug" end
+	--if ret~=rettt then print("++++++++ret~=rettt",ret,rettt) end
+	if rettt and rettt:match"^const" and not ret:match"^const" then
+		ret = "const "..ret
+		print("++++++++++++add const",ret)
+	end
+
 	--local ret = line:match("(.+[%*%s])%s?~?[_%w]+%b()")
     --local funcname, args = line:match("(~?[_%w]+)%s*(%b())")
 	local funcname, args, extraconst = line:match("(~?[_%w]+)%s*(%b())(.*)")
@@ -968,7 +1003,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
     defT.call_args = caar --call_args
     defT.isvararg = signat:match("%.%.%.%)$")
     defT.location = locat
-    local comentario = (itt.comments or "")..(comment or "")
+    local comentario = (itt.prevcomments or "")..(itt.comments or "")..(comment or "")
 	if comentario=="" then comentario=nil end
     defT.comment = comentario
     defT.argsT = argsArr
@@ -1169,7 +1204,9 @@ local function get_nonPOD(FP)
 		end
 	end
 	FP.structs_and_enums_table.nonPOD = nonPOD
+	if next(nonPOD) then
 	M.prtable("nonPOD",nonPOD)
+	end
 	return nonPOD
 end
 local function recur_calc_depth(FP, structs, k,n)
@@ -1336,7 +1373,9 @@ local function get_nonPODused(FP)
 	FP.structs_and_enums_table.nonPOD_used = FP.nP_used
 	FP.nP_args = typeargs
 	FP.nP_ret = typeargs_ret
+	if next(FP.nP_ret) then
 	M.prtable("np_ret",FP.nP_ret)
+	end
 
 end
 local function header_subs_nonPOD(FP,txt)
@@ -1353,7 +1392,9 @@ local function header_subs_nonPOD(FP,txt)
 	return txt
 end
 M.header_subs_nonPOD = header_subs_nonPOD
-local function get_std_function(ar)
+local function get_std_function(ar,def)
+	print("get_std_function",ar.template_orig)
+	print("   from",def.ov_cimguiname)
 	local skip = false
 	local ty=ar.template_orig:gsub(ar.name,"")
 	ty = ty:match("std::function(%b<>)")
@@ -1371,12 +1412,14 @@ local function get_std_function(ar)
 	local argsT2 = {}
 	local noname_counter = 0
 	for i,v in ipairs(argsT) do
-		local typ, name = v:match("(.+)%s+(%w+)")
+		print("    arg",i,v)
+		local typ, name = v:match("^(.+)%s+(%w*)$")
 		if not name then
 			typ = v
 			noname_counter = noname_counter + 1
 			name = "noname" .. noname_counter
 		end
+		print("    ",typ,name)
 		argsT2[i] = {type=typ,name=name}
 	end
 	--get conversions
@@ -1392,6 +1435,9 @@ local function get_std_function(ar)
 		elseif v.type:match("std::") then
 			skip = true
 		else
+			print("    get_std_function found type",v.type)
+			-- require"anima.utils"
+			-- prtable(ar)
 		end
 		argsT3[i] = {type=typ or v.type,conv=conv,name=v.name} 
 	end
@@ -1430,10 +1476,12 @@ local function get_std_function(ar)
 	return caar,asp,skip
 end
 local function ADDnonUDT(FP)
+	print"===================ADDnonUDT==================================="
 	local nonPOD = get_nonPOD(FP)
 	get_nonPODused(FP)
 	for k,defs in pairs(FP.defsT) do
 		for i, def in ipairs(defs) do
+			--print("    ADDnonUDT",def.ov_cimguiname,def.ret)
 			local skip = nil
 			--ret
 			local rets = (def.ret or ""):gsub("const ","")
@@ -1464,6 +1512,7 @@ local function ADDnonUDT(FP)
 				end
 			--return std:: -> skip function
 			elseif def.stdret then -- not std::string
+				print("skip",def.stdret,"on return")
 				skip = true
 			end
 			--args
@@ -1496,7 +1545,7 @@ local function ADDnonUDT(FP)
 							caar = caar .. "std::string("..name.."),"
 							asp = asp .. "const char* "..v.name..","
 						elseif v.type:match"std::function" then
-							local ca2,asp2,skip2 = get_std_function(v)
+							local ca2,asp2,skip2 = get_std_function(v,def)
 							caar = caar .. ca2..","
 							asp = asp .. asp2..","
 							if skip2 then skip = true end
@@ -1534,6 +1583,7 @@ local function ADDnonUDT(FP)
 				asp = "()"
 			end
 			if skip then
+				print("-------ADDnonUDT skips",def.ov_cimguiname)
 				def.skipped = skip
 				FP.skipped[def.ov_cimguiname] = true
 			else
@@ -1543,6 +1593,10 @@ local function ADDnonUDT(FP)
 			end
 		end
 	end
+	if next(FP.skipped) then
+		print("    =======skipped functions=====")
+		M.prtable(FP.skipped)
+	end
 end
 local function ADDnonUDT_OLD(FP)
 	local nonPOD = get_nonPOD(FP)
@@ -1611,6 +1665,9 @@ local function ADDnonUDT_OLD(FP)
 end
 
 local function ADDdestructors(FP)
+	print"======================================================="
+	print"==============ADDdestructors========================="
+	print"======================================================="
     local defsT = FP.defsT
     local newcdefs = {}
 
@@ -1801,6 +1858,8 @@ function M.Parser()
 		return par.skipped[def.ov_cimguiname] or par.skipped[def.cimguiname]
 	end
 	function par:take_lines(cmd_line,names,compiler)
+		assert(compiler)
+		self.COMPILER = compiler
 		if self.COMMENTS_GENERATION then
 			cmd_line = cmd_line .. (compiler=="cl" and " /C " or " -C ")
 		end
@@ -1831,13 +1890,90 @@ function M.Parser()
 		self.constants = defines
 		return defines
 	end
+	--------------------------------------------------------------------
+	local function get_cdefs(gccline,locat,cdef)
+		--print("get_cdefs",gccline,locat,cdef)
+		cdef = cdef or {}
+		numerr = numerr + 1
+		local errfile = "err_cdefs"..numerr..".txt"
+		local pipe,err = io.popen(gccline.." 2>"..errfile,"r")
+		--local pipe,err = io.popen(gccline,"r")
+		if not pipe then error("could not execute gcc "..err) end
+		local skip
+		for line in M.location(pipe,{locat}) do
+			--print(line)
+			line = line:gsub("extern __attribute__%(%(dllexport%)%)%s*","")
+			line = line:gsub("extern __declspec%(dllexport%)%s*","")
+			skip = false
+			if line~="" then 
+				if line:match("^%s*static const") and not line:match("static const int") then skip=true end
+				if not skip then
+					table.insert(cdef,line) 
+				end
+			end
+		end
+		pipe:close()
+		
+		local f = assert(io.open(errfile,"r"))
+		local errstr = f:read"*a"
+		f:close()
+		print(#errstr,"errstr")
+		print(errstr)
+		--try to guess a compiler error
+		assert(not errstr:match" error")
+		os.remove(errfile)
+		return cdef
+	end
+	local ffi = require"ffi"
+	--utility functions
+	local ffi_cdef = function(code)
+		local ret,err = pcall(ffi.cdef,code)
+		if not ret then
+			local lineN = 1
+			for line in code:gmatch("([^\n\r]*)\r?\n") do
+				print(lineN, line)
+				lineN = lineN + 1
+			end
+			print(err)
+			error"bad cdef"
+		end
+	end
+
+	function par:get_cal_value_ffi()
+		local COMPILER, CPRE = self.COMPILER
+		if COMPILER == "cl" then
+			CPRE = COMPILER..[[ /E /DCIMGUI_DEFINE_ENUMS_AND_STRUCTS -DIMGUI_ENABLE_FREETYPE ./ccode.h]]
+		else
+			CPRE = COMPILER..[[ -E -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS -DIMGUI_ENABLE_FREETYPE ./ccode.h]]
+		end
+		local cdefs = "typedef void FILE;"
+		cdefs = cdefs..self.structs_and_enums[1]..self.structs_and_enums[2]
+		save_data("ccode.h", cdefs)
+		
+		local cdefs = get_cdefs(CPRE,"ccode")
+		--M.prtable(cdefs)
+		cdefs = table.concat(cdefs,"\n")
+		--print("===================================",cdefs)
+		save_data("ccode.h.lua", cdefs)
+		local ffi = require"ffi"
+		ffi_cdef(cdefs)
+		for k,enum in pairs(self.structs_and_enums_table.enums) do
+			for i,field in ipairs(enum) do
+				--print(field.calc_value)
+				if field.calc_value ~= ffi.C[field.name] then
+					print(field.name,field.calc_value , ffi.C[field.name])
+				end
+			end
+		end
+	end
 	function par:do_parse()
 		self:parseItems()
 		self:gen_structs_and_enums_table()
 		self:compute_overloads()
 		self:gen_structs_and_enums()
-		--self:compute_overloads()
 		--self:compute_templated()
+		--check int32_t and others
+		--self:get_cal_value_ffi()
 		ADDdestructors(self)
 	end
 	function par:initTypedefsDict()
@@ -1946,7 +2082,7 @@ function M.Parser()
 			--clean class and get name
 			if it.re_name == "class_re" then
 				it.name = it.item:match("class%s+(%S+)")
-				print("cleaning class",it.name)
+				print("cleaning class",it.name,"-------------------------------------")
 				--it.item = it.item:gsub("private:.+};$","};")
 				--it.item = it.item:gsub("private:","")
 				it.item = it.item:gsub("public:","")
@@ -2009,22 +2145,22 @@ function M.Parser()
 						if derived then
 							local derived2 = derived:gsub("%b<>","") 
 							derived2 = derived2:gsub("%w+::","")
-							print("--derived check",stname, derived, derived2)
+							print("    --derived check",stname, derived, derived2)
-							M.prtable(self.opaque_structs)
+							--M.prtable(self.opaque_structs)
 							if self.opaque_structs[derived2] then
-								print("--make opaque opaque derived",it.name,derived,derived2)
+								print("    --make opaque opaque derived",it.name,derived,derived2)
 								it.opaque_struct = get_parents_name(it)..it.name
 								self.opaque_structs[it.name] = it.opaque_struct
 							end
 						end
 					if derived and derived:match"std::" then
-						print("--make opaque std::derived",it.name,derived)
+						print("    --make opaque std::derived",it.name,derived)
 						--it.opaque_struct = (itparent and itparent.name .."::" or "")..it.name
 						it.opaque_struct = get_parents_name(it)..it.name
 						self.opaque_structs[it.name] = it.opaque_struct
 					end
 					if self.forced_opaque[it.name] then
-						print("--make forced opaque opaque derived",it.name)
+						print("    --make forced opaque opaque derived",it.name)
 						it.opaque_struct = get_parents_name(it)..it.name
 						self.opaque_structs[it.name] = it.opaque_struct
 					end
@@ -2033,12 +2169,12 @@ function M.Parser()
 							-- print("=====using",child.item)
 						-- end
 						if (child.re_name == "vardef_re") and child.item:match"std::" then
-							print("--make opaque",it.name,child.item)
+							print("    --make opaque with child std::",it.name,child.item)
 							--M.prtable(itparent)
 							--it.opaque_struct = (itparent and itparent.name .."::" or "")..it.name
 							it.opaque_struct = get_parents_name(it)..it.name
-							print("===parents1",get_parents_name(it),"===parents2",(itparent and itparent.name .."::" or ""))
+							print("    ===parents1",get_parents_name(it),"===parents2",(itparent and itparent.name .."::" or ""))
-							print("===",it.opaque_struct)
+							print("    ===",it.opaque_struct)
 							--cant do that as function is recursive
 							--self.opaque_structs[it.name] = get_parents_name(it)..it.name--(itparent and itparent.name .."::" or "")..it.name
 							self.opaque_structs[it.name] = it.opaque_struct
@@ -2066,6 +2202,9 @@ function M.Parser()
 		return table.concat(txtclean)
 	end
 	function par:parseItems()
+		print"================================================================"
+		print"===================parseItems==================================="
+		print"================================================================"
 		--self:initTypedefsDict()
 		
 		self.linenumdict = {}
@@ -2088,9 +2227,13 @@ function M.Parser()
 		local txt = table.concat(cdefs2,"\n")
 		--string substitution
 		if self.str_subst then
+			print("========== str_subst")
+			local nn
 			for k,v in pairs(self.str_subst) do
-				txt = txt:gsub(k,v)
+				txt,nn = txt:gsub(k,v)
+				print(k,"done times:",nn)
 			end
+			print("========== str_subst end")
 		end
 		--clean = default in constructor (implot3d)
 		txt = txt:gsub("=%s*default","")
@@ -2123,9 +2266,9 @@ function M.Parser()
 		table.insert(txtclean,txt:sub(ini))
 		print("end cleaning ------------------------------",nn)
 		txt = table.concat(txtclean)
+		--]]
 		end
 		--save_data("./preparse"..tostring(self):gsub("table: ","")..".c",txt)
-		--]]
 		self.itemsarr = par:parseItemsR2(txt)
 		save_data("./itemsarr.lua",M.serializeTableF(self.itemsarr))--ToStr(self.itemsarr))
 		itemsarr = self.itemsarr
@@ -2435,7 +2578,9 @@ function M.Parser()
 				end
 	end
 	function par:gen_structs_and_enums()
+		print"======================================================="
 		print"--------------gen_structs_and_enums"
+		print"======================================================="
 		--M.prtable(self.typenames)
 		local outtab = {} 
 		local outtabpre = {}
@@ -2724,7 +2869,9 @@ function M.Parser()
 	end
 	par.enums_for_table = enums_for_table
 	function par:gen_structs_and_enums_table()
-		print"--------------gen_structs_and_enums_table"
+		print"================================================================"
+		print"===================gen_structs_and_enums_table==================================="
+		print"================================================================"
 		local outtab = {enums={},structs={},locations={},enumtypes={},struct_comments={},enum_comments={},opaque_structs={}}
 		--self.typedefs_table = {}
 		local enumsordered = {}
@@ -2806,8 +2953,8 @@ function M.Parser()
 						-- M.prtable(outtab.structs[structname])
 					-- end
 				else --self.typenames[structname]
-					M.prtable("--self.typenames",structname,self.typenames[structname])
+					--M.prtable("--self.typenames",structname,self.typenames[structname])
-					M.prtable("strtab 3, -1",strtab)
+					--M.prtable("strtab 3, -1",strtab)
 					--templated struct
 					if structname then
 						print("saving templated struct",structname)
@@ -2817,7 +2964,7 @@ function M.Parser()
 							self:parse_struct_line(strtab[j],self.templated_structs[structname],comstab[j])
 						end
 						end
-						M.prtable("--template_structs",structname,self.templated_structs[structname])
+						--M.prtable("--template_structs",structname,self.templated_structs[structname])
 					else
 						print("skipped unnamed struct",structname)
 					end
@@ -2900,6 +3047,9 @@ function M.Parser()
     end
 	
     function par:compute_overloads()
+		print"================================================================"
+		print"===================compute_overloads==================================="
+		print"================================================================"
 		-- if self.IMGUI_HAS_TEXTURES then
 			-- print"----------replacing ImTextureID with ImTextureUserID"
 			-- REPLACE_TEXTUREID(self)
@@ -3126,6 +3276,9 @@ function M.Parser()
 	end
 	--generate cimgui.cpp cimgui.h 
 	function par:cimgui_generation( cimgui_header)
+		print"=========================================================="
+		print"===============cimgui_generation==========================="
+		print"=========================================================="
 		local name = self.modulename
 		local hstrfile = read_data("./"..name.."_template.h")
 		M.prtable("templates",self.templates)
@@ -3363,10 +3516,12 @@ local function location(file,locpathT,defines,COMPILER,keepemptylines)
                 -- Is this a location pragma?
                 local loc_num_t,location_match = line:match(location_re)
                 if location_match then
+					--print(location_match)
                     in_location = false
                     for i,path_re in ipairs(path_reT) do
 						local locpath = location_match:match(path_re)
                         if locpath then
+							--print("locpath",locpath)
                             in_location = true;
                             loc_num = loc_num_t
                             loc_num_incr = 0

generator/generator.lua

@@ -123,9 +123,10 @@ local serializeTableF = cpp2ffi.serializeTableF
 local function func_header_impl_generate(FP, defines)
 
     local outtab = {}
-    for k,v in pairs(defines) do
+	--may be key sorting is not enough and declaration order needed 
+    cpp2ffi.table_do_sorted(defines, function(k,v)
 		table.insert(outtab,"#define "..k.." "..v.."\n")
-	end
+	end)
     -- for _,t in ipairs(FP.funcdefs) do
         -- if t.cimguiname then
             -- local cimf = FP.defsT[t.cimguiname]