Merge pull request #395 from gucio321/remove-hardcoded-imgui-refs

Remove hardcoded imgui refs

cmd/codegen/cimgui-go-preset.json

@@ -1,4 +1,5 @@
 {
+        "PackagePath": "github.com/AllenDang/cimgui-go",
         "SkipFuncs": {
                 "igInputText":                     true,
                 "igInputTextWithHint":             true,
@@ -73,5 +74,12 @@
         ],
         "OriginReplace": {
                 "TextEditor_GetText": "TextEditor_GetText_alloc"
-        }
+        },
+        "ExtraCGOPreamble": [
+                "#include \"../imgui/extra_types.h\""
+        ],
+        "InternalFiles": [
+                "imgui_internal"
+        ],
+        "InternalPrefix": "Internal"
 }

cmd/codegen/gengo_callbacks.go

@@ -457,10 +457,10 @@ func (g *callbacksGenerator) saveToDisk() error {
 	fmt.Fprintf(result,
 		`// #include <stdlib.h>
 // #include <memory.h>
-// #include "../imgui/extra_types.h"
 // #include "wrapper.h"
 // #include "typedefs.h"
-`)
+%s
+`, g.ctx.preset.MergeCGoPreamble())
 
 	fmt.Fprintf(result, g.cgoSb.String())
 

cmd/codegen/gengo_funcs.go

@@ -44,6 +44,7 @@ func GenerateGoFuncs(
 		enumNames:     context.enumNames,
 		refTypedefs:   context.refTypedefs,
 		context:       context,
+		sb:            &strings.Builder{},
 	}
 
 	generator.writeFuncsFileHeader()
@@ -105,7 +106,7 @@ type goFuncsGenerator struct {
 	enumNames     map[CIdentifier]bool
 	refTypedefs   map[CIdentifier]bool
 
-	sb                 strings.Builder
+	sb                 *strings.Builder
 	convertedFuncCount int
 	shouldGenerate     bool
 
@@ -116,14 +117,14 @@ type goFuncsGenerator struct {
 func (g *goFuncsGenerator) writeFuncsFileHeader() {
 	g.sb.WriteString(getGoPackageHeader(g.context))
 
-	g.sb.WriteString(
-		`// #include "../imgui/extra_types.h"
-// #include "structs_accessor.h"
+	fmt.Fprintf(g.sb,
+		`// #include "structs_accessor.h"
 // #include "wrapper.h"
+%s
 import "C"
 import "unsafe"
 
-`)
+`, g.context.preset.MergeCGoPreamble())
 }
 
 func (g *goFuncsGenerator) GenerateFunction(f FuncDef, args []GoIdentifier, argWrappers []ArgumentWrapperData) (noErrors bool) {
@@ -302,8 +303,11 @@ func (g *goFuncsGenerator) generateFuncDeclarationStmt(receiver GoIdentifier, fu
 
 	// if file comes from imgui_internal.h,prefix Internal is added.
 	// ref: https://github.com/AllenDang/cimgui-go/pull/118
-	if strings.Contains(f.Location, "imgui_internal") {
-		goFuncName = "Internal" + goFuncName
+	for _, internalFile := range g.context.preset.InternalFiles {
+		if strings.HasPrefix(f.Location, internalFile) {
+			goFuncName = GoIdentifier(g.context.preset.InternalPrefix) + goFuncName
+			break
+		}
 	}
 
 	// Generate default param value hint

cmd/codegen/gengo_typedefs.go

@@ -226,12 +226,12 @@ extern "C" {
 	fmt.Fprintf(g.GoSb,
 		`// #include <stdlib.h>
 // #include <memory.h>
-// #include "../imgui/extra_types.h"
 // #include "wrapper.h"
 // #include "typedefs.h"
+%s
 import "C"
 import "unsafe"
-`)
+`, g.ctx.preset.MergeCGoPreamble())
 }
 
 // k is plain C name of the typedef (key in typedefs_dict.json)

cmd/codegen/main.go

@@ -9,10 +9,8 @@ import (
 )
 
 const (
-	cimguiGoPackagePath = "github.com/AllenDang/cimgui-go"
-	generatorInfo       = "// Code generated by cmd/codegen from https://github.com/AllenDang/cimgui-go.\n// DO NOT EDIT.\n\n"
-	goPackageHeader     = generatorInfo + "package %[1]s\n\nimport (\n\"" + cimguiGoPackagePath + "/datautils\"\n\t\"" + cimguiGoPackagePath + "/%[2]s\"\n)\n\n"
-	cppFileHeader       = generatorInfo
+	generatorInfo = "// Code generated by cmd/codegen from https://github.com/AllenDang/cimgui-go.\n// DO NOT EDIT.\n\n"
+	cppFileHeader = generatorInfo
 )
 
 // this cextracts enums and structs names from json file.
@@ -273,7 +271,20 @@ func main() {
 }
 
 func getGoPackageHeader(ctx *Context) string {
-	return fmt.Sprintf(goPackageHeader, ctx.flags.packageName, ctx.flags.refPackageName)
+	return fmt.Sprintf(
+		`%[1]s
+package %[2]s
+
+import (
+	"%[4]s/utils"
+	"%[4]s/%[3]s"
+)
+`,
+		generatorInfo,
+		ctx.flags.packageName,
+		ctx.flags.refPackageName,
+		ctx.preset.PackagePath,
+	)
 }
 
 func prefixGoPackage(t, sourcePackage GoIdentifier, ctx *Context) GoIdentifier {

cmd/codegen/presets.go

@@ -1,5 +1,7 @@
 package main
 
+import "strings"
+
 // Preset is a set of rules iperative to XXX_templates/ json files.
 // They are used to manually set some properties of the generator.
 type Preset struct {
@@ -30,4 +32,32 @@ type Preset struct {
 	// Introduced to replace TextEditor_GetText -> TextEditor_GetText_alloc
 	// but could be re-used to force use of another function than json tells us to use.
 	OriginReplace map[CIdentifier]CIdentifier
+	// ExtraCGOPreamble allows to specify additional C code elements in Go files.
+	// For example could be used to include extra files.
+	// For ease of use, its in form of []string. These lines will be merged and prefixed (if appliable) with '//'
+	ExtraCGOPreamble []string
+	// InternalFiles allows to specify files that are considered Internal.
+	// If an identifier is found in such a file, it will be generated but its
+	// name will be prefixed with InternalPrefix
+	InternalFiles []string
+	// InternalPrefix is a prefix for identifiers from InternalFiles.
+	InternalPrefix string
+	// PackagePath is an import path of the package.
+	// This is base path. flags.packageName will be added.
+	// Example:
+	//   "github.com/AllenDang/cimgui-go"
+	//   If enerated with -pkg imgui, import path
+	//   is supposed to be "github.com/AllenDang/cimgui-go/imgui"
+	PackagePath string
+}
+
+func (p *Preset) MergeCGoPreamble() string {
+	result := ""
+	for _, line := range p.ExtraCGOPreamble {
+		result += "// " + line + "\n"
+	}
+
+	result = strings.TrimSuffix(result, "\n")
+
+	return result
 }