Merge pull request #1481 from xushiwei/q

typeDecl: rec.Def

ast/walk.go

@@ -16,7 +16,9 @@
 
 package ast
 
-import "fmt"
+import (
+	"fmt"
+)
 
 // Visitor - A Visitor's Visit method is invoked for each node encountered by Walk.
 // If the result visitor w is not nil, Walk visits each of the children
@@ -375,12 +377,6 @@ func Walk(v Visitor, node Node) {
 	case *SliceLit:
 		walkExprList(v, n.Elts)
 
-	case *ErrWrapExpr:
-		Walk(v, n.X)
-		if n.Default != nil {
-			Walk(v, n.Default)
-		}
-
 	case *LambdaExpr:
 		walkIdentList(v, n.Lhs)
 		walkExprList(v, n.Rhs)
@@ -427,6 +423,12 @@ func Walk(v Visitor, node Node) {
 			Walk(v, n.Expr3)
 		}
 
+	case *ErrWrapExpr:
+		Walk(v, n.X)
+		if n.Default != nil {
+			Walk(v, n.Default)
+		}
+
 	default:
 		panic(fmt.Sprintf("ast.Walk: unexpected node type %T", n))
 	}

cl/compile.go

@@ -916,14 +916,14 @@ func preloadFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, gopFil
 							} else if d.Doc != nil {
 								defs.SetComments(d.Doc)
 							}
-							if rec := ctx.recorder(); rec != nil {
-								rec.Def(t.Name, decl.Type().Obj())
-							}
 							ld.typInit = func() { // decycle
 								if debugLoad {
 									log.Println("==> Load > InitType", name)
 								}
 								decl.InitType(ctx.pkg, toType(ctx, t.Type))
+								if rec := ctx.recorder(); rec != nil {
+									rec.Def(t.Name, decl.Type().Obj())
+								}
 							}
 						}
 					} else {

x/typesutil/gopinfo.go

@@ -20,6 +20,7 @@ import (
 	"go/types"
 
 	"github.com/goplus/gop/ast"
+	"github.com/goplus/gox"
 	"github.com/qiniu/x/log"
 )
 
@@ -223,6 +224,9 @@ func (info gopRecorder) Def(id *ast.Ident, obj types.Object) {
 //
 // Invariant: Uses[id].Pos() != id.Pos()
 func (info gopRecorder) Use(id *ast.Ident, obj types.Object) {
+	if f, ok := obj.(*gox.Func); ok {
+		obj = &f.Func
+	}
 	if debugVerbose {
 		log.Println("==> Use:", id, obj)
 	}