diff --git a/encode/proto/bench_test.go b/encode/proto/bench_test.go index 17e0965..adbf74f 100644 --- a/encode/proto/bench_test.go +++ b/encode/proto/bench_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/gogo/protobuf/proto" - reflectparser "github.com/katydid/validator-go/parser/reflect" + reflectparser "github.com/katydid/parser-go-reflect/reflect" . "github.com/katydid/validator-gogo-proto/encode/proto/prototests" ) diff --git a/encode/proto/proto.go b/encode/proto/proto.go index f27aa47..9c9bc80 100644 --- a/encode/proto/proto.go +++ b/encode/proto/proto.go @@ -26,7 +26,7 @@ import ( "math" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" protoparser "github.com/katydid/validator-gogo-proto/parser/proto" ) diff --git a/encode/proto/proto_test.go b/encode/proto/proto_test.go index 67bd82a..902d2de 100644 --- a/encode/proto/proto_test.go +++ b/encode/proto/proto_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/gogo/protobuf/proto" - reflectparser "github.com/katydid/validator-go/parser/reflect" + reflectparser "github.com/katydid/parser-go-reflect/reflect" "github.com/katydid/validator-gogo-proto/encode/proto/prototests" ) diff --git a/go.mod b/go.mod index 12a3b95..9615ad1 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,9 @@ require ( require ( github.com/gogo/protobuf v1.3.2 - github.com/katydid/validator-go v0.4.0 + github.com/katydid/parser-go v0.6.0 + github.com/katydid/parser-go-reflect v0.1.0 + github.com/katydid/validator-go v0.5.0 ) require ( diff --git a/go.sum b/go.sum index 319bc8c..903e878 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,16 @@ github.com/goccmack/gocc v0.0.0-20230228185258-2292f9e40198 h1:FSii2UQeSLngl3jFo github.com/goccmack/gocc v0.0.0-20230228185258-2292f9e40198/go.mod h1:DTh/Y2+NbnOVVoypCCQrovMPDKUGp4yZpSbWg5D0XIM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/katydid/validator-go v0.4.0 h1:7rEZy9bYzmT0FG5RaCV2Eextn+C3+Bnh6mAvof82yFg= -github.com/katydid/validator-go v0.4.0/go.mod h1:4kIOmsQyfSJMtELzYrfMPlyIar1HpHgYBUefJNIHl+Y= +github.com/katydid/parser-go v0.6.0 h1:8VFYXEp9pZsq4CCxYLDavPPqOSX+JXsmhjfU4XMB8iw= +github.com/katydid/parser-go v0.6.0/go.mod h1:1BwRfDlyRgDlAaURZ4FXi7IzHqWKTsrCdsstLsFeQho= +github.com/katydid/parser-go-json v0.1.0 h1:r3+YkDtf9A4JYO+MrdQsN2azxITrgO+2Sc5SSNhp+YI= +github.com/katydid/parser-go-json v0.1.0/go.mod h1:iLjxtkGLdPROUPBHZAhOTIdQerUPl/FEplS10rlq9Nc= +github.com/katydid/parser-go-reflect v0.1.0 h1:GsmmOjPC9eLVVHx/Q8nzOPAiOhSan6UP8z9oDOEbYiY= +github.com/katydid/parser-go-reflect v0.1.0/go.mod h1:v+FO4WoxNNIhpjzF7nam4YuUzWCe8LFclO4B0f3OaPI= +github.com/katydid/parser-go-xml v0.1.0 h1:8AL0X9hQbNLbQeqRbOdKBOwx4WTSWjy7kxEMmWqHMXc= +github.com/katydid/parser-go-xml v0.1.0/go.mod h1:7rEHS3YuEv/8/ep+uQnLgcvT1znZs8JEc3ZaBbpygjA= +github.com/katydid/validator-go v0.5.0 h1:wOo8hgzeu6/0iv+RVZBGx52cfdvjI2CynXAN6lew5yA= +github.com/katydid/validator-go v0.5.0/go.mod h1:ZVsNg5NEwcOJT2ukTrCu/jKKuNiTRS/4sw4cMNr9vh8= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= diff --git a/parser/debug/log.go b/parser/debug/log.go index 98b1178..c24aa35 100644 --- a/parser/debug/log.go +++ b/parser/debug/log.go @@ -22,7 +22,7 @@ import ( "strconv" "time" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" ) // Logger is an interface for a type that is made to log debug info. diff --git a/parser/debug/value.go b/parser/debug/value.go index bd20fda..c9683e0 100644 --- a/parser/debug/value.go +++ b/parser/debug/value.go @@ -15,7 +15,7 @@ package debug import ( - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" ) type errValue struct{} diff --git a/parser/debug/walk.go b/parser/debug/walk.go index 72cbdaf..01e36b6 100644 --- a/parser/debug/walk.go +++ b/parser/debug/walk.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" ) func getValue(p parser.Interface) interface{} { diff --git a/parser/proto/proto.go b/parser/proto/proto.go index f46f544..f7c18eb 100644 --- a/parser/proto/proto.go +++ b/parser/proto/proto.go @@ -28,7 +28,7 @@ import ( "unsafe" descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" ) type errVarint struct { diff --git a/parser/proto/proto_test.go b/parser/proto/proto_test.go index d9e65f8..fda9350 100644 --- a/parser/proto/proto_test.go +++ b/parser/proto/proto_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/gogo/protobuf/proto" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" "github.com/katydid/validator-gogo-proto/parser/debug" "github.com/katydid/validator-gogo-proto/parser/proto/prototests" ) diff --git a/testsuite/auto/suite_test.go b/testsuite/auto/suite_test.go index 0831c2e..4fc1749 100644 --- a/testsuite/auto/suite_test.go +++ b/testsuite/auto/suite_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" "github.com/katydid/validator-go/validator/ast" "github.com/katydid/validator-go/validator/auto" "github.com/katydid/validator-go/validator/interp" diff --git a/testsuite/files.go b/testsuite/files.go index 71c2c99..b7993a6 100644 --- a/testsuite/files.go +++ b/testsuite/files.go @@ -23,8 +23,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" - "github.com/katydid/validator-go/gen" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" "github.com/katydid/validator-go/validator" "github.com/katydid/validator-go/validator/ast" protoparser "github.com/katydid/validator-gogo-proto/parser/proto" @@ -180,7 +179,7 @@ func readTestFolder(path string) (*Test, error) { if p == nil { return nil, fmt.Errorf("couldn't find valid.* or invalid.* filename inside <%s>", path) } - name = name + gen.CapFirst(codecName) + name = name + capFirst(codecName) return &Test{ Name: name, Grammar: g, diff --git a/testsuite/intern/suite_test.go b/testsuite/intern/suite_test.go index a941571..620bdb3 100644 --- a/testsuite/intern/suite_test.go +++ b/testsuite/intern/suite_test.go @@ -17,7 +17,7 @@ package intern_test import ( "testing" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" "github.com/katydid/validator-go/validator/ast" "github.com/katydid/validator-go/validator/intern" "github.com/katydid/validator-go/validator/interp" diff --git a/testsuite/interp/suite_test.go b/testsuite/interp/suite_test.go index 22972b1..fff1dba 100644 --- a/testsuite/interp/suite_test.go +++ b/testsuite/interp/suite_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" "github.com/katydid/validator-go/validator/ast" "github.com/katydid/validator-go/validator/interp" "github.com/katydid/validator-gogo-proto/testsuite" diff --git a/testsuite/mem/suite_test.go b/testsuite/mem/suite_test.go index 6a73c9b..f1a8c3d 100644 --- a/testsuite/mem/suite_test.go +++ b/testsuite/mem/suite_test.go @@ -17,7 +17,7 @@ package mem_test import ( "testing" - "github.com/katydid/validator-go/parser" + "github.com/katydid/parser-go/parser" "github.com/katydid/validator-go/validator/ast" "github.com/katydid/validator-go/validator/interp" "github.com/katydid/validator-go/validator/mem"