Thread: [Jython-checkins] SF.net SVN: jython: [4674] branches/advanced

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4674
          http://jython.svn.sourceforge.net/jython/?rev=4674&view=rev
Author:   thobes
Date:     2008-06-19 02:17:37 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Merged in the stuff from sandbox/pyasm in the advanced compiler branch.
Added the work-in-progress code to version control.

Modified Paths:
--------------
    branches/advanced/.classpath
    branches/advanced/compiler/org/python/newcompiler/AbstractEnvironment.java
    branches/advanced/compiler/org/python/newcompiler/ClassEnvironment.java
    branches/advanced/compiler/org/python/newcompiler/CodeInfo.java
    branches/advanced/compiler/org/python/newcompiler/CompilerFlag.java
    branches/advanced/compiler/org/python/newcompiler/Environment.java
    branches/advanced/compiler/org/python/newcompiler/EnvironmentError.java
    branches/advanced/compiler/org/python/newcompiler/FunctionEnvironment.java
    branches/advanced/compiler/org/python/newcompiler/GlobalEnvironment.java
    branches/advanced/compiler/org/python/newcompiler/ast/AstToBytecode.java
    branches/advanced/compiler/org/python/newcompiler/ast/ContextBuilder.java

Added Paths:
-----------
    branches/advanced/agent/
    branches/advanced/compiler/
    branches/advanced/compiler/org/python/compiler/
    branches/advanced/compiler/org/python/compiler/iface/
    branches/advanced/compiler/org/python/compiler/iface/ClassCompiler.java
    branches/advanced/compiler/org/python/compiler/iface/CodeCompiler.java
    branches/advanced/compiler/org/python/compiler/iface/CompilationMode.java
    branches/advanced/compiler/org/python/compiler/iface/Compiler.java
    branches/advanced/compiler/org/python/compiler/iface/CompilerFlag.java
    branches/advanced/compiler/org/python/compiler/iface/Parser.java
    branches/advanced/compiler/org/python/newcompiler/CompilerPolicy.java
    branches/advanced/compiler/org/python/newcompiler/ScopeInfo.java
    branches/advanced/continuations/
    branches/advanced/continuations/org/
    branches/advanced/continuations/org/python/
    branches/advanced/continuations/org/python/continuations/
    branches/advanced/continuations/org/python/continuations/Continuation.java
    branches/advanced/interpreter/
    branches/advanced/interpreter/org/
    branches/advanced/interpreter/org/python/
    branches/advanced/interpreter/org/python/interpreter/
    branches/advanced/interpreter/org/python/interpreter/BytecodeInterpreter.java

Removed Paths:
-------------
    branches/advanced/compiler/org/python/bytecode/BytecodeInfo.java

Modified: branches/advanced/.classpath
===================================================================

--- branches/advanced/.classpath	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/.classpath	2008-06-19 09:17:37 UTC (rev 4674)
@@ -5,6 +5,10 @@
 	<classpathentry kind="src" output="build/classes" path="build/gensrc"/>
 	<classpathentry kind="src" output="build/classes" path="tests/java"/>
 	<classpathentry kind="src" path="bugtests/classes"/>
+	<classpathentry kind="src" path="agent"/>
+	<classpathentry kind="src" path="compiler"/>
+	<classpathentry kind="src" path="continuations"/>
+	<classpathentry kind="src" path="interpreter"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="lib" path="extlibs/jline-0.9.94.jar"/>
@@ -14,7 +18,7 @@
 	<classpathentry kind="lib" path="extlibs/postgresql-8.3-603.jdbc4.jar"/>
 	<classpathentry kind="lib" path="extlibs/servlet-api-2.5.jar"/>
 	<classpathentry kind="lib" path="build/jarjar"/>
-	<classpathentry kind="lib" path="extlibs/antlr-3.0.1.jar"/>
-	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
+	<classpathentry kind="var" path="Ant"/>
+	<classpathentry kind="lib" path="extlibs/antlr-3.1b1.jar"/>
 	<classpathentry kind="output" path="bugtests/classes"/>
 </classpath>

Copied: branches/advanced/agent (from rev 4673, trunk/sandbox/pyasm/agent)

Copied: branches/advanced/compiler (from rev 4673, trunk/sandbox/pyasm/compiler)

Deleted: branches/advanced/compiler/org/python/bytecode/BytecodeInfo.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/bytecode/BytecodeInfo.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/bytecode/BytecodeInfo.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -1,59 +0,0 @@
-package org.python.bytecode;
-
-import java.util.Set;
-
-import org.python.newcompiler.CodeInfo;
-import org.python.newcompiler.CompilerFlag;
-
-public class BytecodeInfo implements CodeInfo {
-
-    private final String name;
-
-    private final String filename;
-
-    private final int argcount;
-
-    private final int nlocals;
-
-    private final int stacksize;
-
-    private final Set<CompilerFlag> flags;
-
-    public BytecodeInfo(String name,
-                        String filename,
-                        int argcount,
-                        int nlocals,
-                        int stacksize,
-                        int flags) {
-        this.name = name;
-        this.filename = filename;
-        this.argcount = argcount;
-        this.nlocals = nlocals;
-        this.stacksize = stacksize;
-        this.flags = CompilerFlag.parseFlags(flags);
-    }
-
-    public int getArgumentCount() {
-        return argcount;
-    }
-
-    public String getFilename() {
-        return filename;
-    }
-
-    public int getLocalsCount() {
-        return nlocals;
-    }
-
-    public int getMaxStackSize() {
-        return stacksize;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Set<CompilerFlag> getCompilerFlags() {
-        return flags;
-    }
-}

Added: branches/advanced/compiler/org/python/compiler/iface/ClassCompiler.java
===================================================================
--- branches/advanced/compiler/org/python/compiler/iface/ClassCompiler.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/compiler/iface/ClassCompiler.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,4 @@
+package org.python.compiler.iface;
+
+
+public interface ClassCompiler {}

Added: branches/advanced/compiler/org/python/compiler/iface/CodeCompiler.java
===================================================================
--- branches/advanced/compiler/org/python/compiler/iface/CodeCompiler.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/compiler/iface/CodeCompiler.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,4 @@
+package org.python.compiler.iface;
+
+
+public interface CodeCompiler {}

Added: branches/advanced/compiler/org/python/compiler/iface/CompilationMode.java
===================================================================
--- branches/advanced/compiler/org/python/compiler/iface/CompilationMode.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/compiler/iface/CompilationMode.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,6 @@
+package org.python.compiler.iface;
+
+
+public enum CompilationMode {
+    exec, single, eval
+}

Added: branches/advanced/compiler/org/python/compiler/iface/Compiler.java
===================================================================
--- branches/advanced/compiler/org/python/compiler/iface/Compiler.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/compiler/iface/Compiler.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,255 @@
+package org.python.compiler.iface;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Set;
+
+import org.python.antlr.PythonTree;
+import org.python.core.PyClass;
+import org.python.core.PyCode;
+
+/**
+ * The static methods of this class act as a Facade for the compiler subsystem. This is so that the
+ * rest of Jython (even generated code) can statically link to the static interface of this class,
+ * while allowing for different implementations of the various components of the compiler subsystem.
+ * 
+ * An instance of this class gets passed to the various components of the compiler subsystem and act
+ * as a Mediator object in between the components of the compiler subsystem.
+ * 
+ * 
+ * Currently a lot of code that should reside here resides in {@link org.python.core.Py}:
+ * 
+ * All code should not be table code, this should be determined by the current compiler strategy:
+ * {@link org.python.core.Py#newCode(int, String[], String, String, boolean, boolean,
+ * org.python.core.PyFunctionTable, int, String[], String[], int, int)}
+ * {@link org.python.core.Py#newCode(int, String[], String, String, int, boolean, boolean,
+ * org.python.core.PyFunctionTable, int, String[], String[], int, int)}
+ * {@link org.python.core.Py#newCode(int, String[], String, String, boolean, boolean,
+ * org.python.core.PyFunctionTable, int)}
+ * {@link org.python.core.Py#newCode(int, String[], String, String, int, boolean, boolean,
+ * org.python.core.PyFunctionTable, int)}
+ * 
+ * If we want to introduce classworking this is where to do it:
+ * {@link org.python.core.Py#newJavaCode(Class, String)}
+ * {@link org.python.core.Py#newJavaFunc(Class, String)}
+ * 
+ * For classes that inherit from java-classes:
+ * {@link org.python.core.Py#initProxy(org.python.core.PyProxy, String, String, Object[])}
+ * 
+ * For creating classes:
+ * {@link org.python.core.Py#makeClass(String, org.python.core.PyObject[], PyCode, org.python.core.PyObject)}
+ * {@link org.python.core.Py#makeClass(String, org.python.core.PyObject[], PyCode, org.python.core.PyObject, Class)}
+ * {@link org.python.core.Py#makeClass(String, org.python.core.PyObject[], PyCode, org.python.core.PyObject, org.python.core.PyObject[])}
+ * {@link org.python.core.Py#makeClass(String, org.python.core.PyObject[], PyCode, org.python.core.PyObject, Class, org.python.core.PyObject[])}
+ * 
+ * {@link org.python.core.Py#getName()}
+ * {@link org.python.core.Py#getCompilerFlags()}
+ * {@link org.python.core.Py#getCompilerFlags(int, boolean)}
+ * 
+ * Compiling code:
+ * {@link org.python.core.Py#compile(org.python.parser.ast.modType, String)}
+ * {@link org.python.core.Py#compile(java.io.InputStream, String, String)}
+ * {@link org.python.core.Py#compile(org.python.parser.ast.modType, String, String)}
+ * {@link org.python.core.Py#compile(org.python.parser.ast.modType, String, String, boolean, boolean)}
+ * 
+ * {@link org.python.core.Py#compile_flags(java.io.InputStream, String, String, org.python.core.CompilerFlags)}
+ * {@link org.python.core.Py#compile_flags(String, String, String, org.python.core.CompilerFlags)}
+ * {@link org.python.core.Py#compile_flags(org.python.parser.ast.modType, String, String, boolean, boolean, org.python.core.CompilerFlags)}
+ * 
+ * {@link org.python.core.Py#compile_command_flags(String, String, String, org.python.core.CompilerFlags, boolean)}
+ * 
+ * Other things should be removed from {@link org.python.core.Py} as well, such as exception
+ * handling. But those things should not move here.
+ * 
+ * @author Tobias Ivarsson
+ */
+public abstract class Compiler {
+
+    private static Parser defaultParser;
+
+    private static CodeCompiler defaultCodeCompiler;
+
+    private static ClassCompiler defaultClassCompiler;
+
+    public static void setDefaultParser(Parser parser) {
+        if (parser == null) {
+            throw new IllegalArgumentException("The default parser cannot be null.");
+        }
+        defaultParser = parser;
+    }
+
+    public static void setDefaultCodeCompiler(CodeCompiler codeCompiler) {
+        if (codeCompiler == null) {
+            throw new IllegalArgumentException("The default code compiler cannot be null.");
+        }
+        defaultCodeCompiler = codeCompiler;
+    }
+
+    public static void setDefaultClassCompiler(ClassCompiler classCompiler) {
+        if (classCompiler == null) {
+            throw new IllegalArgumentException("The default code compiler cannot be null.");
+        }
+        defaultClassCompiler = classCompiler;
+    }
+
+    public static PyCode compileFromSource(String source,
+                                           String filename,
+                                           CompilationMode mode,
+                                           Set<CompilerFlag> flags) {
+        return defaultCompiler.compile(source, filename, mode, flags);
+    }
+
+    public static PythonTree parseFromSource(String source,
+                                             CompilationMode mode,
+                                             Set<CompilerFlag> flags) {
+        return defaultCompiler.parse(source, mode, flags);
+    }
+
+    public static PyCode compileFromSyntaxTree(PythonTree ast,
+                                               String filename,
+                                               Set<CompilerFlag> flags) {
+        return defaultCompiler.compile(ast, filename, flags);
+    }
+
+    public static PyCode compileFromFile(File file, Set<CompilerFlag> flags) throws IOException {
+        return defaultCompiler.compile(file, flags);
+    }
+
+    public static PythonTree parseFromFile(File file, Set<CompilerFlag> flags) throws IOException {
+        return defaultCompiler.parse(file, flags);
+    }
+
+    public static PyClass makeClass(/* TODO: Decide signature for this method. */) {
+        return defaultCompiler.buildClass();
+    }
+
+    private Compiler currentCapture;
+
+    abstract Parser getParser();
+
+    abstract CodeCompiler getCodeCompiler();
+
+    abstract ClassCompiler getClassCompiler();
+
+    public static Compiler captureCompiler() {
+        return defaultCompiler.capture();
+    }
+
+    public static Compiler captureCompiler(Parser parser) {
+        return defaultCompiler.capture(parser);
+    }
+
+    public static Compiler captureCompiler(CodeCompiler codeCompiler) {
+        return defaultCompiler.capture(codeCompiler);
+    }
+
+    public static Compiler captureCompiler(ClassCompiler classCompiler) {
+        return defaultCompiler.capture(classCompiler);
+    }
+
+    public static Compiler captureCompiler(Parser parser,
+                                           CodeCompiler codeCompiler,
+                                           ClassCompiler classCompiler) {
+        return defaultCompiler.capture(parser, codeCompiler, classCompiler);
+    }
+
+    public Compiler capture() {
+        return capture(null, null, null);
+    }
+
+    public Compiler capture(Parser parser) {
+        return capture(parser, null, null);
+    }
+
+    public Compiler capture(CodeCompiler codeCompiler) {
+        return capture(null, codeCompiler, null);
+    }
+
+    public Compiler capture(ClassCompiler classCompiler) {
+        return capture(null, null, classCompiler);
+    }
+
+    public Compiler capture(final Parser newParser,
+                            final CodeCompiler newCodeCompiler,
+                            final ClassCompiler newClassCompiler) {
+        final Compiler old = this;
+        return new Compiler() {
+
+            private final Parser parser = (newParser != null) ? newParser : old.getParser();
+
+            private final CodeCompiler codeCompiler = (newCodeCompiler != null) ? newCodeCompiler
+                    : old.getCodeCompiler();
+
+            private final ClassCompiler classCompiler = (newClassCompiler != null) ? newClassCompiler
+                    : old.getClassCompiler();
+
+            @Override
+            ClassCompiler getClassCompiler() {
+                return classCompiler;
+            }
+
+            @Override
+            CodeCompiler getCodeCompiler() {
+                return codeCompiler;
+            }
+
+            @Override
+            Parser getParser() {
+                return parser;
+            }
+        };
+    }
+
+    private static final Compiler defaultCompiler = new Compiler() {
+
+        @Override
+        ClassCompiler getClassCompiler() {
+            return defaultClassCompiler;
+        }
+
+        @Override
+        CodeCompiler getCodeCompiler() {
+            return defaultCodeCompiler;
+        }
+
+        @Override
+        Parser getParser() {
+            return defaultParser;
+        }
+    };
+
+    private Compiler() {}
+
+    public PyCode compile(String source,
+                          String filename,
+                          CompilationMode mode,
+                          Set<CompilerFlag> flags) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public PythonTree parse(String source, CompilationMode mode, Set<CompilerFlag> flags) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public PyCode compile(PythonTree ast, String filename, Set<CompilerFlag> flags) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public PyCode compile(File file, Set<CompilerFlag> flags) throws IOException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public PythonTree parse(File file, Set<CompilerFlag> flags) throws IOException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    public PyClass buildClass() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+}

Added: branches/advanced/compiler/org/python/compiler/iface/CompilerFlag.java
===================================================================
--- branches/advanced/compiler/org/python/compiler/iface/CompilerFlag.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/compiler/iface/CompilerFlag.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,5 @@
+package org.python.compiler.iface;
+
+
+public enum CompilerFlag {
+}

Added: branches/advanced/compiler/org/python/compiler/iface/Parser.java
===================================================================
--- branches/advanced/compiler/org/python/compiler/iface/Parser.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/compiler/iface/Parser.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,4 @@
+package org.python.compiler.iface;
+
+
+public interface Parser {}

Modified: branches/advanced/compiler/org/python/newcompiler/AbstractEnvironment.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/AbstractEnvironment.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/AbstractEnvironment.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -11,7 +11,7 @@
 import org.python.bytecode.VariableContext;
 import org.python.newcompiler.EnvironmentError.EnvironmentProblem;
 
-abstract class AbstractEnvironment implements Environment, EnvironmentInfo, CodeInfo {
+abstract class AbstractEnvironment implements Environment, EnvironmentInfo, CodeInfo, ScopeInfo {
 
     final Environment parent;
 
@@ -45,8 +45,14 @@
 
     private List<EnvironmentProblem> trouble = new LinkedList<EnvironmentProblem>();
 
-    AbstractEnvironment(Environment parent) {
+    /**
+     * The policy that decides how 
+     */
+    protected CompilerPolicy policy;
+
+    AbstractEnvironment(Environment parent, CompilerPolicy policy) {
         this.parent = parent;
+        this.policy = policy;
         if (parent != null) {
             flags = parent.getCompilerFlags();
         }
@@ -55,6 +61,10 @@
     public void markHasExec() {
         flags.add(CompilerFlag.HAVE_EXEC);
     }
+    
+    public void markForStarImport() {
+        flags.add(CompilerFlag.IMPORT_STAR);
+    }
 
     public GlobalEnvironment getGlobalEnvironment() {
         return parent.getGlobalEnvironment();
@@ -108,6 +118,10 @@
     public void addFuture(String feature) throws Exception {
         error(EnvironmentError.FUTURE_OUT_OF_CONTEXT);
     }
+    
+    public void done() {
+        // TODO: implement this
+    }
 
     /**
      * Mark that there is an error in the
@@ -133,8 +147,8 @@
         return Collections.unmodifiableSet(flags);
     }
 
+    // CodeInfo
     public int getArgumentCount() {
-        // TODO: implement this
         return 0;
     }
 
@@ -157,4 +171,29 @@
         // TODO: implement this
         return null;
     }
+
+    public Iterable<String> getArgumentNames() {
+        // TODO: implement this
+        return null;
+    }
+
+    public ScopeInfo getScopeInfo() {
+        return this;
+    }
+
+    // ScopeInfo
+    public Iterable<String> getVariableNames() {
+        // TODO: implement this
+        return null;
+    }
+
+    public Iterable<String> getFreeVariableNames() {
+        // TODO: implement this
+        return null;
+    }
+
+    public Iterable<String> getCellVariableNames() {
+        // TODO: implement this
+        return null;
+    }
 }

Modified: branches/advanced/compiler/org/python/newcompiler/ClassEnvironment.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/ClassEnvironment.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/ClassEnvironment.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -2,8 +2,8 @@
 
 public class ClassEnvironment extends AbstractEnvironment {
 
-    public ClassEnvironment(Environment parent) {
-        super(parent);
+    public ClassEnvironment(Environment parent, CompilerPolicy policy) {
+        super(parent, policy);
     }
 
     public void addParameter(String name) {

Modified: branches/advanced/compiler/org/python/newcompiler/CodeInfo.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/CodeInfo.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/CodeInfo.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -3,6 +3,8 @@
 public interface CodeInfo {
 
     int getArgumentCount();
+    
+    Iterable<String> getArgumentNames();
 
     int getLocalsCount();
 
@@ -11,4 +13,6 @@
     String getFilename();
 
     String getName();
+    
+    ScopeInfo getScopeInfo();
 }

Modified: branches/advanced/compiler/org/python/newcompiler/CompilerFlag.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/CompilerFlag.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/CompilerFlag.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -61,7 +61,13 @@
     /**
      * The code block uses names without qualified environment.
      */
-    NAME_BASED_LOOKUP;
+    NAME_BASED_LOOKUP,
+    /**
+     * The code block has an occurrence of
+     * 
+     * from [module] import *
+     */
+    IMPORT_STAR;
 
     private Integer bitFlag;
 

Added: branches/advanced/compiler/org/python/newcompiler/CompilerPolicy.java
===================================================================
--- branches/advanced/compiler/org/python/newcompiler/CompilerPolicy.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/newcompiler/CompilerPolicy.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,19 @@
+package org.python.newcompiler;
+
+import java.util.Set;
+
+public enum CompilerPolicy {
+    DEFAULT {
+
+        @Override
+        public EnvironmentError verifyFlag(CompilerFlag flag) {
+            return null;
+        }
+    };
+
+    public Set<CompilerFlag> inheritFlags(Set<CompilerFlag> flags) {
+        return null;
+    }
+
+    public abstract EnvironmentError verifyFlag(CompilerFlag flag);
+}

Modified: branches/advanced/compiler/org/python/newcompiler/Environment.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/Environment.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/Environment.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -21,8 +21,12 @@
     void addParameter(String name);
 
     void addFuture(String feature) throws Exception;
+    
+    void done();
 
     GlobalEnvironment getGlobalEnvironment();
 
     Set<CompilerFlag> getCompilerFlags();
+
+    void markForStarImport();
 }

Modified: branches/advanced/compiler/org/python/newcompiler/EnvironmentError.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/EnvironmentError.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/EnvironmentError.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -1,5 +1,10 @@
 package org.python.newcompiler;
 
+/**
+ * TODO: Add code for failing and producing error messages, warnings and so on. 
+ * 
+ * @author Tobias Ivarsson
+ */
 public enum EnvironmentError {
     PARAMETER_AS_GLOBAL, BOTH_NONLOCAL_AND_GLOBAL, PARAMETER_AS_NONLOCAL, ILLEGAL_GENERATOR, CANNOT_HAVE_PARAMETERS, DUPLICATE_PARAMETER_NAMES, FUTURE_OUT_OF_CONTEXT;
 
@@ -9,8 +14,13 @@
 
     public static class EnvironmentProblem {
 
-        public EnvironmentProblem(EnvironmentError environmentError, int lineNumber) {
-        // TODO Auto-generated constructor stub
+        private EnvironmentError error;
+
+        private int lineNumber;
+
+        public EnvironmentProblem(EnvironmentError error, int lineNumber) {
+            this.error = error;
+            this.lineNumber = lineNumber;
         }
     }
 }

Modified: branches/advanced/compiler/org/python/newcompiler/FunctionEnvironment.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/FunctionEnvironment.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/FunctionEnvironment.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -21,8 +21,8 @@
 
     private List<Label> resumeTable = new LinkedList<Label>();
 
-    public FunctionEnvironment(Environment parent) {
-        super(parent);
+    public FunctionEnvironment(Environment parent, CompilerPolicy policy) {
+        super(parent, policy);
     }
 
     public void setVarArg(String name) {
@@ -84,4 +84,9 @@
             super.markAsNonlocal(name);
         }
     }
+    
+    @Override
+    public int getArgumentCount() {
+        return parameterCount;
+    }
 }

Modified: branches/advanced/compiler/org/python/newcompiler/GlobalEnvironment.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/GlobalEnvironment.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/GlobalEnvironment.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -4,8 +4,8 @@
 
     private boolean futureAllowed = true;
 
-    public GlobalEnvironment() {
-        super(null);
+    public GlobalEnvironment(CompilerPolicy policy) {
+        super(null, policy);
     }
 
     @Override

Added: branches/advanced/compiler/org/python/newcompiler/ScopeInfo.java
===================================================================
--- branches/advanced/compiler/org/python/newcompiler/ScopeInfo.java	                        (rev 0)
+++ branches/advanced/compiler/org/python/newcompiler/ScopeInfo.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,10 @@
+package org.python.newcompiler;
+
+public interface ScopeInfo {
+
+    Iterable<String> getVariableNames();
+
+    Iterable<String> getFreeVariableNames();
+
+    Iterable<String> getCellVariableNames();
+}

Modified: branches/advanced/compiler/org/python/newcompiler/ast/AstToBytecode.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/ast/AstToBytecode.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/ast/AstToBytecode.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -72,12 +72,6 @@
 import org.python.bytecode.SliceMode;
 import org.python.bytecode.UnaryOperator;
 import org.python.bytecode.VariableContext;
-import org.python.core.Py;
-import org.python.core.PyInteger;
-import org.python.core.PyLong;
-import org.python.core.PyObject;
-import org.python.core.PyString;
-import org.python.core.PyUnicode;
 import org.python.newcompiler.BytecodeBundle;
 import org.python.newcompiler.CodeInfo;
 import org.python.newcompiler.CompilerFlag;
@@ -87,6 +81,13 @@
 import org.python.newcompiler.YieldPoint;
 import org.python.newcompiler.bytecode.BytecodeCompiler;
 import org.python.newcompiler.bytecode.PythonBytecodeCompilingBundle;
+import org.python.core.Py;
+import org.python.core.PyInteger;
+import org.python.core.PyLong;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyUnicode;
+import org.python.newcompiler.CompilerPolicy;
 
 /**
  * An AST visitor that feeds a Bytecode visitor.
@@ -202,9 +203,12 @@
 
     private final String name;
 
-    public AstToBytecode(PythonBytecodeCompilingBundle bundle, String name) {
+    private final CompilerPolicy policy;
+
+    public AstToBytecode(PythonBytecodeCompilingBundle bundle, CompilerPolicy policy, String name) {
         this.bundle = bundle;
         this.name = name;
+        this.policy = policy;
     }
 
     private String signature() {
@@ -226,7 +230,7 @@
     private int lastLineNumber = -1;
 
     private void buildContext(modType node) throws Exception {
-        context = node.accept(new ContextBuilder());
+        context = node.accept(new ContextBuilder(policy));
     }
 
     private void sendResumeTable() {

Modified: branches/advanced/compiler/org/python/newcompiler/ast/ContextBuilder.java
===================================================================
--- trunk/sandbox/pyasm/compiler/org/python/newcompiler/ast/ContextBuilder.java	2008-06-19 08:32:01 UTC (rev 4673)
+++ branches/advanced/compiler/org/python/newcompiler/ast/ContextBuilder.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -33,20 +33,29 @@
 import org.python.newcompiler.Future;
 import org.python.newcompiler.GlobalEnvironment;
 import org.python.newcompiler.YieldPoint;
+import org.python.newcompiler.CompilerPolicy;
 import org.python.parser.ParseException;
 
 public class ContextBuilder extends VisitorBase<EnvironmentHolder> implements EnvironmentHolder {
 
-    private final Environment globalEnvironment = new GlobalEnvironment();
+    private final Environment globalEnvironment;
 
-    private Environment currentEnvironment = globalEnvironment;
+    private final CompilerPolicy policy;
 
+    private Environment currentEnvironment;
+
     private Map<PythonTree, EnvironmentInfo> environmentMap = new HashMap<PythonTree, EnvironmentInfo>();
 
     private LinkedHashMap<exprType, YieldPoint> resumeTable = new LinkedHashMap<exprType, YieldPoint>();
 
     private int resumePoint = 0;
 
+    public ContextBuilder(CompilerPolicy policy) {
+        this.policy = policy;
+        globalEnvironment = new GlobalEnvironment(policy);
+        currentEnvironment = globalEnvironment;
+    }
+
     public EnvironmentInfo getEnvironment(PythonTree tree) {
         return environmentMap.get(tree);
     }
@@ -72,7 +81,7 @@
         }
         // Class body - in new environment
         Environment last = currentEnvironment;
-        ClassEnvironment classEnvironment = new ClassEnvironment(currentEnvironment);
+        ClassEnvironment classEnvironment = new ClassEnvironment(currentEnvironment, policy);
         environmentMap.put(node, classEnvironment);
         currentEnvironment = classEnvironment;
         try {
@@ -80,6 +89,7 @@
                 stmt.accept(this);
             }
         } finally {
+            currentEnvironment.done();
             currentEnvironment = last;
         }
         return unhandled_node(node);
@@ -102,7 +112,8 @@
         }
         // In Function scope
         Environment last = currentEnvironment;
-        FunctionEnvironment functionEnvironment = new FunctionEnvironment(currentEnvironment);
+        FunctionEnvironment functionEnvironment = new FunctionEnvironment(currentEnvironment,
+                                                                          policy);
         environmentMap.put(node, functionEnvironment);
         currentEnvironment = functionEnvironment;
         try {
@@ -125,6 +136,7 @@
                 stmt.accept(this);
             }
         } finally {
+            currentEnvironment.done();
             currentEnvironment = last;
         }
         return unhandled_node(node);
@@ -139,7 +151,8 @@
         }
         // In Lambda scope
         Environment last = currentEnvironment;
-        FunctionEnvironment functionEnvironment = new FunctionEnvironment(currentEnvironment);
+        FunctionEnvironment functionEnvironment = new FunctionEnvironment(currentEnvironment,
+                                                                          policy);
         environmentMap.put(node, functionEnvironment);
         currentEnvironment = functionEnvironment;
         try {
@@ -160,6 +173,7 @@
             // Lambda body
             node.body.accept(this);
         } finally {
+            currentEnvironment.done();
             currentEnvironment = last;
         }
         return unhandled_node(node);
@@ -170,7 +184,8 @@
             comp.iter.accept(this);
         }
         Environment last = currentEnvironment;
-        FunctionEnvironment functionEnvironment = new FunctionEnvironment(currentEnvironment);
+        FunctionEnvironment functionEnvironment = new FunctionEnvironment(currentEnvironment,
+                                                                          policy);
         environmentMap.put(node, functionEnvironment);
         currentEnvironment = functionEnvironment;
         addYieldPoint(node);
@@ -186,6 +201,7 @@
             }
             node.elt.accept(this);
         } finally {
+            currentEnvironment.done();
             currentEnvironment = last;
         }
         return unhandled_node(node);
@@ -255,7 +271,7 @@
                 currentEnvironment.addAssignment(name);
             }
         } else {
-            // Import star :(
+            currentEnvironment.markForStarImport();
         }
         return unhandled_node(node);
     }

Added: branches/advanced/continuations/org/python/continuations/Continuation.java
===================================================================
--- branches/advanced/continuations/org/python/continuations/Continuation.java	                        (rev 0)
+++ branches/advanced/continuations/org/python/continuations/Continuation.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,39 @@
+package org.python.continuations;
+
+public abstract class Continuation {
+
+    private Continuation() {
+    }
+
+    private static class Break extends Throwable {
+
+        @Override
+        public synchronized Throwable fillInStackTrace() {
+            return this;
+        }
+    }
+
+    private static final Break stop = new Break();
+
+    public static Object dispatch(Continuation current) {
+        while (true) {
+            try {
+                current = current.succeed();
+            } catch (Break stop) {
+                return current.value;
+            } catch (Throwable tr) {
+                current = current.fail(tr);
+            }
+        }
+    }
+
+    private Object value;
+
+    private Continuation fail(Throwable tr) {
+        return null;
+    }
+
+    private Continuation succeed() throws Throwable {
+        return null;
+    }
+}

Added: branches/advanced/interpreter/org/python/interpreter/BytecodeInterpreter.java
===================================================================
--- branches/advanced/interpreter/org/python/interpreter/BytecodeInterpreter.java	                        (rev 0)
+++ branches/advanced/interpreter/org/python/interpreter/BytecodeInterpreter.java	2008-06-19 09:17:37 UTC (rev 4674)
@@ -0,0 +1,104 @@
+package org.python.interpreter;
+
+import org.python.bytecode.BytecodeVersion;
+import org.python.bytecode.Instruction;
+import org.python.bytecode.RawBytecodeVisitor;
+import org.python.bytecode.VariableContext;
+
+
+public class BytecodeInterpreter implements RawBytecodeVisitor {
+    
+    private final BytecodeVersion version;
+
+    public BytecodeInterpreter(BytecodeVersion version) {
+        this.version = version;
+    }
+
+    public void visitAbsouteJump(int addr) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitContinue(int addr) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitDelete(VariableContext context, int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitDeleteAttribute(int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitForIteration(int delta) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitImportFrom(int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitImportName(int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitInstruction(Instruction instruction) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitJumpIfFalse(int delta) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitJumpIfTrue(int delta) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitLoad(VariableContext context, int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitLoadAttribute(int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitLoadClosure(int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitLoadConstant(int constIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitRelativeJump(int delta) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitSetupExcept(int delta) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitSetupFinally(int delta) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitSetupLoop(int delta) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitStop(Instruction stop) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitStore(VariableContext context, int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitStoreAttribute(int nameIndex) {
+    // TODO Auto-generated method stub
+    }
+
+    public void visitYield() {
+    // TODO Auto-generated method stub
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Jython-checkins] SF.net SVN: jython: [4674] branches/advanced

jython-checkins