rename NullType to AnyType

tenfyzhong · Jan 7, 2024 · f4f98ec · f4f98ec
1 parent 3b686f9
commit f4f98ec
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/go_parser.go b/go_parser.go
@@ -299,7 +299,7 @@ func (p GoParser) nameType(name string) Type {
  case "uintptr":
  // TODO
  case "any":
- return NullVal
+ return AnyVal
  }
  return &StructLikeType{
  Name: name,

diff --git a/go_parser_test.go b/go_parser_test.go
@@ -254,7 +254,7 @@ type SampleMessage struct {
  {
  Field: "details",
  Type: &ArrayType{
- ChildType: NullVal,
+ ChildType: AnyVal,
  },
  Index: 2,
  },

diff --git a/json_parser.go b/json_parser.go
@@ -87,7 +87,7 @@ func (p *JsonParser) parseStructs(root *Node) *Member {
  }
 
  switch root.Type {
- case NullVal,
+ case AnyVal,
  BoolVal,
  Float64Val,
  StringVal,
@@ -110,7 +110,7 @@ func (p *JsonParser) parseStructs(root *Node) *Member {
  child := p.parseStructs(root.Children[0])
  if child == nil {
  member.Type = &ArrayType{
- ChildType: NullVal,
+ ChildType: AnyVal,
  }
  } else {
  member.Type = &ArrayType{
@@ -170,7 +170,7 @@ func (p *JsonParser) parseNode(tag string, v interface{}) *Node {
  Field: tag,
  }
  if v == nil {
- node.Type = NullVal
+ node.Type = AnyVal
  }
 
  switch c := v.(type) {
@@ -200,7 +200,7 @@ func (p *JsonParser) parseNode(tag string, v interface{}) *Node {
  node.Children = append(node.Children, child)
  } else {
  child := &Node{
- Type: NullVal,
+ Type: AnyVal,
  }
  node.Children = append(node.Children, child)
  }

diff --git a/json_parser_test.go b/json_parser_test.go
@@ -107,7 +107,7 @@ func TestJsonParser_Parse(t *testing.T) {
  },
  {
  Field: "b",
- Type: NullVal,
+ Type: AnyVal,
  Index: 2,
  GoTag: []string{`json:"b,omitempty"`},
  },
@@ -558,7 +558,7 @@ func TestJsonParser_Parse(t *testing.T) {
  {
  Field: "hh",
  Type: &ArrayType{
- ChildType: NullVal,
+ ChildType: AnyVal,
  },
  Index: 8,
  GoTag: []string{`json:"hh,omitempty"`},
@@ -567,7 +567,7 @@ func TestJsonParser_Parse(t *testing.T) {
  Field: "jj",
  Type: &ArrayType{
  ChildType: &ArrayType{
- ChildType: NullVal,
+ ChildType: AnyVal,
  },
  },
  Index: 9,

diff --git a/node_test.go b/node_test.go
@@ -18,7 +18,7 @@ func TestNode_Fingerprint(t *testing.T) {
  init: func(t *testing.T) *Node {
  return &Node{
  Field: "root",
- Type: NullVal,
+ Type: AnyVal,
  }
  },
  want1: "null",

diff --git a/proto_parser.go b/proto_parser.go
@@ -203,7 +203,7 @@ func (v *ProtoVisitor) type2Type(str string) Type {
  case "bytes":
  return BinaryVal
  case "google.protobuf.Any":
- return NullVal
+ return AnyVal
  }
  return &StructLikeType{
  Name: str,

diff --git a/proto_parser_test.go b/proto_parser_test.go
@@ -209,7 +209,7 @@ message ErrorStatus {
  {
  Field: "details",
  Type: &ArrayType{
- ChildType: NullVal,
+ ChildType: AnyVal,
  },
  Index: 2,
  },

diff --git a/type.go b/type.go
@@ -15,7 +15,7 @@ const (
 )
 
 var (
- NullVal Type = &NullType{}
+ AnyVal  Type = &AnyType{}
  BoolVal Type = &BoolType{}
  Float32Val Type = &Float32Type{}
  Float64Val Type = &Float64Type{}
@@ -44,14 +44,14 @@ type Type interface {
  IsBasicType() bool
 }
 
-type NullType struct{}
+type AnyType struct{}
 
-func (v NullType) Json() string { return "null" }
-func (v NullType) Go() string { return "any" }
-func (v NullType) Proto() string { return "google.protobuf.Any" }
-func (v NullType) Thrift() string { return "binary" }
-func (v NullType) Value() string { return "nil" }
-func (v NullType) IsBasicType() bool { return false }
+func (v AnyType) Json() string { return "null" }
+func (v AnyType) Go() string { return "any" }
+func (v AnyType) Proto() string { return "google.protobuf.Any" }
+func (v AnyType) Thrift() string { return "binary" }
+func (v AnyType) Value() string { return "nil" }
+func (v AnyType) IsBasicType() bool { return false }
 
 type BoolType struct {
  V bool