add igGetIDRange to overloads table

be able to generate without precompiler

CMakeLists.txt

@@ -20,10 +20,11 @@ endif(WIN32)
 #add library and link
 add_library(cimgui SHARED ${IMGUI_SOURCES})
 target_link_libraries(cimgui ${IMGUI_LIBRARIES})
+set_target_properties(cimgui PROPERTIES PREFIX "")
 
 #install
 install(TARGETS cimgui
               RUNTIME DESTINATION  .
               LIBRARY DESTINATION  .
               #ARCHIVE DESTINATION lib 
-              )
+              )

README.md

@@ -20,18 +20,44 @@ Notes:
 * clone 
   * git clone --recursive https://github.com/cimgui/cimgui.git
   * git submodule update
-* make using makefile on linux/macOS/mingw (Or use CMake to generate project)
+* compile 
+  * using makefile on linux/macOS/mingw (Or use CMake to generate project)
+  * or as in https://github.com/sonoro1234/LuaJIT-ImGui/tree/master_auto_implementations/build
 
-# auto binding generation
+# using generator
 
 * you will need LuaJIT (https://github.com/LuaJIT/LuaJIT.git better 2.1 branch) or precompiled for linux/macOS/windows in https://luapower.com/luajit/download
-* need also gcc compiler for doing preprocessing (In windows MinGW-W64-builds for example)
+* you can use also a C++ compiler for doing preprocessing: gcc (In windows MinGW-W64-builds for example), clang or cl (MSVC) or not use a compiler (experimental nocompiler option) at all. (this repo was done with gcc)
 * update `imgui` folder to the version you desire.
-* run `generator/generator.bat` (or make a .sh version and please PR) with gcc and LuaJIT on your PATH.
-* as a result some files are generated: `cimgui.cpp` and `cimgui.h` for compiling and some lua/json files with information about the binding: `definitions.json` with function info, `structs_and_enums.json` with struct and enum info, `impl_definitions.json` with functions from the implementations info.
-* build as shown in https://github.com/sonoro1234/LuaJIT-ImGui/tree/master_auto_implementations/build
-* generate binding as done in https://github.com/sonoro1234/LuaJIT-ImGui/blob/master_auto_implementations/lua/build.bat
+* edit `generator/generator.bat` (or make a .sh version and please PR) to choose between gcc, clang, cl or nocompiler. Run it with gcc, clang or cl and LuaJIT on your PATH.
+* as a result some files are generated: `cimgui.cpp` and `cimgui.h` for compiling and some lua/json files with information about the binding: `definitions.json` with function info, `structs_and_enums.json` with struct and enum info, `impl_definitions.json` with functions from the implementations info. 
 
+# generate binding
+* with your prefered language you can use the lua or json files generated as in:
+  * https://github.com/sonoro1234/LuaJIT-ImGui/blob/master_auto_implementations/lua/build.bat (with lua code generation in https://github.com/sonoro1234/LuaJIT-ImGui/blob/master_auto_implementations/lua/class_gen.lua)
+  * https://github.com/mellinoe/ImGui.NET/tree/autogen/src/CodeGenerator
+### definitions description
+* It is a collection in which key is the cimgui name that would result without overloadings and the value is an array of overloadings (may be only one overloading)
+* Each overloading is a collection. Some relevant keys and values are:
+  * stname : the name of the struct the function belongs to (may be ImGui if it is top level in ImGui namespace)
+  * ov_cimguiname : the overloaded cimgui name (if absent it would be taken from cimguiname)
+  * cimguiname : the name without overloading (this should be used if there is not ov_cimguiname)
+  * call_args : a string with the argument names separated by commas
+  * args : the same as above but with types
+  * ret : the return type
+  * argsT : an array of collections (each one with type: argument type and name: the argument name)
+  * 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)
+  * nonUDT : if present can be 1 or 2 (explained meaning in usage) if return type was a user defined type
+### structs_and_enums description
+* Is is a collection with two items:
+  * under key enums we get the enums collection in which each key is the enum tagname and the value is an array of the ordered values represented as a collection with keys
+    * name : the name of this enum value
+    * value : the C string
+    * calc_value : the numeric value corresponding to value
+  * under key structs we get the structs collection in which the key is the struct name and the value is an array of the struct members. Each one given as a collection with keys
+    * type : the type of the struct member
+    * name : the name of the struct member
 # usage
 
 * use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig`
@@ -47,5 +73,5 @@ Notes:
 * [ImGuiCS](https://github.com/conatuscreative/ImGuiCS)
 * [imgui-rs](https://github.com/Gekkio/imgui-rs)
 * [imgui-pas](https://github.com/dpethes/imgui-pas)
-* [odin-dear_imgui](https://github.com/ThisDrunkDane/odin-dear_imgui)
+* [odin-imgui](https://github.com/ThisDrunkDane/odin-imgui)
 * [LuaJIT-imgui](https://github.com/sonoro1234/LuaJIT-ImGui)

cimgui.cpp

@@ -477,7 +477,7 @@ CIMGUI_API ImGuiID igGetIDStr(const char* str_id)
 {
     return ImGui::GetID(str_id);
 }
-CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end)
+CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end)
 {
     return ImGui::GetID(str_id_begin,str_id_end);
 }

cimgui.h

@@ -40,7 +40,7 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple;
 
 
 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-       
+struct ImDrawChannel;
 typedef struct CustomRect CustomRect;
 typedef struct GlyphRangesBuilder GlyphRangesBuilder;
 typedef struct ImFontGlyph ImFontGlyph;
@@ -69,7 +69,6 @@ typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
-struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
 struct ImDrawList;
@@ -955,7 +954,7 @@ CIMGUI_API void igPushIDPtr(const void* ptr_id);
 CIMGUI_API void igPushIDInt(int int_id);
 CIMGUI_API void igPopID(void);
 CIMGUI_API ImGuiID igGetIDStr(const char* str_id);
-CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end);
+CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end);
 CIMGUI_API ImGuiID igGetIDPtr(const void* ptr_id);
 CIMGUI_API void igTextUnformatted(const char* text,const char* text_end);
 CIMGUI_API void igText(const char* fmt,...);

generator/generator.bat

@@ -14,8 +14,9 @@
 :: set PATH=%PATH%;C:\luaGL;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\mingw32\bin;
 :: set PATH=%PATH%;C:\luaGL\sources\luajit-master\luajit-master\bin\mingw32;C:\mingw32\bin;
 ::process  files
-:: arg[1..n] name of implementations to generate
-luajit ./generator.lua glfw opengl3 opengl2 sdl
+:: arg[1] compiler name gcc, clang, cl or nocompiler
+:: arg[2..n] name of implementations to generate
+luajit ./generator.lua gcc glfw opengl3 opengl2 sdl
 
 ::leave console open
 cmd /k

generator/generator.lua

@@ -5,27 +5,41 @@
 assert(_VERSION=='Lua 5.1',"Must use LuaJIT")
 assert(bit,"Must use LuaJIT")
 local script_args = {...}
-
---test gcc present
-local HAVE_GCC
-local pipe,err = io.popen("gcc --version","r")
-if pipe then
-    local str = pipe:read"*a"
-    print(str)
-    pipe:close()
-    if str=="" then
-        HAVE_GCC = false
-    else
-        HAVE_GCC = true
-    end
+local COMPILER = script_args[1]
+local CPRE,CTEST
+if COMPILER == "gcc" or COMPILER == "clang" then
+	CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]]
+	CTEST = COMPILER.." --version"
+elseif COMPILER == "cl" then
+	CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ]]
+	CTEST = COMPILER
 else
-    HAVE_GCC = false
-    print(err)
+	print("Working without compiler ")
 end
-print("HAVE_GCC",HAVE_GCC)
+--test compiler present
+local HAVE_COMPILER = false
+if CTEST then
+	local pipe,err = io.popen(CTEST,"r")
+	if pipe then
+		local str = pipe:read"*a"
+		print(str)
+		pipe:close()
+		if str=="" then
+			HAVE_COMPILER = false
+		else
+			HAVE_COMPILER = true
+		end
+	else
+		HAVE_COMPILER = false
+		print(err)
+	end
+	assert(HAVE_COMPILER,"gcc, clang or cl needed to run script")
+end --CTEST
+
+print("HAVE_COMPILER",HAVE_COMPILER)
 --get implementations
 local implementations = {}
-for i=1,#script_args do table.insert(implementations,script_args[i]) end
+for i=2,#script_args do table.insert(implementations,script_args[i]) end
 
 --------------------------------------------------------------------------
 --this table has the functions to be skipped in generation
@@ -48,6 +62,9 @@ local cimgui_overloads = {
         --["(const void*)"] =           "igPushIDPtr",
         --["(int)"] =                   "igPushIDInt"
     },
+	igGetID = {
+		["(const char*,const char*)"] = "igGetIDRange",
+	},
     ImDrawList_AddText = {
         ["(const ImVec2,ImU32,const char*,const char*)"] = "ImDrawList_AddText",
     },
@@ -82,34 +99,107 @@ local gdefines = {} --for FLT_MAX and others
 --------------------------------------------------------------------------
 --helper functions
 --------------------------------------------------------------------------
---iterates lines from a .h file and discards between #if.. and #endif
-local function filelines(file)
+
+local function split_comment(line)
+    local comment = line:match("(%s*//.*)") or ""
+	line = line:gsub("%s*//.*","")
+	line = line:gsub("%s*$","")
+    return line,comment
+end
+--minimal preprocessor
+local function filelines(file,locats)
     local iflevels = {}
+   --generated known prepros
+local prepro = {
+["#if"]={
+    [   "defined(__clang__) || defined(__GNUC__)"       ]=false,
+    [   "defined(__clang__)"    ]=false,
+    [   "defined(_MSC_VER) && !defined(__clang__)"      ]=false,
+    [   "!defined(IMGUI_DISABLE_INCLUDE_IMCONFIG_H) || defined(IMGUI_INCLUDE_IMCONFIG_H)"       ]=false,
+    [   "!defined(IMGUI_IMPL_OPENGL_LOADER_GL3W)     \\"        ]=false,
+},
+["#elif"]={
+    [   "defined(__GNUC__) && __GNUC__ >= 8"    ]=false,
+    [   "(defined(__clang__) || defined(__GNUC__)) && (__cplusplus < 201100)"   ]=false,
+},
+["#ifdef"]={
+    [   "IM_VEC4_CLASS_EXTRA"   ]=false,
+    [   "IMGUI_USER_CONFIG"     ]=false,
+    [   "IMGUI_INCLUDE_IMGUI_USER_H"    ]=false,
+    [   "IMGUI_USE_BGRA_PACKED_COLOR"   ]=false,
+    [   "IM_VEC2_CLASS_EXTRA"   ]=false,
+},
+["#ifndef"]={
+    [   "IMGUI_API"     ]=false,
+    [   "IMGUI_IMPL_API"        ]=false,
+    [   "IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT" ]=true,
+    [   "IM_ASSERT"     ]=false,
+    [   "ImTextureID"   ]=true,
+    [   "ImDrawIdx"     ]=true,
+    [   "IMGUI_DISABLE_OBSOLETE_FUNCTIONS"      ]=false,
+},
+}
+	--only one case is true
+	local function prepro_boolifBAK(line)
+		local ma = line:match("#ifndef%s+IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT") or line:match("#ifndef%s+ImTextureID")
+		return not (ma==nil)
+	end
+	local function prepro_boolif(pre,cond)
+		local conds = prepro[pre]
+		assert(conds,pre.." has no conds-----------------------------")
+		local res = conds[cond]
+		--assert(type(res)~="nil",cond.." not found")
+		if type(res)=="nil" then
+			print(pre,cond,"not found in precompiler database, returning false.")
+			res = false
+		end
+		return res
+	end
     local function location_it()
         repeat
             local line = file:read"*l"
             if not line then return nil end
-            if line:sub(1,1) == "#" then
+            --if line:sub(1,1) == "#" then
+			if line:match("^%s*#") then
+				line,_ = split_comment(line)
+				local pre,cond = line:match("^%s*(#%S*)%s+(.*)%s*$")
                 if line:match("#if") then 
-                    iflevels[#iflevels +1 ] = true
+                    iflevels[#iflevels +1 ] = prepro_boolif(pre,cond)
                 elseif line:match("#endif") then
                     iflevels[#iflevels] = nil
+				elseif line:match("#elif") then
+					if not iflevels[#iflevels] then
+						iflevels[#iflevels] = prepro_boolif(pre,cond)
+					else --was true
+						iflevels[#iflevels] = false
+					end
+				elseif line:match("#else") then
+					iflevels[#iflevels] = not iflevels[#iflevels]
+				else
+					if not (pre:match("#define") or pre:match"#include" or pre:match"#pragma") then
+						print("not expected preprocessor directive ",pre)
+					end
                 end
                 -- skip
-            elseif #iflevels == 0 then
+            elseif #iflevels == 0 or iflevels[#iflevels] then
                 -- drop IMGUI_APIX
                 line = line:gsub("IMGUI_IMPL_API","")
                 -- drop IMGUI_API
                 line = line:gsub("IMGUI_API","")
-                return line
+                return line,locats[1]
             end
         until false
     end
     return location_it
 end
---iterates lines from a gcc -E in a specific location
+--iterates lines from a gcc/clang -E in a specific location
 local function location(file,locpathT)
-    local location_re = '^# (%d+) "([^"]*)"'
+    local location_re 
+	if COMPILER == "cl" then
+		location_re = '^#line (%d+) "([^"]*)"'
+	else --gcc, clang
+		location_re = '^# (%d+) "([^"]*)"'
+	end
     local path_reT = {}
     for i,locpath in ipairs(locpathT) do
         table.insert(path_reT,'^(.*[\\/])('..locpath..')%.h$')
@@ -132,7 +222,9 @@ local function location(file,locpathT)
 					return nil
 				end
 			end
-            if line:sub(1,1) == "#" then
+			if #line==0 then --nothing on emptyline
+			elseif not line:match("%S") then --nothing if only spaces
+            elseif line:sub(1,1) == "#" then
                 -- Is this a location pragma?
                 local loc_num_t,location_match = line:match(location_re)
                 if location_match then
@@ -161,7 +253,7 @@ local function location(file,locpathT)
                 --return line,loc_num_real, which_location
 				end
             end
-        until false
+        until false --forever
     end
     return location_it
 end
@@ -264,10 +356,6 @@ local function clean_spaces(cad)
     cad = cad:gsub("%s*([%(%),=])%s*","%1") --not spaces with ( , )
     return cad
 end
-local function split_comment(line)
-    local comment = line:match("(%s*//.*)") or ""
-    return line:gsub("%s*//.*",""),comment
-end
 local function get_manuals(def)
     return cimgui_manuals[def.ov_cimguiname] or cimgui_manuals[def.cimguiname]
 end
@@ -288,7 +376,7 @@ end
 local function struct_parser()
     local function_re = "(%a*%w+%s*%b())" --"(%a*%w+%b())" --"(%a*%w+%s+%w+%b())"
     local function_closing_re = "}"
-    local function_closed_re = "[;}]$"
+    local function_closed_re = "[;}]%s*$"
     local operator_re = "operator.-%b()"
     local functype_re = "(%(%*)[%w_]+(%)%([^%(%)]*%))"
     local initial_comment_re = [[^%s*//.*]]
@@ -307,6 +395,7 @@ local function struct_parser()
         
         --if in_function discard
         if in_functionst then 
+			--table.insert(structcdefs,"en function:"..line) --debug
             if line:match(function_closing_re) then
                 in_functionst = false
                 --print("in function:",line)
@@ -314,16 +403,13 @@ local function struct_parser()
             return
         end
 
-        
-        
         if (line:match(function_re) or line:match(operator_re)) and not line:match("typedef.*%b().*%b().*") 
         and not line:match(functype_re) then
+			--table.insert(structcdefs,"function test2:"..line) --debug
             if not line:match(function_closed_re) then
                 --print("match:",line)
                 in_functionst = true
             end
-        --else
-            --table.insert(structcdefs,linecommented)
         elseif line:match("template") then
             --nothing
         elseif line:match("public:") then
@@ -332,7 +418,6 @@ local function struct_parser()
             local linea = line:gsub("%S+",{class="struct",mutable=""})
             linea = linea:gsub("(%b<>)","/*%1*/") --comment template parameters
             table.insert(structcdefs,linea..comment)
-            
         end
         return 
     end
@@ -563,7 +648,11 @@ local function func_parser()
                     end
                     table.insert(argsArr,{type=type,name=name,ret=retf,signature=sigf})
                     if arg:match("&") and not arg:match("const") then
-                        print("reference to no const arg in",funcname,argscsinpars)
+						--only post error if not manual
+						local cname = getcimguiname(stname,funcname)
+						if not cimgui_manuals[cname] then
+							print("reference to no const arg in",funcname,argscsinpars)
+						end
                     end
                 end
                 argscsinpars = argscsinpars:gsub("&","")
@@ -792,6 +881,11 @@ local function gen_structs_and_enums_table(cdefs)
         
         if (#enumnames > 0) then
             assert(#structnames==0,"enum in struct")
+			-- if #structnames~=0 then
+				-- print(line,#line)
+				-- print(linecom,#linecom)
+				-- error"enuminstruct"
+			-- end
             if line:match(struct_closing_re) and not line:match(struct_op_close_re) then
                 enumnames[#enumnames] = nil
                 break
@@ -925,13 +1019,15 @@ local function gen_structs_and_enums(cdefs)
         -- ImVector special treatment
         if structnames[#structnames] == "ImVector" then
             if line:match(struct_closing_re) then
-                table.insert(outtab,[[struct ImVector
+                table.insert(outtab,[[
+struct ImVector
 {
     int Size;
     int Capacity;
     void* Data;
 };
-typedef struct ImVector ImVector;]])
+typedef struct ImVector ImVector;
+]])
                 structnames[#structnames] = nil
             end
             break -- dont write
@@ -1205,7 +1301,8 @@ local function check_arg_detection(fdefs,typedefs)
 	print"-----------------end check arg detection-----------------------"
 end
 local function get_defines(t)
-	local pipe,err = io.popen([[gcc -E -dM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ../imgui/imgui.h]],"r")
+	if COMPILER == "cl" then print"can't get defines with cl compiler"; return {} end
+	local pipe,err = io.popen(COMPILER..[[ -E -dM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ../imgui/imgui.h]],"r")
 	local defines = {}
 	while true do
 		local line = pipe:read"*l"
@@ -1294,35 +1391,20 @@ pipe:close()
 cimgui_header = cimgui_header:gsub("XXX",imgui_version)
 print("IMGUI_VERSION",imgui_version)
 --get some defines----------------------------
-if HAVE_GCC then
+if HAVE_COMPILER then
 	gdefines = get_defines{"IMGUI_VERSION","FLT_MAX"}
 end									
---first without gcc
----[[
-print"------------------generation without precompiler------------------------"
-local pipe,err = io.open("../imgui/imgui.h","r")
-if not pipe then
-    error("could not open file:"..err)
-end
 
-local STP = struct_parser()
-local FP = func_parser()
-
-for line in filelines(pipe) do
-    local line, comment = split_comment(line)
-    STP.insert(line,comment)
-    FP.insert(line,comment)
-end
-pipe:close()
-FP:compute_overloads()
-cimgui_generation("_nopreprocess",STP,FP)
---]]
---then gcc
-print"------------------generation with precompiler------------------------"
+--generation
+print("------------------generation with "..COMPILER.."------------------------")
 local pFP,pSTP,typedefs_dict2
 
-if HAVE_GCC then
-local pipe,err = io.popen([[gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ../imgui/imgui.h]],"r")
+local pipe,err
+if HAVE_COMPILER then
+    pipe,err = io.popen(CPRE..[[../imgui/imgui.h]],"r")
+else
+    pipe,err = io.open([[../imgui/imgui.h]],"r")
+end
 
 if not pipe then
     error("could not execute gcc "..err)
@@ -1331,19 +1413,24 @@ end
 pSTP = struct_parser() --overwrite
 pFP = func_parser() --overwrite
 
-for line in location(pipe,{"imgui"}) do
+local iterator = (HAVE_COMPILER and location) or filelines
+
+for line in iterator(pipe,{"imgui"}) do
     local line, comment = split_comment(line)
+	--line = clean_spaces(line)
+	--comment = ""
     pSTP.insert(line,comment)
     pFP.insert(line,comment)
 end
 pipe:close()
+
 local ovstr = pFP:compute_overloads()
 ADDnonUDT(pFP)
 save_data("./output/overloads.txt",ovstr)
 typedefs_dict2 = cimgui_generation("",pSTP,pFP)
 --check arg detection failure if no name in function declaration
 check_arg_detection(pFP.defsT,typedefs_dict2)
-end
+
 
 ----------save fundefs in definitions.lua for using in bindings
 set_defines(pFP.defsT) 
@@ -1367,8 +1454,8 @@ if #implementations > 0 then
         local source = [[../imgui/examples/imgui_impl_]].. impl .. ".h "
         local locati = [[imgui_impl_]].. impl
         local pipe,err
-        if HAVE_GCC then
-            pipe,err = io.popen([[gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]] ..source,"r")
+        if HAVE_COMPILER then
+            pipe,err = io.popen(CPRE..source,"r")
         else
             pipe,err = io.open(source,"r")
         end
@@ -1376,7 +1463,7 @@ if #implementations > 0 then
             error("could not get file: "..err)
         end
         
-        local iterator = (HAVE_GCC and location) or filelines
+        local iterator = (HAVE_COMPILER and location) or filelines
         
         for line,locat in iterator(pipe,{locati}) do
             local line, comment = split_comment(line)

generator/output/cimgui.cpp

@@ -477,7 +477,7 @@ CIMGUI_API ImGuiID igGetIDStr(const char* str_id)
 {
     return ImGui::GetID(str_id);
 }
-CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end)
+CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end)
 {
     return ImGui::GetID(str_id_begin,str_id_end);
 }

generator/output/cimgui.h

@@ -40,7 +40,7 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple;
 
 
 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-       
+struct ImDrawChannel;
 typedef struct CustomRect CustomRect;
 typedef struct GlyphRangesBuilder GlyphRangesBuilder;
 typedef struct ImFontGlyph ImFontGlyph;
@@ -69,7 +69,6 @@ typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
-struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
 struct ImDrawList;
@@ -955,7 +954,7 @@ CIMGUI_API void igPushIDPtr(const void* ptr_id);
 CIMGUI_API void igPushIDInt(int int_id);
 CIMGUI_API void igPopID(void);
 CIMGUI_API ImGuiID igGetIDStr(const char* str_id);
-CIMGUI_API ImGuiID igGetIDStrStr(const char* str_id_begin,const char* str_id_end);
+CIMGUI_API ImGuiID igGetIDRange(const char* str_id_begin,const char* str_id_end);
 CIMGUI_API ImGuiID igGetIDPtr(const void* ptr_id);
 CIMGUI_API void igTextUnformatted(const char* text,const char* text_end);
 CIMGUI_API void igText(const char* fmt,...);

generator/output/definitions.lua

@@ -4135,7 +4135,7 @@ defs["igGetID"][2]["argsT"][1]["name"] = "str_id_begin"
 defs["igGetID"][2]["argsT"][2] = {}
 defs["igGetID"][2]["argsT"][2]["type"] = "const char*"
 defs["igGetID"][2]["argsT"][2]["name"] = "str_id_end"
-defs["igGetID"][2]["ov_cimguiname"] = "igGetIDStrStr"
+defs["igGetID"][2]["ov_cimguiname"] = "igGetIDRange"
 defs["igGetID"][2]["defaults"] = {}
 defs["igGetID"][2]["signature"] = "(const char*,const char*)"
 defs["igGetID"][2]["cimguiname"] = "igGetID"

generator/output/overloads.txt

@@ -43,7 +43,7 @@ igMenuItem	2
 2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
 igGetID	3
 1	ImGuiID	igGetIDStr (const char*)
-2	ImGuiID	igGetIDStrStr (const char*,const char*)
+2	ImGuiID	igGetIDRange (const char*,const char*)
 3	ImGuiID	igGetIDPtr (const void*)
 igListBoxHeader	2
 1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)