Merge pull request #1669 from xushiwei/class

preloadGopFile bugfix: pkg.SetCurFile
goplus · Jan 25, 2024 · 946a877 · 946a877
2 parents 383ee1c + 1f3b620
commit 946a877
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/cl/compile.go b/cl/compile.go
@@ -762,11 +762,15 @@ func preloadGopFile(p *gox.Package, ctx *blockCtx, file string, f *ast.File, con
 			}
 			old, _ := p.SetCurFile(goFile, true)
 			defer p.RestoreCurFile(old)
+
 			decl := p.NewTypeDefs().NewType(classType)
 			ld.typInit = func() { // decycle
 				if debugLoad {
 					log.Println("==> Load > InitType", classType)
 				}
+				old, _ := p.SetCurFile(goFile, true)
+				defer p.RestoreCurFile(old)
+
 				pkg := p.Types
 				var flds []*types.Var
 				var tags []string