Upgrade to latest version of ANTLR and other lint fixes (#658)

google · Mar 13, 2023 · af2e943 · af2e943
1 parent f55a73f
commit af2e943
Show file tree

Hide file tree

Showing 90 changed files with 4,753 additions and 1,729 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -98,12 +98,12 @@ go_repository(
     version = "v0.3.7",
 )
 
-# ANTLR v4.10.1
+# ANTLR v4.12.0
 go_repository(
     name = "com_github_antlr_antlr4_runtime_go_antlr",
-    importpath = "github.com/antlr/antlr4/runtime/Go/antlr",
-    sum = "h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=",
-    version = "v1.4.10",
+    importpath = "github.com/antlr/antlr4/runtime/Go/antlr/v4",
+    sum = "h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=",
+    version = "v4.0.0-20230305170008-8188dc5388df",
 )
 
 # CEL Spec deps v0.7.1

diff --git a/codelab/go.mod b/codelab/go.mod
@@ -4,15 +4,16 @@ go 1.18
 
 require (
 	github.com/golang/glog v1.0.0
-	github.com/google/cel-go v0.12.5
+	github.com/google/cel-go v0.13.0
 	google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
-	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/text v0.6.0 // indirect
 )
 
 replace github.com/google/cel-go => ../.
diff --git a/codelab/go.sum b/codelab/go.sum
@@ -1,5 +1,5 @@
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
@@ -14,8 +14,10 @@ github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+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/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9 h1:3wPBShTLWQnEkZ9VW/HZZ8zT/9LLtleBtq7l8SKtJIA=
 google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=

diff --git a/common/types/err.go b/common/types/err.go
@@ -22,6 +22,7 @@ import (
 	"github.com/google/cel-go/common/types/ref"
 )
 
+// Error interface which allows types types.Err values to be treated as error values.
 type Error interface {
 	error
 	ref.Val

diff --git a/ext/strings.go b/ext/strings.go
@@ -665,11 +665,11 @@ func parseFormatArg(lastStrIndex, argIndex int, formatStr string, args traits.Li
 	argAny := args.Get(types.Int(argIndex))
 	if formatter == nil {
 		return -1, "", errors.New("formatter required")
-	} else {
-		argStr, err = formatter(argAny, locale)
-		if err != nil {
-			return -1, "", fmt.Errorf("error during formatting: %s", err)
-		}
+	}
+
+	argStr, err = formatter(argAny, locale)
+	if err != nil {
+		return -1, "", fmt.Errorf("error during formatting: %s", err)
 	}
 	return i, argStr, nil
 }
@@ -959,9 +959,8 @@ func formatBinary(arg ref.Val, locale string) (string, error) {
 		argBool := arg.Value().(bool)
 		if argBool {
 			return "1", nil
-		} else {
-			return "0", nil
 		}
+		return "0", nil
 	default:
 		return "", fmt.Errorf("only integers and bools can be formatted as binary, was given %s", arg.Type().TypeName())
 	}
@@ -977,9 +976,8 @@ func formatHex(useUpper bool) clauseImpl {
 		case types.StringType, types.BytesType:
 			if arg.Type() == types.BytesType {
 				return fmt.Sprintf(fmtStr, arg.Value().([]byte)), nil
-			} else {
-				return fmt.Sprintf(fmtStr, arg.Value().(string)), nil
 			}
+			return fmt.Sprintf(fmtStr, arg.Value().(string)), nil
 		case types.IntType:
 			argInt, ok := arg.Value().(int64)
 			if !ok {

diff --git a/ext/strings_test.go b/ext/strings_test.go
@@ -362,14 +362,7 @@ func TestVersions(t *testing.T) {
 				for name, expr := range tc.supportedFunctions {
 					supported := lib.version >= tc.version
 					t.Run(fmt.Sprintf("%s-supported=%t", name, supported), func(t *testing.T) {
-						var asts []*cel.Ast
-						pAst, iss := env.Parse(expr)
-						if iss.Err() != nil {
-							t.Fatalf("env.Parse(%v) failed: %v", expr, iss.Err())
-						}
-						asts = append(asts, pAst)
-						_, iss = env.Check(pAst)
-
+						_, iss := env.Compile(expr)
 						if supported {
 							if iss.Err() != nil {
 								t.Errorf("unexpected error: %v", iss.Err())

diff --git a/go.mod b/go.mod
@@ -3,11 +3,11 @@ module github.com/google/cel-go
 go 1.18
 
 require (
-	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10
+	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df
 	github.com/stoewer/go-strcase v1.2.0
 	golang.org/x/text v0.6.0
 	google.golang.org/genproto v0.0.0-20221207170731-23e4bf6bdc37
 	google.golang.org/protobuf v1.28.1
 )
 
-require github.com/google/go-cmp v0.5.8 // indirect
+require golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
diff --git a/go.sum b/go.sum
@@ -1,18 +1,19 @@
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+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/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

diff --git a/parser/gen/cel_base_listener.go b/parser/gen/cel_base_listener.go
diff --git a/parser/gen/cel_base_visitor.go b/parser/gen/cel_base_visitor.go
diff --git a/parser/gen/cel_lexer.go b/parser/gen/cel_lexer.go
diff --git a/parser/gen/cel_listener.go b/parser/gen/cel_listener.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ import ( @@
     	"github.com/google/cel-go/common/types/ref"
     )
+    // Error interface which allows types types.Err values to be treated as error values.
     type Error interface {
     	error
     	ref.Val
@@ Expand Down @@