Support imported type aliases

[govpp.git] / cmd / binapi-generator / objects.go

diff --git a/cmd/binapi-generator/objects.go b/cmd/binapi-generator/objects.go
index e3270de..9871abc 100644 (file)
--- a/cmd/binapi-generator/objects.go
+++ b/cmd/binapi-generator/objects.go
@@ -4,6 +4,7 @@ import "fmt"
 
 // Package represents collection of objects parsed from VPP binary API JSON data
 type Package struct {
+       Name     string
        Version  string
        CRC      string
        Services []Service
@@ -13,6 +14,11 @@ type Package struct {
        Unions   []Union
        Messages []Message
        RefMap   map[string]string
+       Imports  map[string]Import
+}
+
+type Import struct {
+       Package string
 }
 
 // Service represents VPP binary API service
@@ -53,16 +59,18 @@ type Type struct {
 
 // Field represents VPP binary API object field
 type Field struct {
-       Name     string
-       Type     string
-       Length   int
-       SizeFrom string
-       Meta     FieldMeta
+       Name         string
+       Type         string
+       Length       int
+       SpecifiedLen bool
+       SizeFrom     string
+       Meta         FieldMeta
 }
 
 // FieldMeta represents VPP binary API meta info for field
 type FieldMeta struct {
-       Limit int
+       Limit   int
+       Default string
 }
 
 // Union represents VPP binary API union
@@ -91,32 +99,33 @@ const (
 
 // printPackage prints all loaded objects for package
 func printPackage(pkg *Package) {
+       logf("package: %s %s (%s)", pkg.Name, pkg.Version, pkg.CRC)
        if len(pkg.Enums) > 0 {
-               logf("loaded %d enums:", len(pkg.Enums))
-               for k, enum := range pkg.Enums {
-                       logf(" - enum #%d\t%+v", k, enum)
+               logf(" %d enums:", len(pkg.Enums))
+               for _, enum := range pkg.Enums {
+                       logf("  - %s: %+v", enum.Name, enum)
                }
        }
        if len(pkg.Unions) > 0 {
-               logf("loaded %d unions:", len(pkg.Unions))
-               for k, union := range pkg.Unions {
-                       logf(" - union #%d\t%+v", k, union)
+               logf(" %d unions:", len(pkg.Unions))
+               for _, union := range pkg.Unions {
+                       logf("  - %s: %+v", union.Name, union)
                }
        }
        if len(pkg.Types) > 0 {
-               logf("loaded %d types:", len(pkg.Types))
+               logf(" %d types:", len(pkg.Types))
                for _, typ := range pkg.Types {
-                       logf(" - type: %q (%d fields)", typ.Name, len(typ.Fields))
+                       logf("  - %s (%d fields): %+v", typ.Name, len(typ.Fields), typ)
                }
        }
        if len(pkg.Messages) > 0 {
-               logf("loaded %d messages:", len(pkg.Messages))
+               logf(" %d messages:", len(pkg.Messages))
                for _, msg := range pkg.Messages {
-                       logf(" - message: %q (%d fields)", msg.Name, len(msg.Fields))
+                       logf("  - %s (%d fields) %s", msg.Name, len(msg.Fields), msg.CRC)
                }
        }
        if len(pkg.Services) > 0 {
-               logf("loaded %d services:", len(pkg.Services))
+               logf(" %d services:", len(pkg.Services))
                for _, svc := range pkg.Services {
                        var info string
                        if svc.Stream {
@@ -124,7 +133,7 @@ func printPackage(pkg *Package) {
                        } else if len(svc.Events) > 0 {
                                info = fmt.Sprintf("(EVENTS: %v)", svc.Events)
                        }
-                       logf(" - service: %s - %q -> %q %s", svc.Name, svc.RequestType, svc.ReplyType, info)
+                       logf("  - %s: %q -> %q %s", svc.Name, svc.RequestType, svc.ReplyType, info)
                }
        }
 }