From 31b598af72cac63d4913c0c8cfb0875fc21ef1b5 Mon Sep 17 00:00:00 2001 From: Victor Bombi Date: Fri, 25 Sep 2020 09:59:59 +0200 Subject: [PATCH] cpp2ffi: dont generate comments --- generator/cpp2ffi.lua | 9 ++++++++- generator/generator.lua | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/generator/cpp2ffi.lua b/generator/cpp2ffi.lua index f4f5669..e878859 100644 --- a/generator/cpp2ffi.lua +++ b/generator/cpp2ffi.lua @@ -345,13 +345,20 @@ local function parseItems(txt,dumpit,loca,linenumdict) end else --item,inercoms = clean_comments(item) + local itemold = item item = item:gsub("extern __attribute__%(%(dllexport%)%) ","") local comments = table.concat(outercomms,"\n") --..inercoms if comments=="" then comments=nil end outercomms = {} if linenumdict then - local itemfirstline = item:match("[^\n]+") + local itemfirstline = itemold:match("[^\n]+") loca = linenumdict[itemfirstline] + if not loca then + print(itemold) + error"no entry in linenumdict" + end + else + error"no linenumdict" end table.insert(itemarr,{re_name=re_name,item=item,locat=loca})--,comments=comments}) items[re_name] = items[re_name] or {} diff --git a/generator/generator.lua b/generator/generator.lua index 3a9d6fa..a3dcd7c 100644 --- a/generator/generator.lua +++ b/generator/generator.lua @@ -10,10 +10,10 @@ local INTERNAL_GENERATION = script_args[2]:match("internal") and true or false local FREETYPE_GENERATION = script_args[2]:match("freetype") and true or false local CPRE,CTEST if COMPILER == "gcc" or COMPILER == "clang" then - CPRE = COMPILER..[[ -E -C -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]] + CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]] CTEST = COMPILER.." --version" elseif COMPILER == "cl" then - CPRE = COMPILER..[[ /E /C /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ]] + CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ]] CTEST = COMPILER else print("Working without compiler ") @@ -494,7 +494,7 @@ if #implementations > 0 then pipe:close() end - parser2.separate_locations = function(self, cdefs) + parser2.separate_locationsNO = function(self, cdefs) local sepcdefs = {} for i,impl in ipairs(implementations) do sepcdefs[i] = {[[imgui_impl_]].. impl,{}}