Skip to content

Commit

Permalink
codegen/main.go: do not use log package
Browse files Browse the repository at this point in the history
  • Loading branch information
gucio321 committed Nov 16, 2024
1 parent 36852d6 commit 31bf9f0
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions cmd/codegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package main
import (
"encoding/json"
"fmt"
"log"
"os"

"github.com/kpango/glg"
Expand Down Expand Up @@ -87,7 +86,7 @@ func loadData(f *flags) (*jsonData, error) {

result.structAndEnums, err = os.ReadFile(f.enumsJsonpath)
if err != nil {
log.Panic(err)
glg.Fatalf("cannot read struct and enums json file: %v", err)
}

if len(f.refEnumsJsonPath) > 0 {
Expand All @@ -107,7 +106,7 @@ func loadData(f *flags) (*jsonData, error) {
if len(f.presetJsonPath) > 0 {
result.preset, err = os.ReadFile(f.presetJsonPath)
if err != nil {
log.Panic(err)
glg.Fatalf("cannot read preset json file: %v", err)
}
}

Expand Down Expand Up @@ -241,35 +240,35 @@ func main() {
// 1.2. Generate Go typedefs
typedefsNames, callbacksToGenerate, err := GenerateTypedefs(context.typedefs, context.structs, context)
if err != nil {
log.Panic(err)
glg.Fatalf("Cannot generate typedefs: %v", err)
}

context.typedefsNames = SliceToMap(typedefsNames)

validCallbacks, err := GenerateCallbacks(callbacksToGenerate, context)
if err != nil {
log.Panic(err)
glg.Fatalf("Cannot generate callbacks: %v", err)
}

context.typedefsNames = MergeMaps(context.typedefsNames, SliceToMap(validCallbacks))

// 1.3. Generate C wrapper
validFuncs, err := generateCppWrapper(flags.prefix, flags.include, context.funcs, context)
if err != nil {
log.Panic(err)
glg.Fatalf("Cannot generate CPP Wrapper: %v", err)
}

// 1.3.1. Generate Struct accessors in C
structAccessorFuncs, err := generateCppStructsAccessor(flags.prefix, validFuncs, context.structs, context)
if err != nil {
log.Panic(err)
glg.Fatalf("Cannot generate CPP Struct Accessors: %v", err)
}

// This variable stores funcs that needs to be written to GO now.
validFuncs = append(validFuncs, structAccessorFuncs...)

if err := GenerateGoFuncs(validFuncs, context); err != nil {
log.Panic(err)
glg.Fatalf("Cannot generate Go functions: %v", err)
}
}

Expand Down

0 comments on commit 31bf9f0

Please sign in to comment.