compile: re-organise code

Author: ncw

compile/compile.go

@@ -1,82 +1,56 @@
 // compile python code
-//
-// Need to port the 10,000 lines of compiling machinery, into a
-// different module probably.
-//
-// In the mean time, cheat horrendously by calling python3.4 to do our
-// dirty work under the hood!
 
 package compile
 
 import (
-"bytes"
 "fmt"
-"os"
-"os/exec"
-"strings"
 
 "github.com/ncw/gpython/ast"
-"github.com/ncw/gpython/marshal"
 "github.com/ncw/gpython/parser"
 "github.com/ncw/gpython/py"
 "github.com/ncw/gpython/symtable"
 "github.com/ncw/gpython/vm"
 )
 
-// Set in py to avoid circular import
-funcinit(){
-py.Compile=Compile
+// Loop
+typeloopstruct{
+Start*Label
+End*Label
+IsForLoopbool
 }
 
-// Compile(source, filename, mode, flags, dont_inherit) -> code object
-//
-// Compile the source string (a Python module, statement or expression)
-// into a code object that can be executed by exec() or eval().
-// The filename will be used for run-time error messages.
-// The mode must be 'exec' to compile a module, 'single' to compile a
-// single (interactive) statement, or 'eval' to compile an expression.
-// The flags argument, if present, controls which future statements influence
-// the compilation of the code.
-// The dont_inherit argument, if non-zero, stops the compilation inheriting
-// 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.
-funcLegacyCompile(str, filename, modestring, flagsint, dont_inheritbool) py.Object{
-dont_inherit_str:="False"
-ifdont_inherit{
-dont_inherit_str="True"
- }
-// FIXME escaping in filename
-code:=fmt.Sprintf(`import sys, marshal
-str = sys.stdin.buffer.read().decode("utf-8")
-code = compile(str, "%s", "%s", %d, %s)
-marshalled_code = marshal.dumps(code)
-sys.stdout.buffer.write(marshalled_code)
-sys.stdout.close()`,
-filename,
-mode,
-flags,
-dont_inherit_str,
- )
-cmd:=exec.Command("python3.4", "-c", code)
-cmd.Stdin=strings.NewReader(str)
-varout bytes.Buffer
-cmd.Stdout=&out
-varstderr bytes.Buffer
-cmd.Stderr=&stderr
-err:=cmd.Run()
-iferr!=nil{
-fmt.Fprintf(os.Stderr, "--- Failed to run python3.4 compile ---\n")
-fmt.Fprintf(os.Stderr, "--------------------\n")
-os.Stderr.Write(stderr.Bytes())
-fmt.Fprintf(os.Stderr, "--------------------\n")
-panic(err)
- }
-obj, err:=marshal.ReadObject(bytes.NewBuffer(out.Bytes()))
-iferr!=nil{
-panic(err)
+// Loopstack
+typeloopstack []loop
+
+// Push a loop
+func (ls*loopstack) Push(lloop){
+*ls=append(*ls, l)
+}
+
+// Pop a loop
+func (ls*loopstack) Pop(){
+*ls= (*ls)[:len(*ls)-1]
+}
+
+// Return current loop or nil for none
+func (lsloopstack) Top() *loop{
+iflen(ls) ==0{
+returnnil
  }
-returnobj
+return&ls[len(ls)-1]
+}
+
+// State for the compiler
+typecompilerstruct{
+Code*py.Code// code being built up
+OpCodesInstructions
+loopsloopstack
+SymTable*symtable.SymTable
+}
+
+// Set in py to avoid circular import
+funcinit(){
+py.Compile=Compile
 }
 
 // Compile(source, filename, mode, flags, dont_inherit) -> code object
@@ -159,42 +133,6 @@ func CompileAst(Ast ast.Ast, filename string, flags int, dont_inherit bool, SymT
 returncode, nil
 }
 
-// Loop
-typeloopstruct{
-Start*Label
-End*Label
-IsForLoopbool
-}
-
-// Loopstack
-typeloopstack []loop
-
-// Push a loop
-func (ls*loopstack) Push(lloop){
-*ls=append(*ls, l)
-}
-
-// Pop a loop
-func (ls*loopstack) Pop(){
-*ls= (*ls)[:len(*ls)-1]
-}
-
-// Return current loop or nil for none
-func (lsloopstack) Top() *loop{
-iflen(ls) ==0{
-returnnil
- }
-return&ls[len(ls)-1]
-}
-
-// State for the compiler
-typecompilerstruct{
-Code*py.Code// code being built up
-OpCodesInstructions
-loopsloopstack
-SymTable*symtable.SymTable
-}
-
 // Check for docstring as first Expr in body and remove it and set the
 // first constant if found.
 func (c*compiler) docString(body []ast.Stmt) []ast.Stmt{

compile/legacy.go

@@ -0,0 +1,65 @@
+package compile
+
+import (
+"bytes"
+"fmt"
+"os"
+"os/exec"
+"strings"
+
+"github.com/ncw/gpython/marshal"
+"github.com/ncw/gpython/py"
+)
+
+// Compile with python3.4 - not used any more but keep for the moment!
+
+// Compile(source, filename, mode, flags, dont_inherit) -> code object
+//
+// Compile the source string (a Python module, statement or expression)
+// into a code object that can be executed by exec() or eval().
+// The filename will be used for run-time error messages.
+// The mode must be 'exec' to compile a module, 'single' to compile a
+// single (interactive) statement, or 'eval' to compile an expression.
+// The flags argument, if present, controls which future statements influence
+// the compilation of the code.
+// The dont_inherit argument, if non-zero, stops the compilation inheriting
+// 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.
+funcLegacyCompile(str, filename, modestring, flagsint, dont_inheritbool) py.Object{
+dont_inherit_str:="False"
+ifdont_inherit{
+dont_inherit_str="True"
+ }
+// FIXME escaping in filename
+code:=fmt.Sprintf(`import sys, marshal
+str = sys.stdin.buffer.read().decode("utf-8")
+code = compile(str, "%s", "%s", %d, %s)
+marshalled_code = marshal.dumps(code)
+sys.stdout.buffer.write(marshalled_code)
+sys.stdout.close()`,
+filename,
+mode,
+flags,
+dont_inherit_str,
+ )
+cmd:=exec.Command("python3.4", "-c", code)
+cmd.Stdin=strings.NewReader(str)
+varout bytes.Buffer
+cmd.Stdout=&out
+varstderr bytes.Buffer
+cmd.Stderr=&stderr
+err:=cmd.Run()
+iferr!=nil{
+fmt.Fprintf(os.Stderr, "--- Failed to run python3.4 compile ---\n")
+fmt.Fprintf(os.Stderr, "--------------------\n")
+os.Stderr.Write(stderr.Bytes())
+fmt.Fprintf(os.Stderr, "--------------------\n")
+panic(err)
+ }
+obj, err:=marshal.ReadObject(bytes.NewBuffer(out.Bytes()))
+iferr!=nil{
+panic(err)
+ }
+returnobj
+}