From 72df51cfe9618bce89249a2ebfc942596a330347 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Tue, 27 Dec 2022 17:34:30 +0300 Subject: [PATCH] [#372] go.mod: Update ANTLR Current `go:generate` command was, probably, executed only on my laptop. Replace it with explicit version, because package in the generated code depends on in. Signed-off-by: Evgenii Stratonikov --- go.mod | 13 +++++++------ go.sum | Bin 73067 -> 75351 bytes netmap/parser/generate.go | 3 ++- netmap/parser/query_base_listener.go | 4 ++-- netmap/parser/query_base_visitor.go | 4 ++-- netmap/parser/query_lexer.go | 4 ++-- netmap/parser/query_listener.go | 4 ++-- netmap/parser/query_parser.go | 8 ++++---- netmap/parser/query_visitor.go | 4 ++-- netmap/policy.go | 2 +- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 99d5558..fe55114 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/nspcc-dev/neofs-sdk-go go 1.17 require ( - github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 + github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 github.com/google/uuid v1.3.0 github.com/hashicorp/golang-lru v0.6.0 github.com/mr-tron/base58 v1.2.0 @@ -29,11 +29,12 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect - golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/crypto v0.4.0 // indirect + golang.org/x/exp v0.0.0-20221227203929-1b447090c38c // indirect + golang.org/x/net v0.3.0 // indirect + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect google.golang.org/grpc v1.48.0 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/go.sum b/go.sum index 6b3dcb0290f5ab0273b24f596a0c767c86aa1526..b82818069bdffb0636cd9f48d767e65662d6f59e 100644 GIT binary patch delta 2045 zcmb7_O|0Wq8HNQNX=ufCrgS>(NQ`<}01_tGKF7ajga9XToY>Cqjh)!A@$pZR>)1}5 z*m1I&?ohibma19IqKhInERZ59RFx5xSRm0#WkF{&tq>9`S|s)e6&z-ObR;C$*s|sK z`M&Qx?>YYDtqb?wz3|gNJxiWU!OdM`FoT>qa`{dxPO4*1&;u_U%qh2(1*8~_nGC7G)!`M9(Se$JX%0Dw%b(+Oa zIy%c4e@9nEp__;R_aj0D(tJi&2b*^Bt>?bFzx3RvY4Pa~p1R4L0{V!+LqR2%`9Gj`D$_Nm8<&~U-{Cd;`VK+=)HF3Is_Dg z0I)15ZJ-2%eVgTY7NAF8JcYn1byRTRITOuZYYm3*^meTWdU4O{W5O{K#p(8NGZ+Rq zsG=3#6yj^wVQKeaUft+Vc5PGO^W{SAOfV7DSMxb+OFfVN+i9Q>X$Hk6pE=XvRcl z4aJRzHdw@Fzq;-L(JY>MtF(Z%Bh3}%A2C3f-(oN3Ed+J+{T zX0A0LeZA8ve*5Da`+Gn7>*a!dQ!2juvn$%8^{4rY4Oqd2f?I|iAJNByX&2WFuF)|emZWec8>)@Z=FOCCB@3F#!}cIvViL_8Xr2fE zELzHrT5ebS!aSL3U96Lw9%`8JLmUQd*V&rka*bt|MBA39o=Z~k>d#-?zx?JeE*3wz zD;K|i`;z?cEy1!CLEwChXdZZ&IpjAr96`5qk6R}U`9b$Wn){l5I2hfkliaLKdOnHDN(FEru~!1EEUH>$mXr1%)9 zp-E?(+)s$8Q5TC}K6rk=zJKHM#e)Zp;{68~A3L1F#Egl>bTGheyS60r00BUE8P}Q* zW_j06#q;huIbV(ImT*8p_F)9NT9_>;wMR4z8KK&mTsCGJ*_Z~*Zo%~Xk;P-E6YOH9 zw+}K@%8nxNe-zzc`LKSqc>kj(%jkk*hCb!29g)YfX~m(y2_3;4dO5x32h(-4UQHxH z-o*$TELXhr=j%61H9YEI+L4u}9whB0*NR$u~WSB y(F+KErvEL|UA9!OYmoj(@z#of$2}daBqN$>?bfy~S|hLN8boI(?xnwc?erguWtQjw delta 446 zcmcb9hUN7xmJKh3C#Q-em@AYS>Y3;n8YpBKT2=a(YkO50WQ91JRaRzudh3U0n46^M zg?Qx^xfhu_Ru=jBMwB`lq?e@@Po5*J!v@g_G{$-JT2ZmG$rE}+HtY8Y@#=vL(+~B} zEe)>}|M7v}PA z{xD0CWwZB!eH@boRts$QTJ?ipA7om-qe(|L}7CO;n>LyCwMlWJklTzHXy~lDxfkY zJ*>FUJvk&OtUS}l%P=b}sWdIJJh#fl*e5M4z{k7TJ6+o#d-B4IvXc$(#BRQS*Nt)V z`v+{BPv4hig7_n+pu8-=$U8AP+%PJOY@4nM^80M;L;IsgCw diff --git a/netmap/parser/generate.go b/netmap/parser/generate.go index 850f362..02641a3 100644 --- a/netmap/parser/generate.go +++ b/netmap/parser/generate.go @@ -1,3 +1,4 @@ package parser -//go:generate antlr4 -Dlanguage=Go -visitor QueryLexer.g4 Query.g4 +// ANTLR can be downloaded from https://www.antlr.org/download/antlr-4.11.1-complete.jar +//go:generate java -Xmx500M -cp "./antlr-4.11.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Go -visitor QueryLexer.g4 Query.g4 diff --git a/netmap/parser/query_base_listener.go b/netmap/parser/query_base_listener.go index ae77aae..41dfb31 100644 --- a/netmap/parser/query_base_listener.go +++ b/netmap/parser/query_base_listener.go @@ -1,8 +1,8 @@ -// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT. +// Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package parser // Query -import "github.com/antlr/antlr4/runtime/Go/antlr" +import "github.com/antlr/antlr4/runtime/Go/antlr/v4" // BaseQueryListener is a complete listener for a parse tree produced by Query. type BaseQueryListener struct{} diff --git a/netmap/parser/query_base_visitor.go b/netmap/parser/query_base_visitor.go index a7e3599..23ff011 100644 --- a/netmap/parser/query_base_visitor.go +++ b/netmap/parser/query_base_visitor.go @@ -1,8 +1,8 @@ -// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT. +// Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package parser // Query -import "github.com/antlr/antlr4/runtime/Go/antlr" +import "github.com/antlr/antlr4/runtime/Go/antlr/v4" type BaseQueryVisitor struct { *antlr.BaseParseTreeVisitor diff --git a/netmap/parser/query_lexer.go b/netmap/parser/query_lexer.go index f4b08b8..7e119e0 100644 --- a/netmap/parser/query_lexer.go +++ b/netmap/parser/query_lexer.go @@ -1,4 +1,4 @@ -// Code generated from QueryLexer.g4 by ANTLR 4.10.1. DO NOT EDIT. +// Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package parser @@ -7,7 +7,7 @@ import ( "sync" "unicode" - "github.com/antlr/antlr4/runtime/Go/antlr" + "github.com/antlr/antlr4/runtime/Go/antlr/v4" ) // Suppress unused import error diff --git a/netmap/parser/query_listener.go b/netmap/parser/query_listener.go index 87888d6..f90994c 100644 --- a/netmap/parser/query_listener.go +++ b/netmap/parser/query_listener.go @@ -1,8 +1,8 @@ -// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT. +// Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package parser // Query -import "github.com/antlr/antlr4/runtime/Go/antlr" +import "github.com/antlr/antlr4/runtime/Go/antlr/v4" // QueryListener is a complete listener for a parse tree produced by Query. type QueryListener interface { diff --git a/netmap/parser/query_parser.go b/netmap/parser/query_parser.go index 555ba58..578cd0e 100644 --- a/netmap/parser/query_parser.go +++ b/netmap/parser/query_parser.go @@ -1,4 +1,4 @@ -// Code generated from Query.g4 by ANTLR 4.10.1. DO NOT EDIT. +// Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package parser // Query @@ -7,7 +7,7 @@ import ( "strconv" "sync" - "github.com/antlr/antlr4/runtime/Go/antlr" + "github.com/antlr/antlr4/runtime/Go/antlr/v4" ) // Suppress unused import errors @@ -133,7 +133,7 @@ func NewQuery(input antlr.TokenStream) *Query { this.RuleNames = staticData.ruleNames this.LiteralNames = staticData.literalNames this.SymbolicNames = staticData.symbolicNames - this.GrammarFileName = "Query.g4" + this.GrammarFileName = "java-escape" return this } @@ -2461,7 +2461,7 @@ func (p *Query) Keyword() (localctx IKeywordContext) { p.SetState(119) _la = p.GetTokenStream().LA(1) - if !(((_la)&-(0x1f+1)) == 0 && ((1<