Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

runtime(go): minimum requirement go1.18 #4754

Closed
wants to merge 1 commit into from
Closed

runtime(go): minimum requirement go1.18 #4754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/hosted.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [
macos-12,
macos-13,
ubuntu-20.04,
windows-2022
]
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
fail-fast: false
matrix:
os: [
macos-12,
macos-13,
ubuntu-20.04,
windows-2022
]
Expand Down
5 changes: 5 additions & 0 deletions runtime-testsuite/test/org/antlr/v4/test/runtime/go/GoRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ protected CompiledState compile(RunOptions runOptions, GeneratedState generatedS
//
Exception ex = null;
if (cachedGoSum == null) {
// We need to write an empty go.sum file because `go mod tidy` may not generate it if there is no dependency.
// Or it will casue `java.io.FileNotFoundException` when readFile below
//
writeFile(getTempDirPath(), "go.sum", "");

try {
Processor.run(new String[]{getRuntimeToolPath(), "mod", "tidy"}, getTempDirPath(), environment);
} catch (InterruptedException | IOException e) {
Expand Down
4 changes: 1 addition & 3 deletions runtime/Go/antlr/v4/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
module github.com/antlr4-go/antlr/v4

go 1.20

require golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc
go 1.18
4 changes: 0 additions & 4 deletions runtime/Go/antlr/v4/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
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=
11 changes: 6 additions & 5 deletions runtime/Go/antlr/v4/lexer_action_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

package antlr

import "golang.org/x/exp/slices"

// Represents an executor for a sequence of lexer actions which traversed during
// the Matching operation of a lexer rule (token).
//
Expand Down Expand Up @@ -167,7 +165,10 @@ func (l *LexerActionExecutor) Equals(other interface{}) bool {
if len(l.lexerActions) != len(othert.lexerActions) {
return false
}
return slices.EqualFunc(l.lexerActions, othert.lexerActions, func(i, j LexerAction) bool {
return i.Equals(j)
})
for i, v := range l.lexerActions {
if !v.Equals(othert.lexerActions[i]) {
return false
}
}
return true
}
Loading