Merge pull request #1482 from xushiwei/q

typeDecl: rec.Use
goplus · Oct 21, 2023 · 8245eb7 · 8245eb7
2 parents 568cdda + 3faae92
commit 8245eb7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/cl/compile.go b/cl/compile.go
@@ -894,7 +894,8 @@ func preloadFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, gopFil
 					if debugLoad {
 						log.Println("==> Preload type", name)
 					}
-					ld := getTypeLoader(parent, syms, t.Name.Pos(), name)
+					pos := t.Name.Pos()
+					ld := getTypeLoader(parent, syms, pos, name)
 					defs := ctx.pkg.NewTypeDefs()
 					if gopFile {
 						ld.typ = func() {
@@ -910,7 +911,7 @@ func preloadFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, gopFil
 							if debugLoad {
 								log.Println("==> Load > NewType", name)
 							}
-							decl := defs.NewType(name)
+							decl := defs.NewType(name, pos)
 							if t.Doc != nil {
 								defs.SetComments(t.Doc)
 							} else if d.Doc != nil {

diff --git a/cl/func_type_and_var.go b/cl/func_type_and_var.go
@@ -214,7 +214,16 @@ Name context:
 
 // ---------------------------------------------------------------------------*/
 
-func toIdentType(ctx *blockCtx, ident *ast.Ident) types.Type {
+func toIdentType(ctx *blockCtx, ident *ast.Ident) (ret types.Type) {
+	if rec := ctx.recorder(); rec != nil {
+		defer func() {
+			if n, ok := ret.(interface {
+				Obj() *types.TypeName
+			}); ok {
+				rec.Use(ident, n.Obj())
+			}
+		}()
+	}
 	if ctx.tlookup != nil {
 		if typ := ctx.tlookup.Lookup(ident.Name); typ != nil {
 			return typ