From 07879090453edf916d4dbbc72e7d2846204c2df6 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Sat, 18 May 2024 23:34:37 +0800 Subject: [PATCH] llgen.Gen fix: use imp --- internal/llgen/llgen.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/internal/llgen/llgen.go b/internal/llgen/llgen.go index 62278f19..2a62b637 100644 --- a/internal/llgen/llgen.go +++ b/internal/llgen/llgen.go @@ -30,7 +30,6 @@ import ( "golang.org/x/tools/go/ssa/ssautil" llssa "github.com/goplus/llgo/ssa" - cpackages "golang.org/x/tools/go/packages" ) func Init() { @@ -72,8 +71,13 @@ func Gen(pkgPath, inFile string, src any) string { } prog := llssa.NewProgram(nil) - initRtAndPy(prog, &cpackages.Config{ - Mode: loadSyntax | cpackages.NeedDeps, + prog.SetRuntime(func() *types.Package { + ret, _ := imp.Import(llssa.PkgRuntime) + return ret + }) + prog.SetPython(func() *types.Package { + ret, _ := imp.Import(llssa.PkgPython) + return ret }) ret, err := cl.NewPackage(prog, ssaPkg, files)