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

cpp2ffi: dont expect const ImStr

Browse Source
This commit is contained in:
Victor Bombi
2021-02-01 13:29:54 +01:00
parent a48009b062
commit c57efd953f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
generator/cpp2ffi.lua
View File

@@ -785,7 +785,7 @@ local function ADDIMSTR_S(FP)
--if isIMSTR return generate _S version --if isIMSTR return generate _S version
local isIMSTR = false local isIMSTR = false
for i,arg in ipairs(defT.argsT) do for i,arg in ipairs(defT.argsT) do
if arg.type == "ImStr" or arg.type == "const ImStr" then isIMSTR=true;break end if arg.type == "ImStr" then isIMSTR=true;break end
end end
--if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then --if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
--if isIMSTR then print(t.cimguiname,defT.ov_cimguiname,defT.argsoriginal,"isIMSTR") end --if isIMSTR then print(t.cimguiname,defT.ov_cimguiname,defT.argsoriginal,"isIMSTR") end
@@ -799,7 +799,7 @@ local function ADDIMSTR_S(FP)
--then argsT table --then argsT table
defT2.argsT = {} defT2.argsT = {}
for k,v in ipairs(defT.argsT) do for k,v in ipairs(defT.argsT) do
local typ = (v.type == "ImStr" or v.type == "const ImStr") and "const char*" or v.type local typ = v.type == "ImStr" and "const char*" or v.type
table.insert(defT2.argsT,{type=typ,name=v.name}) table.insert(defT2.argsT,{type=typ,name=v.name})
end end
--defaults table --defaults table
@@ -807,7 +807,6 @@ local function ADDIMSTR_S(FP)
for k,v in pairs(defT.defaults) do for k,v in pairs(defT.defaults) do
defT2.defaults[k] = v defT2.defaults[k] = v
end end
defT2.args = defT.args:gsub("const ImStr","const char*")
defT2.args = defT2.args:gsub("ImStr","const char*") defT2.args = defT2.args:gsub("ImStr","const char*")
--recreate call_args for wrapping into ImStr --recreate call_args for wrapping into ImStr
local caar local caar