Support imported type aliases

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

diff --git a/cmd/binapi-generator/parse.go b/cmd/binapi-generator/parse.go
index 8852ae2..6598b7b 100644 (file)
--- a/cmd/binapi-generator/parse.go
+++ b/cmd/binapi-generator/parse.go
@@ -63,7 +63,8 @@ const (
 
 // field meta info
 const (
-       fieldMetaLimit = "limit"
+       fieldMetaLimit   = "limit"
+       fieldMetaDefault = "default"
 )
 
 // module options
@@ -72,10 +73,11 @@ const (
 )
 
 // parsePackage parses provided JSON data into objects prepared for code generation
-func parsePackage(ctx *context, jsonRoot *jsongo.JSONNode) (*Package, error) {
+func parsePackage(ctx *context, jsonRoot *jsongo.Node) (*Package, error) {
        pkg := Package{
-               Name:   ctx.packageName,
-               RefMap: make(map[string]string),
+               Name:    ctx.packageName,
+               RefMap:  make(map[string]string),
+               Imports: map[string]Import{},
        }
 
        // parse CRC for API version
@@ -240,7 +242,7 @@ func parsePackage(ctx *context, jsonRoot *jsongo.JSONNode) (*Package, error) {
 }
 
 // parseEnum parses VPP binary API enum object from JSON node
-func parseEnum(ctx *context, enumNode *jsongo.JSONNode) (*Enum, error) {
+func parseEnum(ctx *context, enumNode *jsongo.Node) (*Enum, error) {
        if enumNode.Len() == 0 || enumNode.At(0).GetType() != jsongo.TypeValue {
                return nil, errors.New("invalid JSON for enum specified")
        }
@@ -285,7 +287,7 @@ func parseEnum(ctx *context, enumNode *jsongo.JSONNode) (*Enum, error) {
 }
 
 // parseUnion parses VPP binary API union object from JSON node
-func parseUnion(ctx *context, unionNode *jsongo.JSONNode) (*Union, error) {
+func parseUnion(ctx *context, unionNode *jsongo.Node) (*Union, error) {
        if unionNode.Len() == 0 || unionNode.At(0).GetType() != jsongo.TypeValue {
                return nil, errors.New("invalid JSON for union specified")
        }
@@ -322,7 +324,7 @@ func parseUnion(ctx *context, unionNode *jsongo.JSONNode) (*Union, error) {
 }
 
 // parseType parses VPP binary API type object from JSON node
-func parseType(ctx *context, typeNode *jsongo.JSONNode) (*Type, error) {
+func parseType(ctx *context, typeNode *jsongo.Node) (*Type, error) {
        if typeNode.Len() == 0 || typeNode.At(0).GetType() != jsongo.TypeValue {
                return nil, errors.New("invalid JSON for type specified")
        }
@@ -359,7 +361,7 @@ func parseType(ctx *context, typeNode *jsongo.JSONNode) (*Type, error) {
 }
 
 // parseAlias parses VPP binary API alias object from JSON node
-func parseAlias(ctx *context, aliasName string, aliasNode *jsongo.JSONNode) (*Alias, error) {
+func parseAlias(ctx *context, aliasName string, aliasNode *jsongo.Node) (*Alias, error) {
        if aliasNode.Len() == 0 || aliasNode.At(aliasTypeField).GetType() != jsongo.TypeValue {
                return nil, errors.New("invalid JSON for alias specified")
        }
@@ -390,7 +392,7 @@ func parseAlias(ctx *context, aliasName string, aliasNode *jsongo.JSONNode) (*Al
 }
 
 // parseMessage parses VPP binary API message object from JSON node
-func parseMessage(ctx *context, msgNode *jsongo.JSONNode) (*Message, error) {
+func parseMessage(ctx *context, msgNode *jsongo.Node) (*Message, error) {
        if msgNode.Len() == 0 || msgNode.At(0).GetType() != jsongo.TypeValue {
                return nil, errors.New("invalid JSON for message specified")
        }
@@ -428,7 +430,7 @@ func parseMessage(ctx *context, msgNode *jsongo.JSONNode) (*Message, error) {
 }
 
 // parseField parses VPP binary API object field from JSON node
-func parseField(ctx *context, field *jsongo.JSONNode) (*Field, error) {
+func parseField(ctx *context, field *jsongo.Node) (*Field, error) {
        if field.Len() < 2 || field.At(0).GetType() != jsongo.TypeValue || field.At(1).GetType() != jsongo.TypeValue {
                return nil, errors.New("invalid JSON for field specified")
        }
@@ -448,13 +450,16 @@ func parseField(ctx *context, field *jsongo.JSONNode) (*Field, error) {
        }
 
        if field.Len() >= 3 {
-               if field.At(2).GetType() == jsongo.TypeValue {
+               switch field.At(2).GetType() {
+               case jsongo.TypeValue:
                        fieldLength, ok := field.At(2).Get().(float64)
                        if !ok {
                                return nil, fmt.Errorf("field length is %T, not float64", field.At(2).Get())
                        }
                        f.Length = int(fieldLength)
-               } else if field.At(2).GetType() == jsongo.TypeMap {
+                       f.SpecifiedLen = true
+
+               case jsongo.TypeMap:
                        fieldMeta := field.At(2)
 
                        for _, key := range fieldMeta.GetKeys() {
@@ -463,11 +468,13 @@ func parseField(ctx *context, field *jsongo.JSONNode) (*Field, error) {
                                switch metaName := key.(string); metaName {
                                case fieldMetaLimit:
                                        f.Meta.Limit = int(metaNode.Get().(float64))
+                               case fieldMetaDefault:
+                                       f.Meta.Default = fmt.Sprint(metaNode.Get())
                                default:
                                        logrus.Warnf("unknown meta info (%s) for field (%s)", metaName, fieldName)
                                }
                        }
-               } else {
+               default:
                        return nil, errors.New("invalid JSON for field specified")
                }
        }
@@ -483,7 +490,7 @@ func parseField(ctx *context, field *jsongo.JSONNode) (*Field, error) {
 }
 
 // parseService parses VPP binary API service object from JSON node
-func parseService(ctx *context, svcName string, svcNode *jsongo.JSONNode) (*Service, error) {
+func parseService(ctx *context, svcName string, svcNode *jsongo.Node) (*Service, error) {
        if svcNode.Len() == 0 || svcNode.At(replyField).GetType() != jsongo.TypeValue {
                return nil, errors.New("invalid JSON for service specified")
        }