Require Go 1.21+

Author: hattya

Diff for: .github/workflows/ci.yml

@@ -11,9 +11,9 @@ jobs:
           - macOS
           - Windows
         go-version:
-          - '1.20'
           - '1.21'
           - '1.22'
+          - '1.23'
         include:
           - platform: Linux
             os: ubuntu-latest

Diff for: go.mod

@@ -1,3 +1,3 @@
 module github.com/hattya/go.sh
 
-go 1.20
+go 1.21

Diff for: interp/lexer.go

@@ -1,7 +1,7 @@
 //
 // go.sh/interp :: lexer.go
 //
-//   Copyright (c) 2021 Akinori Hattori <[email protected]>
+//   Copyright (c) 2021-2024 Akinori Hattori <[email protected]>
 //
 //   SPDX-License-Identifier: MIT
 //
@@ -13,6 +13,7 @@ package interp
 import (
 	"fmt"
 	"io"
+	"runtime"
 	"strings"
 	"sync"
 	"unicode"
@@ -98,7 +99,9 @@ func (l *lexer) run() {
 	defer func() {
 		close(l.token)
 
-		if e := recover(); e != nil {
+		switch e := recover().(type) {
+		case nil, *runtime.PanicNilError:
+		default:
 			// re-panic
 			panic(e)
 		}

Diff for: parser/lexer.go

@@ -1,7 +1,7 @@
 //
 // go.sh/parser :: lexer.go
 //
-//   Copyright (c) 2018-2021 Akinori Hattori <[email protected]>
+//   Copyright (c) 2018-2024 Akinori Hattori <[email protected]>
 //
 //   SPDX-License-Identifier: MIT
 //
@@ -16,6 +16,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"runtime"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -136,7 +137,9 @@ func (l *lexer) run() {
 			close(l.done)
 		}
 
-		if e := recover(); e != nil {
+		switch e := recover().(type) {
+		case nil, *runtime.PanicNilError:
+		default:
 			// re-panic
 			panic(e)
 		}