Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

delete everything except encoder #1

Merged
merged 1 commit into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,65 +9,58 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
path: gopath/github.com/katydid/validator-gogo-proto
path: gopath/src/github.com/katydid/experiment-encode-gogo-proto
- name: Checkout gogoprotobuf
uses: actions/checkout@v4
with:
repository: gogo/protobuf
path: gopath/github.com/gogo/protobuf
- name: Checkout testsuite
uses: actions/checkout@v4
with:
repository: katydid/testsuite
path: gopath/github.com/katydid/testsuite
path: gopath/src/github.com/gogo/protobuf
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.23
- name: Fetch dependencies
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
go mod download -x
- name: Install tools
run: |
cd gopath/github.com/katydid/validator-gogo-proto
go install -x github.com/goccmack/gocc
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
go install -x github.com/awalterschulze/checklicense
go install -x github.com/awalterschulze/goderive
go install -x github.com/gogo/protobuf/protoc-gen-gogo
- name: Setup protoc
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
./install_protoc.sh
- name: Protoc version
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
PATH=$HOME/bin:$PATH protoc --version
- name: env
run: env && go env && pwd
- name: tree
run: tree
- name: Generate
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
PATH=$HOME/bin:$PATH make regenerate
- name: Build
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
make build
- name: Test
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
make test
- name: Vet
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
make vet
- name: Checklicencse
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
make checklicense
- name: Diff
run: |
cd gopath/github.com/katydid/validator-gogo-proto
cd gopath/src/github.com/katydid/experiment-encode-gogo-proto
make diff
17 changes: 2 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,10 @@ all: nuke dep regenerate build test vet

dep:
go install github.com/gogo/protobuf/protoc-gen-gogo
go install -v github.com/goccmack/gocc
go install -v github.com/awalterschulze/goderive

checklicense:
go get github.com/awalterschulze/checklicense
checklicense . \
person.proto \
srctree.proto \
puddingmilkshake.proto \
taxonomy.proto \
treeregister.proto \
typewriterprison.proto \
proto/tokens/test.proto \
parser/debug/debug.proto \
doc.go \
tools/tools.go \
.svg \
Expand All @@ -51,18 +41,15 @@ bench:
go test -test.v -test.run=XXX -test.bench=. ./...

vet:
go vet ./encode/...
go vet ./proto/...

regenerate:
goderive ./...
(cd parser && make regenerate)
(cd encode && make regenerate)
(cd proto && make regenerate)

clean:
go clean ./...

nuke: clean
(cd parser && make nuke)
go clean -i ./...

gofmt:
Expand Down
13 changes: 2 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
## Katydid Validator for Protocol Buffers in Go using GoGoProtobuf
## encode-gogo-proto

[![GoDoc](https://godoc.org/github.com/katydid/validator-gogo-proto?status.svg)](https://godoc.org/github.com/katydid/validator-gogo-proto) [![Build Status](https://github.com/katydid/validator-gogo-proto/actions/workflows/build.yml/badge.svg)](https://github.com/katydid/validator-gogo-proto/actions)

![Katydid Logo](https://cdn.rawgit.com/katydid/katydid.github.io/main/logo.png)

The [Katydid](http://katydid.github.io) validator for Protocol Buffers in Go using GoGoProtobuf.

The validator is a regular expression type language for protocol buffers that matches up to 1000000s of records per second.
This package includes:
* a parser that parses protocol buffers without deserializing the bytes.
* An encoder for protocol buffers.
Experimental encoder in Go for Protocol Buffers using gogoprotobuf.
16 changes: 0 additions & 16 deletions encode/Makefile

This file was deleted.

16 changes: 0 additions & 16 deletions encode/proto/prototests/Makefile

This file was deleted.

17 changes: 3 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
module github.com/katydid/validator-gogo-proto
module github.com/katydid/experiment-encode-gogo-proto

go 1.23

require (
github.com/awalterschulze/checklicense v1.0.0
github.com/awalterschulze/goderive v0.5.0
github.com/goccmack/gocc v0.0.0-20230228185258-2292f9e40198
)
require github.com/awalterschulze/checklicense v1.0.0

require (
github.com/gogo/protobuf v1.3.2
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 (
github.com/kisielk/gotool v1.0.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/tools v0.6.0 // indirect
github.com/katydid/parser-gogo-proto v0.2.0
)
19 changes: 2 additions & 17 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
github.com/awalterschulze/checklicense v1.0.0 h1:SiRilt26Q+2M238VbXw+e5826mxPypvsj/xgglHDHW8=
github.com/awalterschulze/checklicense v1.0.0/go.mod h1:oUHvoD4crryzAwDwtdQqCnaZRznAvZE64edH9ukb1K4=
github.com/awalterschulze/goderive v0.5.0 h1:fzWIV1WVS20EQT3YMXJhjiPZIZom1dlgiabZ/PhT9zo=
github.com/awalterschulze/goderive v0.5.0/go.mod h1:rXccmDQDJN/4aGqWxWhq+UmBJeQEkFV/2/rkluP+ipA=
github.com/goccmack/gocc v0.0.0-20230228185258-2292f9e40198 h1:FSii2UQeSLngl3jFoR4tUKZLprO7qUlh/TKKticc0BM=
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/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/katydid/parser-gogo-proto v0.2.0 h1:zUpdli98aYSQY1mvzbysNkk/41jPB25W4NiRXocI/Kg=
github.com/katydid/parser-gogo-proto v0.2.0/go.mod h1:AH9y+kby4gN4o8w3MHDn6EX4SjrviWycnFjvEr/o1Ho=
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=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand All @@ -26,8 +17,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
Expand All @@ -38,16 +27,12 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
20 changes: 0 additions & 20 deletions parser/Makefile

This file was deleted.

Loading
Loading