From 77ee4fad38af6ef0cf664a21d27fc7e2d5fe2832 Mon Sep 17 00:00:00 2001 From: Victor Bombi Date: Mon, 23 Mar 2020 16:28:28 +0100 Subject: [PATCH] cpp2ffi: change vardef_re allowing parenthesis for ImU8 Used4kPagesMap[((sizeof(ImWchar16) == 2 ? 0xFFFF : 0x10FFFF)+1)/4096/8]; --- generator/cpp2ffi.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/generator/cpp2ffi.lua b/generator/cpp2ffi.lua index c656312..7849d6f 100644 --- a/generator/cpp2ffi.lua +++ b/generator/cpp2ffi.lua @@ -258,7 +258,10 @@ local function getRE() typedef_re = "^\n*(typedef[^;]+;)", functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%(%s*%*%s*[%w_]+%s*%)%s*%b()%s*;)", functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*%s*[%w_]+%s*%)%s*%b()%s*;)", - vardef_re = "^\n*([^;{}%(%)]+;)", + --vardef_re = "^\n*([^;{}%(%)]+;)", + --change for things as + --[[ImU8 Used4kPagesMap[((sizeof(ImWchar16) == 2 ? 0xFFFF : 0x10FFFF)+1)/4096/8];]] + vardef_re = "^\n*([^;{}]+;)", functionD_re = "^([^;{}]-%b()[\n%s%w]*%b{})", --functionD_re = "^([^;{}]-%b()[^{}%(%)]*%b{})", functype_re = "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)%s*;" @@ -307,6 +310,7 @@ local function parseItems(txt,dumpit) if not onlyspaces then print(ini,#txt); print(txt); + print"item:" print(item) error"parseItems error" end