py.CompileMode now a string enum

go-python · drew-512 · Dec 8, 2021 · Dec 8, 2021 · Dec 8, 2021 · Dec 8, 2021
commit fc66b7f649de357b91ba69b15d09cdc4574e2b1d
diff --git a/compile/compile.go b/compile/compile.go
@@ -102,7 +102,7 @@ func init() {
 // the effects of any future statements in effect in the code calling
 // compile; if absent or zero these statements do influence the compilation,
 // in addition to any features explicitly specified.
-func Compile(str, filename, mode string, futureFlags int, dont_inherit bool) (py.Object, error) {
+func Compile(str, filename string, mode py.CompileMode, futureFlags int, dont_inherit bool) (py.Object, error) {
 	// Parse Ast
 	Ast, err := parser.ParseString(str, mode)
 	if err != nil {
@@ -1342,7 +1342,6 @@ func (c *compiler) NameOp(name string, ctx ast.ExprContext) {
 		default:
 			panic("NameOp: ctx invalid for name variable")
 		}
-		break
 	}
 	if op == 0 {
 		panic("NameOp: Op not set")

diff --git a/compile/compile_data_test.go b/compile/compile_data_test.go
@@ -12,7 +12,7 @@ import (
 
 var compileTestData = []struct {
 	in            string
-	mode          string // exec, eval or single
+	mode          py.CompileMode
 	out           *py.Code
 	exceptionType *py.Type
 	errString     string

diff --git a/parser/grammar_test.go b/parser/grammar_test.go
@@ -21,7 +21,7 @@ var debugLevel = flag.Int("debugLevel", 0, "Debug level 0-4")
 func TestGrammar(t *testing.T) {
 	SetDebug(*debugLevel)
 	for _, test := range grammarTestData {
-		Ast, err := ParseString(test.in, test.mode)
+		Ast, err := ParseString(test.in, py.CompileMode(test.mode))
 		if err != nil {
 			if test.exceptionType == nil {
 				t.Errorf("%s: Got exception %v when not expecting one", test.in, err)

diff --git a/parser/lexer.go b/parser/lexer.go
@@ -62,20 +62,20 @@ type yyLex struct {
 // can be 'exec' if source consists of a sequence of statements,
 // 'eval' if it consists of a single expression, or 'single' if it
 // consists of a single interactive statement
-func NewLex(r io.Reader, filename string, mode string) (*yyLex, error) {
+func NewLex(r io.Reader, filename string, mode py.CompileMode) (*yyLex, error) {
 	x := &yyLex{
 		reader:      bufio.NewReader(r),
 		filename:    filename,
 		indentStack: []int{0},
 		state:       readString,
 	}
 	switch mode {
-	case "exec":
+	case py.ExecMode:
 		x.queue(FILE_INPUT)
 		x.exec = true
-	case "eval":
+	case py.EvalMode:
 		x.queue(EVAL_INPUT)
-	case "single":
+	case py.SingleMode:
 		x.queue(SINGLE_INPUT)
 		x.interactive = true
 	default:
@@ -933,7 +933,7 @@ func SetDebug(level int) {
 }
 
 // Parse a file
-func Parse(in io.Reader, filename string, mode string) (mod ast.Mod, err error) {
+func Parse(in io.Reader, filename string, mode py.CompileMode) (mod ast.Mod, err error) {
 	lex, err := NewLex(in, filename, mode)
 	if err != nil {
 		return nil, err
@@ -952,12 +952,12 @@ func Parse(in io.Reader, filename string, mode string) (mod ast.Mod, err error)
 }
 
 // Parse a string
-func ParseString(in string, mode string) (ast.Ast, error) {
+func ParseString(in string, mode py.CompileMode) (ast.Ast, error) {
 	return Parse(bytes.NewBufferString(in), "<string>", mode)
 }
 
 // Lex a file only, returning a sequence of tokens
-func Lex(in io.Reader, filename string, mode string) (lts LexTokens, err error) {
+func Lex(in io.Reader, filename string, mode py.CompileMode) (lts LexTokens, err error) {
 	lex, err := NewLex(in, filename, mode)
 	if err != nil {
 		return nil, err
@@ -984,6 +984,6 @@ func Lex(in io.Reader, filename string, mode string) (lts LexTokens, err error)
 }
 
 // Lex a string
-func LexString(in string, mode string) (lts LexTokens, err error) {
+func LexString(in string, mode py.CompileMode) (lts LexTokens, err error) {
 	return Lex(bytes.NewBufferString(in), "<string>", mode)
 }
diff --git a/parser/lexer_test.go b/parser/lexer_test.go
@@ -196,7 +196,7 @@ func TestLex(t *testing.T) {
 	for _, test := range []struct {
 		in        string
 		errString string
-		mode      string
+		mode      py.CompileMode
 		lts       LexTokens
 	}{
 		{"", "", "exec", LexTokens{

diff --git a/py/run.go b/py/run.go
@@ -0,0 +1,79 @@
+package py
+
+type CompileMode string
+
+const (
+	ExecMode   CompileMode = "exec"
+	EvalMode   CompileMode = "eval"
+	SingleMode CompileMode = "single"
+)
+
+type RunFlags int32
+
+const (
+	// RunOpts.FilePath is intelligently interepreted to load the appropriate pyc object (otherwise new code is generated from the implied .py file)
+	SmartCodeAcquire RunFlags = 0x01
+)
+
+// type Sys interface {
+// 	ResetArfs
+// }
+
+// Rename to Ctx?
+type Ctx interface {
+	// These each initiate blocking execution.
+	//RunAsModule(opts RunOpts) (*Module, error)
+	//RunCodeAsModule(code *Code, moduleName string, fileDesc string) (*Module, error)
+	Run(globals, locals StringDict, code *Code, closure Tuple) (res Object, err error)
+	RunFrame(frame *Frame) (res Object, err error)
+	EvalCodeEx(co *Code, globals, locals StringDict, args []Object, kws StringDict, defs []Object, kwdefs StringDict, closure Tuple) (retval Object, err error)
+
+	// // Execution of any of the above will stop when the next opcode runs
+	// SignalHalt()
+
+	//Sys() Sys
+
+	GetModule(moduleName string) (*Module, error)
+	Store() *Store
+}
+
+const (
+	SrcFileExt  = ".py"
+	CodeFileExt = ".pyc"
+
+	DefaultModuleName = "__main__"
+)
+
+type StdLib int32
+
+const (
+	Lib_sys StdLib = 1 << iota
+	Lib_time
+
+	CoreLibs = Lib_sys | Lib_time
+)
+
+type RunParams struct {
+	ModuleInfo ModuleInfo // Newly created module to execute within (if ModuleInfo.Name is nil, then "__main__" is used)
+	NoopOnFNF  bool       // If set and Pathname did not resolve, (nil, nil) is returned (vs an error)
+	Silent     bool       // If set and an error occurs, no error info is printed
+	Pathname   string
+}
+
+var DefaultCtxOpts = CtxOpts{}
+
+type CtxOpts struct {
+	Args       []string
+	SetSysArgs bool
+}
+
+// Some well known objects
+var (
+	NewCtx  func(opts CtxOpts) Ctx
+
+	// // Called at least once before using gpython; multiple calls to it have no effect.
+	// // Called each time NewCtx is called
+	// Init    func()
+	Compile func(str, filename string, mode CompileMode, flags int, dont_inherit bool) (Object, error)
+	Run     func(ctx Ctx, params RunParams) (*Module, error)
+)
diff --git a/symtable/symtable_data_test.go b/symtable/symtable_data_test.go
@@ -12,7 +12,7 @@ import (
 
 var symtableTestData = []struct {
 	in            string
-	mode          string // exec, eval or single
+	mode          py.CompileMode
 	out           *SymTable
 	exceptionType *py.Type
 	errString     string