From d017530444b3ac222b43b458f8d162e688763f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Sat, 10 Jun 2023 00:19:17 +0200 Subject: [PATCH] v0.0.156 --- bfcodegen/enum-generate.go | 15 ++++++++++++--- goextVersion.go | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bfcodegen/enum-generate.go b/bfcodegen/enum-generate.go index aee5eec..19a2e64 100644 --- a/bfcodegen/enum-generate.go +++ b/bfcodegen/enum-generate.go @@ -11,6 +11,7 @@ import ( "io" "os" "path" + "path/filepath" "regexp" "strings" "time" @@ -24,6 +25,7 @@ type EnumDefVal struct { type EnumDef struct { File string + FileRelative string EnumTypeName string Type string Values []EnumDefVal @@ -83,7 +85,7 @@ func GenerateEnumSpecs(sourceDir string, destFile string) error { for _, f := range files { fmt.Printf("========= %s =========\n\n", f.Name()) - fileEnums, pn, err := processFile(path.Join(sourceDir, f.Name())) + fileEnums, pn, err := processFile(sourceDir, path.Join(sourceDir, f.Name())) if err != nil { return err } @@ -123,7 +125,7 @@ func GenerateEnumSpecs(sourceDir string, destFile string) error { return nil } -func processFile(fn string) ([]EnumDef, string, error) { +func processFile(basedir string, fn string) ([]EnumDef, string, error) { file, err := os.Open(fn) if err != nil { return nil, "", err @@ -153,8 +155,15 @@ func processFile(fn string) ([]EnumDef, string, error) { } if match, ok := rexEnumDef.MatchFirst(line); ok { + + rfp, err := filepath.Rel(basedir, fn) + if err != nil { + return nil, "", err + } + def := EnumDef{ File: fn, + FileRelative: rfp, EnumTypeName: match.GroupByName("name").Value(), Type: match.GroupByName("type").Value(), Values: make([]EnumDefVal, 0), @@ -239,7 +248,7 @@ func fmtOutput(cs string, enums []EnumDef, pkgname string) string { str += "// ================================ " + enumdef.EnumTypeName + " ================================" + "\n" str += "//" + "\n" - str += "// File: " + enumdef.File + "\n" + str += "// File: " + enumdef.FileRelative + "\n" str += "// StringEnum: " + langext.Conditional(hasStr, "true", "false") + "\n" str += "// DescrEnum: " + langext.Conditional(hasDescr, "true", "false") + "\n" str += "//" + "\n" diff --git a/goextVersion.go b/goextVersion.go index f80ddd6..497c764 100644 --- a/goextVersion.go +++ b/goextVersion.go @@ -1,5 +1,5 @@ package goext -const GoextVersion = "0.0.155" +const GoextVersion = "0.0.156" -const GoextVersionTimestamp = "2023-06-08T16:26:06+0200" +const GoextVersionTimestamp = "2023-06-10T00:19:17+0200"