From ea5dee6da81e8932257efef27a6e0749424c2a33 Mon Sep 17 00:00:00 2001 From: Jeremy Edwards <1312331+jeremyje@users.noreply.github.com> Date: Wed, 7 Jun 2023 01:41:23 -0700 Subject: [PATCH] Update go modules and use new antlr import --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/compiler/listener.go | 2 +- pkg/compiler/visitor.go | 2 +- pkg/parser/case_changing_stream.go | 2 +- pkg/parser/fql/fql_lexer.go | 2 +- pkg/parser/fql/fql_parser.go | 2 +- pkg/parser/fql/fqlparser_base_listener.go | 2 +- pkg/parser/fql/fqlparser_base_visitor.go | 2 +- pkg/parser/fql/fqlparser_listener.go | 2 +- pkg/parser/fql/fqlparser_visitor.go | 2 +- pkg/parser/parser.go | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 824cc528..1479957b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/PuerkitoBio/goquery v1.8.1 github.com/antchfx/htmlquery v1.3.0 github.com/antchfx/xpath v1.2.4 - github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 + github.com/antlr4-go/antlr v0.0.0-20230518091524-98b52378c522 github.com/corpix/uarand v0.2.0 github.com/gobwas/glob v0.2.3 github.com/gorilla/css v1.0.0 @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/smartystreets/assertions v1.2.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/sys v0.6.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 13847c38..d84c57f8 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/antchfx/htmlquery v1.3.0/go.mod h1:zKPDVTMhfOmcwxheXUsx4rKJy8KEY/PU6e github.com/antchfx/xpath v1.2.3/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= github.com/antchfx/xpath v1.2.4 h1:dW1HB/JxKvGtJ9WyVGJ0sIoEcqftV3SqIstujI+B9XY= github.com/antchfx/xpath v1.2.4/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= -github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 h1:X8MJ0fnN5FPdcGF5Ij2/OW+HgiJrRg3AfHAx1PJtIzM= -github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= +github.com/antlr4-go/antlr v0.0.0-20230518091524-98b52378c522 h1:o+W7GDFUwWtVkN28CW/nhh/aCmHn6OJddUs3+8vMMjs= +github.com/antlr4-go/antlr v0.0.0-20230518091524-98b52378c522/go.mod h1:srLVvW4JLxy+tCG9Nn2l8al77mUIMCwAOLQocfLDU2w= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/corpix/uarand v0.2.0 h1:U98xXwud/AVuCpkpgfPF7J5TQgr7R5tqT8VZP5KWbzE= @@ -100,8 +100,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= diff --git a/pkg/compiler/listener.go b/pkg/compiler/listener.go index f473ab8f..d3c60520 100644 --- a/pkg/compiler/listener.go +++ b/pkg/compiler/listener.go @@ -1,7 +1,7 @@ package compiler import ( - "github.com/antlr/antlr4/runtime/Go/antlr/v4" + "github.com/antlr4-go/antlr" "github.com/pkg/errors" ) diff --git a/pkg/compiler/visitor.go b/pkg/compiler/visitor.go index d620af95..6d8f2396 100644 --- a/pkg/compiler/visitor.go +++ b/pkg/compiler/visitor.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/antlr/antlr4/runtime/Go/antlr/v4" + "github.com/antlr4-go/antlr" "github.com/pkg/errors" "github.com/MontFerret/ferret/pkg/parser/fql" diff --git a/pkg/parser/case_changing_stream.go b/pkg/parser/case_changing_stream.go index c4044dfe..edea6318 100644 --- a/pkg/parser/case_changing_stream.go +++ b/pkg/parser/case_changing_stream.go @@ -3,7 +3,7 @@ package parser import ( "unicode" - "github.com/antlr/antlr4/runtime/Go/antlr/v4" + "github.com/antlr4-go/antlr" ) // CaseChangingStream wraps an existing CharStream, but upper cases, or diff --git a/pkg/parser/fql/fql_lexer.go b/pkg/parser/fql/fql_lexer.go index cc3c8731..f7d54e15 100644 --- a/pkg/parser/fql/fql_lexer.go +++ b/pkg/parser/fql/fql_lexer.go @@ -7,7 +7,7 @@ import ( "sync" "unicode" - "github.com/antlr/antlr4/runtime/Go/antlr/v4" + "github.com/antlr4-go/antlr" ) // Suppress unused import error diff --git a/pkg/parser/fql/fql_parser.go b/pkg/parser/fql/fql_parser.go index 3daa028a..469635d2 100644 --- a/pkg/parser/fql/fql_parser.go +++ b/pkg/parser/fql/fql_parser.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "github.com/antlr/antlr4/runtime/Go/antlr/v4" + "github.com/antlr4-go/antlr" ) // Suppress unused import errors diff --git a/pkg/parser/fql/fqlparser_base_listener.go b/pkg/parser/fql/fqlparser_base_listener.go index f1da9bf3..be6174c5 100644 --- a/pkg/parser/fql/fqlparser_base_listener.go +++ b/pkg/parser/fql/fqlparser_base_listener.go @@ -1,7 +1,7 @@ // Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package fql // FqlParser -import "github.com/antlr/antlr4/runtime/Go/antlr/v4" +import "github.com/antlr4-go/antlr" // BaseFqlParserListener is a complete listener for a parse tree produced by FqlParser. type BaseFqlParserListener struct{} diff --git a/pkg/parser/fql/fqlparser_base_visitor.go b/pkg/parser/fql/fqlparser_base_visitor.go index edf319f9..e11d4ea0 100644 --- a/pkg/parser/fql/fqlparser_base_visitor.go +++ b/pkg/parser/fql/fqlparser_base_visitor.go @@ -1,7 +1,7 @@ // Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package fql // FqlParser -import "github.com/antlr/antlr4/runtime/Go/antlr/v4" +import "github.com/antlr4-go/antlr" type BaseFqlParserVisitor struct { *antlr.BaseParseTreeVisitor diff --git a/pkg/parser/fql/fqlparser_listener.go b/pkg/parser/fql/fqlparser_listener.go index dcf88577..c3e2face 100644 --- a/pkg/parser/fql/fqlparser_listener.go +++ b/pkg/parser/fql/fqlparser_listener.go @@ -1,7 +1,7 @@ // Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package fql // FqlParser -import "github.com/antlr/antlr4/runtime/Go/antlr/v4" +import "github.com/antlr4-go/antlr" // FqlParserListener is a complete listener for a parse tree produced by FqlParser. type FqlParserListener interface { diff --git a/pkg/parser/fql/fqlparser_visitor.go b/pkg/parser/fql/fqlparser_visitor.go index 1c1d18af..1ff389f6 100644 --- a/pkg/parser/fql/fqlparser_visitor.go +++ b/pkg/parser/fql/fqlparser_visitor.go @@ -1,7 +1,7 @@ // Code generated from java-escape by ANTLR 4.11.1. DO NOT EDIT. package fql // FqlParser -import "github.com/antlr/antlr4/runtime/Go/antlr/v4" +import "github.com/antlr4-go/antlr" // A complete Visitor for a parse tree produced by FqlParser. type FqlParserVisitor interface { diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go index c8f251ba..74fe847f 100644 --- a/pkg/parser/parser.go +++ b/pkg/parser/parser.go @@ -2,7 +2,7 @@ package parser import ( - "github.com/antlr/antlr4/runtime/Go/antlr/v4" + "github.com/antlr4-go/antlr" "github.com/MontFerret/ferret/pkg/parser/fql" )