kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-10 20:08:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'docking_inter'

Browse Source
This commit is contained in:
Victor Bombi
2020-10-09 16:48:56 +02:00
parent 78ed715f21 ddc93fb07f
commit d32282504c
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -56,6 +56,7 @@ Notes:
* call_args : a string with the argument names separated by commas for calling imgui function * call_args : a string with the argument names separated by commas for calling imgui function
* defaults : a collection in which key is argument name and value is the default value. * defaults : a collection in which key is argument name and value is the default value.
* manual : will be true if this function is hand-written (not generated) * manual : will be true if this function is hand-written (not generated)
* skipped : will be true if this function is not generated (and not hand-written)
* isvararg : is set if some argument is a vararg * isvararg : is set if some argument is a vararg
* constructor : is set if the function is a constructor for a class. * constructor : is set if the function is a constructor for a class.
* destructor : is set if the function is a destructor for a class but not just a default destructor. * destructor : is set if the function is a destructor for a class but not just a default destructor.

13
generator/cpp2ffi.lua
View File

@@ -724,6 +724,9 @@ local function parseFunction(self,stname,itt,namespace,locat)
if self.get_manuals(defT) then if self.get_manuals(defT) then
defT.manual = true defT.manual = true
end end
if self.get_skipped(defT) then
defT.skipped = true
end
if ret then if ret then
defT.ret = clean_spaces(ret:gsub("&","*")) defT.ret = clean_spaces(ret:gsub("&","*"))
defT.retref = ret:match("&") defT.retref = ret:match("&")
@@ -928,6 +931,7 @@ function M.Parser()
par.typedefs_dict = {} par.typedefs_dict = {}
par.cname_overloads = {} par.cname_overloads = {}
par.manuals = {} par.manuals = {}
par.skipped = {}
par.UDTs = {} par.UDTs = {}
function par:insert(line,loca) function par:insert(line,loca)
@@ -946,6 +950,9 @@ function M.Parser()
function par.get_manuals(def) function par.get_manuals(def)
return par.manuals[def.ov_cimguiname] or par.manuals[def.cimguiname] return par.manuals[def.ov_cimguiname] or par.manuals[def.cimguiname]
end end
function par.get_skipped(def)
return par.skipped[def.ov_cimguiname] or par.skipped[def.cimguiname]
end
function par:take_lines(cmd_line,names,compiler) function par:take_lines(cmd_line,names,compiler)
local pipe,err = io.popen(cmd_line,"r") local pipe,err = io.popen(cmd_line,"r")
if not pipe then if not pipe then
@@ -1225,7 +1232,7 @@ function M.Parser()
if self.ftemplate_list then if self.ftemplate_list then
for iT,vT in ipairs(self.ftemplate_list[ttype]) do for iT,vT in ipairs(self.ftemplate_list[ttype]) do
local funT = fun:gsub(ttype,vT) local funT = fun:gsub(ttype,vT)
self:parseFunction(stname,funT,namespace,it.locat) self:parseFunction(stname,{item=funT},namespace,it.locat)
end end
end end
else else
@@ -1792,7 +1799,7 @@ local function func_implementation(FP)
local def = cimf[t.signature] local def = cimf[t.signature]
assert(def) assert(def)
local manual = FP.get_manuals(def) local manual = FP.get_manuals(def)
if not manual and not def.templated then if not manual and not def.templated and not FP.get_skipped(def) then
if def.constructor then if def.constructor then
assert(def.stname ~= "","constructor without struct") assert(def.stname ~= "","constructor without struct")
local empty = def.args:match("^%(%)") --no args local empty = def.args:match("^%(%)") --no args
@@ -1859,7 +1866,7 @@ local function func_header_generate_funcs(FP)
local def = cimf[t.signature] local def = cimf[t.signature]
assert(def,t.signature..t.cimguiname) assert(def,t.signature..t.cimguiname)
local manual = FP.get_manuals(def) local manual = FP.get_manuals(def)
if not manual and not def.templated then if not manual and not def.templated and not FP.get_skipped(def) then
local addcoment = "" --def.comment or "" local addcoment = "" --def.comment or ""
local empty = def.args:match("^%(%)") --no args local empty = def.args:match("^%(%)") --no args