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

Jump to bottom

typesutil: Check support conf.Error #1514

Merged
merged 1 commit into from
Nov 2, 2023
Merged

typesutil: Check support conf.Error #1514

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
require (
github.com/fsnotify/fsnotify v1.7.0
github.com/goplus/c2go v0.7.17-0.20231102134817-4d12585f3af3
github.com/goplus/gox v1.12.2-0.20231102132054-7ebd369dd022
github.com/goplus/gox v1.12.2-0.20231102143433-424983d7a5ba
github.com/goplus/mod v0.11.8
github.com/qiniu/x v1.13.1
golang.org/x/tools v0.14.0
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyT
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/goplus/c2go v0.7.17-0.20231102134817-4d12585f3af3 h1:+/enB6wmQenM2Ihwv/v41lSgdTf3ARPi6A8FB1A/YH4=
github.com/goplus/c2go v0.7.17-0.20231102134817-4d12585f3af3/go.mod h1:DX0qhR2JSukHgIGMS9f6Vcu0N76LYBQy2tB+UnmIx3U=
github.com/goplus/gox v1.12.2-0.20231102132054-7ebd369dd022 h1:1g5BzuA9FfZgQwQ4XJXFsNh7KfscSIJfbUp9KkOWY80=
github.com/goplus/gox v1.12.2-0.20231102132054-7ebd369dd022/go.mod h1:MOJnwqA8/rSUkn0vsayHFK7TD/3XQrdexMTqdzR70X0=
github.com/goplus/gox v1.12.2-0.20231102143433-424983d7a5ba h1:XPnDAw65OtpBFbR2XQkFz53HXN06ibEHX5xQIDffGXs=
github.com/goplus/gox v1.12.2-0.20231102143433-424983d7a5ba/go.mod h1:MOJnwqA8/rSUkn0vsayHFK7TD/3XQrdexMTqdzR70X0=
github.com/goplus/mod v0.11.8 h1:90Kbg+MJhrdsonNGXYx3HUcW4IbBlRHYpIMssJaMMxM=
github.com/goplus/mod v0.11.8/go.mod h1:yl2QncBKTdXk+8UaNsdo4u2zSpGEJYA5JKjgD3K2h00=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
Expand Down
29 changes: 29 additions & 0 deletions x/typesutil/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (
"github.com/goplus/gop/cl"
"github.com/goplus/gop/token"
"github.com/goplus/gop/x/typesutil/internal/typesutil"
"github.com/goplus/gox"
"github.com/qiniu/x/errors"
"github.com/qiniu/x/log"
)

Expand Down Expand Up @@ -147,6 +149,17 @@ func (p *Checker) Files(goFiles []*goast.File, gopFiles []*ast.File) (err error)
NoSkipConstant: true,
})
if err != nil {
if onErr := conf.Error; onErr != nil {
if list, ok := err.(errors.List); ok {
for _, e := range list {
if ce, ok := convErr(fset, e); ok {
onErr(ce)
}
}
} else if ce, ok := convErr(fset, err); ok {
onErr(ce)
}
}
if debugPrintErr {
log.Println("typesutil.Check err:", err)
log.SingleStack()
Expand Down Expand Up @@ -194,6 +207,22 @@ func (p *Checker) Files(goFiles []*goast.File, gopFiles []*ast.File) (err error)
return
}

func convErr(fset *token.FileSet, e error) (*types.Error, bool) {
switch v := e.(type) {
case *gox.CodeError:
return &types.Error{Fset: fset, Pos: v.Pos, Msg: v.Msg}, true
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我这里看 types.Error 的 Pos 类型是 token.Pos。而 gox.CodeError 的 Pos 是 *token.Position，这里能直接赋值（Pos: v.Pos）的？

case *gox.MatchError:
pos := token.NoPos
if v.Src != nil {
pos = v.Src.Pos()
}
return &types.Error{Fset: fset, Pos: pos, Msg: v.Message("")}, true
case *gox.ImportError:
return &types.Error{Fset: fset, Pos: v.Pos, Msg: v.Err.Error()}, true
}
return nil, false
}

func scopeDelete(objMap map[types.Object]types.Object, scope *types.Scope, name string) {
if o := typesutil.ScopeDelete(scope, name); o != nil {
objMap[o] = nil
Expand Down