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.

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

chore(deps): bump github.com/goplus/gop from 1.3.5 to 1.3.6 #49

Merged
merged 1 commit into from
Mar 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.23.4

require (
github.com/goplus/gogen v1.16.7
github.com/goplus/gop v1.3.5
github.com/goplus/gop v1.3.6
github.com/goplus/mod v0.13.17
github.com/goplus/spx v1.1.1-0.20250214074125-e9e1f6362499
github.com/qiniu/x v1.13.12
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ github.com/goplus/canvas v0.1.0 h1:Vx3f2+U8UANvWf5/01YsQYKNbZDm1GZCjhlEBFrQkeU=
github.com/goplus/canvas v0.1.0/go.mod h1:Rhcvo5qkpD9WuXFnvnXtrBSY97l6h7sXQuofrmiLNdM=
github.com/goplus/gogen v1.16.7 h1:OVN6byjWVtzs4plS7q80h747Jh8G7J+VUPN0L9YWQ68=
github.com/goplus/gogen v1.16.7/go.mod h1:6TQYbabXDF9LCdDkOOzHmfg1R4ENfXQ3XpHa9RhTSD8=
github.com/goplus/gop v1.3.5 h1:WmkGpOnyANI/b0Oj/k3qkOPdlhEiBbpds/X/cgUVzDs=
github.com/goplus/gop v1.3.5/go.mod h1:BnMzJG+PYoOWjKT4Q7CwxLUTBRnTFuuxW8W4O3vq/TU=
github.com/goplus/gop v1.3.6 h1:I9GUJXt+elFXjO3tNi/BXWiR7MujHoxrdawLQfMPrTM=
github.com/goplus/gop v1.3.6/go.mod h1:grsLKBbSesOXhwXH9tktcXHi+SBOn/yk4LKsL3dRmMg=
github.com/goplus/mod v0.13.17 h1:aWp14xosENrh7t0/0qcIejDmQEiTgI3ou2+KoLDlSlE=
github.com/goplus/mod v0.13.17/go.mod h1:XlHf8mnQ4QkRDX14Of2tpywuHDd+JVpPStvh3egog+0=
github.com/goplus/spx v1.1.1-0.20250214074125-e9e1f6362499 h1:wt9bXZWSZ6MKgLw0c87GSbKrXjj69aCt7JVM1RwLp3c=
Expand Down
4 changes: 2 additions & 2 deletions internal/pkgdata/gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ var pkgPaths = []string{

// See github.com/goplus/gop/cl.newBuiltinDefault for the list of packages required by Go+ builtins.
"github.com/goplus/gop/builtin",
"github.com/goplus/gop/builtin/ng",
"github.com/goplus/gop/builtin/iox",
"github.com/qiniu/x/stringutil",
"github.com/goplus/gop/builtin/ng",
"github.com/goplus/gop/builtin/stringslice",
"github.com/qiniu/x/stringutil",

"github.com/goplus/spx",
"github.com/hajimehoshi/ebiten/v2",
Expand Down
Binary file modified internal/pkgdata/pkgdata.zip
Binary file not shown.
15 changes: 0 additions & 15 deletions internal/util/enclosing.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ package util
// This file defines utilities for working with source positions.

import (
"reflect"
"slices"
"sort"

"github.com/goplus/gop/ast"
Expand Down Expand Up @@ -469,8 +467,6 @@ func childrenOf(n ast.Node) []ast.Node {
// nop
}

children = slices.DeleteFunc(children, isNilNode)

// TODO(adonovan): opt: merge the logic of ast.Inspect() into
// the switch above so we can make interleaved callbacks for
// both Nodes and Tokens in the right order and avoid the need
Expand All @@ -493,14 +489,3 @@ func (sl byPos) Less(i, j int) bool {
func (sl byPos) Swap(i, j int) {
sl[i], sl[j] = sl[j], sl[i]
}

func isNilNode(n ast.Node) bool {
if n == nil {
return true
}
v := reflect.ValueOf(n)
if v.Kind() == reflect.Ptr {
return v.IsNil()
}
return false
}
File renamed without changes.