update to go1.20; pot read/sort (#4)

* sort entry

* update dep

* pipe

* go1.20

* gitee sync

---------

Co-authored-by: youthlin <[email protected]>

.github/workflows/gitee.yaml

@@ -6,9 +6,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source codes
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: sync to gitee
-        uses: Yikun/hub-mirror-action@mappings
+        uses: Yikun/hub-mirror-action@master
         with:
           src: github/youthLin
           dst: gitee/youthlin

.github/workflows/test.yaml

@@ -11,8 +11,8 @@ jobs:
           fetch-depth: 2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.16"
+          go-version: "1.20"
       - name: Run coverage
-        run: go test -race -coverprofile=coverage.txt -covermode=atomic
+        run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
       - name: Upload coverage to Codecov
         run: bash <(curl -s https://codecov.io/bash)

cmd/xtemplate/internal/keyword.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cockroachdb/errors"
 	"github.com/youthlin/t"
+	"github.com/youthlin/t/errors"
 )
 
 // Keyword gettext keyword

cmd/xtemplate/internal/param.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cockroachdb/errors"
 	"github.com/youthlin/t"
+	"github.com/youthlin/t/errors"
 	"github.com/youthlin/t/translator"
 )
 

cmd/xtemplate/internal/run.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"text/template/parse"
 
-	"github.com/cockroachdb/errors"
 	"github.com/youthlin/t"
+	"github.com/youthlin/t/errors"
 	"github.com/youthlin/t/translator"
 )
 

errors/errors.go

@@ -0,0 +1,23 @@
+package errors
+
+import (
+	"errors"
+	"fmt"
+)
+
+func Errorf(format string, args ...interface{}) error {
+	return fmt.Errorf(format, args...)
+}
+
+func Wrapf(err error, format string, args ...interface{}) error {
+	args = append(args, err)
+	return fmt.Errorf(format+": %w", args...)
+}
+
+func WithSecondaryError(err error, additionalErr error) error {
+	return fmt.Errorf("%w: %w", err, additionalErr)
+}
+
+func Is(err, target error) bool {
+	return errors.Is(err, target)
+}

go.mod

@@ -1,25 +1,18 @@
 module github.com/youthlin/t
 
-go 1.17
+go 1.20
 
 require (
-	github.com/Xuanwo/go-locale v1.0.0
-	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210803070921-b358b509191a
-	github.com/cockroachdb/errors v1.8.6
-	github.com/smartystreets/goconvey v1.6.4
-	golang.org/x/text v0.3.7
+	github.com/Xuanwo/go-locale v1.1.0
+	github.com/antlr4-go/antlr/v4 v4.13.0
+	github.com/smartystreets/goconvey v1.8.1
+	golang.org/x/text v0.14.0
 )
 
 require (
-	github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
-	github.com/cockroachdb/redact v1.1.1 // indirect
-	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
+	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
-	github.com/kr/pretty v0.2.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
-	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
+	github.com/smarty/assertions v1.15.0 // indirect
+	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
+	golang.org/x/sys v0.6.0 // indirect
 )

plurals/err.go

@@ -3,8 +3,8 @@ package plurals
 import (
 	"fmt"
 
-	"github.com/antlr/antlr4/runtime/Go/antlr"
-	"github.com/cockroachdb/errors"
+	"github.com/antlr4-go/antlr/v4"
+	"github.com/youthlin/t/errors"
 )
 
 // ErrAntlr is a error when antlr process fails
@@ -20,15 +20,15 @@ func (d *errorListener) SyntaxError(recognizer antlr.Recognizer, offendingSymbol
 	d.addError(errors.Errorf("SyntaxError(line %v:%v): %v", line, column, msg)) // SyntaxError 语法错误
 }
 
-func (d *errorListener) ReportAmbiguity(recognizer antlr.Parser, dfa *antlr.DFA, startIndex, stopIndex int, exact bool, ambigAlts *antlr.BitSet, configs antlr.ATNConfigSet) {
+func (d *errorListener) ReportAmbiguity(recognizer antlr.Parser, dfa *antlr.DFA, startIndex, stopIndex int, exact bool, ambigAlts *antlr.BitSet, configs *antlr.ATNConfigSet) {
 	d.addError(errors.Errorf("ReportAmbiguity")) // Ambiguity 歧义
 }
 
-func (d *errorListener) ReportAttemptingFullContext(recognizer antlr.Parser, dfa *antlr.DFA, startIndex, stopIndex int, conflictingAlts *antlr.BitSet, configs antlr.ATNConfigSet) {
+func (d *errorListener) ReportAttemptingFullContext(recognizer antlr.Parser, dfa *antlr.DFA, startIndex, stopIndex int, conflictingAlts *antlr.BitSet, configs *antlr.ATNConfigSet) {
 	d.addError(errors.Errorf("ReportAttemptingFullContext")) // SLL 冲突
 }
 
-func (d *errorListener) ReportContextSensitivity(recognizer antlr.Parser, dfa *antlr.DFA, startIndex, stopIndex, prediction int, configs antlr.ATNConfigSet) {
+func (d *errorListener) ReportContextSensitivity(recognizer antlr.Parser, dfa *antlr.DFA, startIndex, stopIndex, prediction int, configs *antlr.ATNConfigSet) {
 	d.addError(errors.Errorf("ReportContextSensitivity")) // 上下文相关
 }
 

plurals/err_test.go

@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/cockroachdb/errors"
 	. "github.com/smartystreets/goconvey/convey"
+	"github.com/youthlin/t/errors"
 )
 
 func Test_errorListener_addError(t *testing.T) {
 	Convey("add-err", t, func() {
 		var err = errors.Errorf("abc=%v", 1)
 		e := new(errorListener)
 		e.addError(fmt.Errorf("fmt-error"))
-		e.addError(errors.New("errors-new"))
+		e.addError(errors.Errorf("errors-new"))
 		e.addError(errors.Wrapf(err, "wrap message"))
 		t.Logf("err=%+v", e.err)
 	})

plurals/exp.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/antlr/antlr4/runtime/Go/antlr"
-	"github.com/cockroachdb/errors"
+	"github.com/antlr4-go/antlr/v4"
+	"github.com/youthlin/t/errors"
 	"github.com/youthlin/t/plurals/parser"
 )
 
@@ -41,7 +41,7 @@ func Eval(ctx context.Context, exp string, n int64) (result int64, err error) {
 
 	// 4 遍历语法树计算表达式
 	l := newListener(ctx, n)
-	tree := p.Start()
+	tree := p.Start_()
 	antlr.ParseTreeWalkerDefault.Walk(l, tree)
 	return l.result, errListener.err
 }