From d331453422e260df28f1d5eb21c0379a5471d44e Mon Sep 17 00:00:00 2001
From: sonoro1234 <sonoro@telefonica.net>
Date: Fri, 15 Feb 2019 12:24:06 +0100
Subject: [PATCH] correct issue #88 (Pair union member)

---
 generator/generator2.lua                | 7 ++++++-
 generator/output/structs_and_enums.json | 4 ++--
 generator/output/structs_and_enums.lua  | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/generator/generator2.lua b/generator/generator2.lua
index 3e19bdf..2c18d4c 100644
--- a/generator/generator2.lua
+++ b/generator/generator2.lua
@@ -446,7 +446,7 @@ end
 local function cimgui_generation(parser)
 	cpp2ffi.prtable(parser.templates)
 	cpp2ffi.prtable(parser.typenames)
-	--clean ImVector:contains() for not applicable types
+	-- clean ImVector:contains() for not applicable types
 	local clean_f = {}
 	for k,v in pairs(parser.defsT) do
 		if k:match"ImVector" and k:match"contains" then
@@ -463,6 +463,7 @@ local function cimgui_generation(parser)
 			end
 		end
 	end
+	
 	--------------------------------------------------
     local hstrfile = read_data"./cimgui_template.h"
 
@@ -556,6 +557,10 @@ save_data("./output/definitions.lua",serializeTableF(parser1.defsT))
 
 ----------save struct and enums lua table in structs_and_enums.lua for using in bindings
 local structs_and_enums_table = parser1:gen_structs_and_enums_table()
+--correct Pair union member
+structs_and_enums_table["structs"]["Pair"][2]["name"] = ""
+structs_and_enums_table["structs"]["Pair"][2]["type"] = structs_and_enums_table["structs"]["Pair"][2]["type"] .. "}"
+-----------------------
 save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table))
 save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict))
 
diff --git a/generator/output/structs_and_enums.json b/generator/output/structs_and_enums.json
index a843bd1..11816e8 100644
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -2745,8 +2745,8 @@
         "type": "ImGuiID"
       },
       {
-        "name": "}",
-        "type": "union { int val_i; float val_f; void* val_p;"
+        "name": "",
+        "type": "union { int val_i; float val_f; void* val_p;}"
       }
     ],
     "TextRange": [
diff --git a/generator/output/structs_and_enums.lua b/generator/output/structs_and_enums.lua
index 1add2b6..c4e7b6d 100644
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
@@ -2125,8 +2125,8 @@ defs["structs"]["Pair"][1] = {}
 defs["structs"]["Pair"][1]["name"] = "key"
 defs["structs"]["Pair"][1]["type"] = "ImGuiID"
 defs["structs"]["Pair"][2] = {}
-defs["structs"]["Pair"][2]["name"] = "}"
-defs["structs"]["Pair"][2]["type"] = "union { int val_i; float val_f; void* val_p;"
+defs["structs"]["Pair"][2]["name"] = ""
+defs["structs"]["Pair"][2]["type"] = "union { int val_i; float val_f; void* val_p;}"
 defs["structs"]["TextRange"] = {}
 defs["structs"]["TextRange"][1] = {}
 defs["structs"]["TextRange"][1]["name"] = "b"