cleaned up py.Ctx initialization wrt sys and DefaultCtxOpts()

go-python · drew-512 · Dec 8, 2021 · Dec 8, 2021 · Dec 8, 2021 · Dec 8, 2021
commit 75d874323cff1fb50f8a1b9c65759f7c07347b85
diff --git a/main.go b/main.go
@@ -44,8 +44,8 @@ func main() {
 	flag.Parse()
 	args := flag.Args()
 
-	opts := py.DefaultCtxOpts
-	opts.Args = flag.Args()
+	opts := py.DefaultCtxOpts()
+	opts.SysArgs = flag.Args()
 	ctx := py.NewCtx(opts)
 
 	if *cpuprofile != "" {

diff --git a/modules/runtime.go b/modules/runtime.go
@@ -137,9 +137,10 @@ func NewCtx(opts py.CtxOpts) py.Ctx {
 	ctx.store = py.NewStore()
 
 	py.Import(ctx, "builtins", "sys")
-	if opts.SetSysArgs {
-		ctx.Store().MustGetModule("sys").Globals["argv"] = py.NewListFromStrings(opts.Args)
-	}
+
+	sys_mod := ctx.Store().MustGetModule("sys")
+	sys_mod.Globals["argv"] = py.NewListFromStrings(opts.SysArgs)
+	sys_mod.Globals["path"] = py.NewListFromStrings(opts.SysPaths)
 
 	return ctx
 }

diff --git a/py/run.go b/py/run.go
@@ -15,11 +15,10 @@ const (
 	SmartCodeAcquire RunFlags = 0x01
 )
 
-// type Sys interface {
-// 	ResetArfs
-// }
-
-// Rename to Ctx?
+// Ctx is gpython virtual environment instance ("context"), providing a mechanism
+// for multple gpython interpreters to run concurrently without restriction.
+//
+// See BenchmarkCtx() in vm/vm_test.go
 type Ctx interface {
 
 	// These each initiate blocking execution.
@@ -28,12 +27,14 @@ type Ctx interface {
 	// Runs a given file in the given host module.
 	RunFile(runPath string, opts RunOpts) (*Module, error)
 
-	// // Execution of any of the above will stop when the next opcode runs
+	// Execution of any of the above will stop when the next opcode runs
+	// @@TODO
 	// SignalHalt()
 
-	//Sys() Sys
-
+	// Returns the named module for this context (or an error if not found)
 	GetModule(moduleName string) (*Module, error)
+
+	// WIP
 	Store() *Store
 }
 
@@ -60,15 +61,33 @@ type RunOpts struct {
 	UseSysPaths bool
 }
 
-var DefaultCtxOpts = CtxOpts{}
+// Can be changed during runtime and will \play nice with others using DefaultCtxOpts()
+var CoreSysPaths = []string{
+	".",
+	"lib",
+}
+
+// Can be changed during runtime and will \play nice with others using DefaultCtxOpts()
+var AuxSysPaths = []string{
+	"/usr/lib/python3.4",
+	"/usr/local/lib/python3.4/dist-packages",
+	"/usr/lib/python3/dist-packages",
+}
 
 type CtxOpts struct {
-	Args       []string
-	SetSysArgs bool
+	SysArgs  []string // sys.argv initializer
+	SysPaths []string // sys.path initializer
 }
 
 // High-level entry points
 var (
+	DefaultCtxOpts = func() CtxOpts {
+		opts := CtxOpts{
+			SysPaths: CoreSysPaths,
+		}
+		opts.SysPaths = append(opts.SysPaths, AuxSysPaths...)
+		return opts
+	}
 	NewCtx  func(opts CtxOpts) Ctx
 	Compile func(str, filename string, mode CompileMode, flags int, dont_inherit bool) (Object, error)
 )
diff --git a/pytest/pytest.go b/pytest/pytest.go
@@ -17,7 +17,7 @@ import (
 	"github.com/go-python/gpython/py"
 )
 
-var gCtx = py.NewCtx(py.DefaultCtxOpts)
+var gCtx = py.NewCtx(py.DefaultCtxOpts())
 
 // Compile the program in the file prog to code in the module that is returned
 func compileProgram(t testing.TB, prog string) (*py.Module, *py.Code) {
@@ -35,14 +35,17 @@ func compileProgram(t testing.TB, prog string) (*py.Module, *py.Code) {
 	if err != nil {
 		t.Fatalf("%s: ReadAll failed: %v", prog, err)
 	}
+	return CompileSrc(t, gCtx, string(str), prog)
+}
 
-	obj, err := compile.Compile(string(str), prog, py.ExecMode, 0, true)
+func CompileSrc(t testing.TB, ctx py.Ctx, pySrc string, prog string) (*py.Module, *py.Code) {
+	obj, err := compile.Compile(string(pySrc), prog, py.ExecMode, 0, true)
 	if err != nil {
 		t.Fatalf("%s: Compile failed: %v", prog, err)
 	}
 
 	code := obj.(*py.Code)
-	module := gCtx.Store().NewModule(gCtx, py.ModuleInfo{
+	module := ctx.Store().NewModule(ctx, py.ModuleInfo{
 		FileDesc: prog,
 	}, nil, nil)
 	return module, code

diff --git a/repl/repl.go b/repl/repl.go
@@ -42,7 +42,7 @@ type UI interface {
 // New create a new REPL and initialises the state machine
 func New(ctx py.Ctx) *REPL {
 	if ctx == nil {
-		ctx = py.NewCtx(py.DefaultCtxOpts)
+		ctx = py.NewCtx(py.DefaultCtxOpts())
 	}
 
 	r := &REPL{

diff --git a/sys/sys.go b/sys/sys.go
@@ -23,15 +23,6 @@ import (
 	"github.com/go-python/gpython/py"
 )
 
-// Alter this list before the sys module starts to alter the factory path set
-var SysPathInitializer = []string{
-	"./", // Denotes the dir of the current file (or cwd if __file__ is not set)
-	"./lib",
-	"/usr/lib/python3.4",
-	"/usr/local/lib/python3.4/dist-packages",
-	"/usr/lib/python3/dist-packages",
-}
-
 const module_doc = `This module provides access to some objects used or maintained by the
 interpreter and to functions that interact strongly with the interpreter.
 
@@ -666,14 +657,22 @@ func init() {
 	stdout := &py.File{File: os.Stdout, FileMode: py.FileWrite}
 	stderr := &py.File{File: os.Stderr, FileMode: py.FileWrite}
 
+	executable, err := os.Executable()
+	if err != nil {
+		panic(err)
+	}
+
 	globals := py.StringDict{
+		"path":       py.NewList(),
 		"argv":       py.NewListFromStrings(os.Args[1:]),
 		"stdin":      stdin,
 		"stdout":     stdout,
 		"stderr":     stderr,
 		"__stdin__":  stdin,
 		"__stdout__": stdout,
 		"__stderr__": stderr,
+		"executable": py.String(executable),
+
 		//"version": py.Int(MARSHAL_VERSION),
 		//     /* stdin/stdout/stderr are now set by pythonrun.c */
 
@@ -798,21 +797,13 @@ func init() {
 		// #endif
 	}
 
-	executable, err := os.Executable()
-	if err != nil {
-		panic(err)
-	}
-
-	globals["executable"] = py.String(executable)
-	globals["path"] = py.NewListFromStrings(SysPathInitializer)
-
 	py.RegisterModule(&py.StaticModule{
 		Info: py.ModuleInfo{
-			Name:  "sys",
-			Doc:   module_doc,
+			Name: "sys",
+			Doc:  module_doc,
 		},
 		Methods: methods,
 		Globals: globals,
 	})
-	
+
 }