comment out lagacy future feature flags

isaiah · isaiah · commit a34e8bfc9d68 · 2016-11-07T11:18:58.000+01:00
diff --git a/src/org/python/Version.java b/src/org/python/Version.java
@@ -46,13 +46,13 @@ public class Version {
 
     /** The flags that are set by default in a code object. */
     private static final Collection<CodeFlag> defaultCodeFlags = Arrays.asList(
-            CodeFlag.CO_NESTED,
-            CodeFlag.CO_GENERATOR_ALLOWED,
-            CodeFlag.CO_FUTURE_WITH_STATEMENT,
-            CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT,
-            CodeFlag.CO_FUTURE_DIVISION,
-            CodeFlag.CO_FUTURE_PRINT_FUNCTION,
-            CodeFlag.CO_FUTURE_UNICODE_LITERALS
+            CodeFlag.CO_NESTED
+//            CodeFlag.CO_GENERATOR_ALLOWED,
+//            CodeFlag.CO_FUTURE_WITH_STATEMENT,
+//            CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT,
+//            CodeFlag.CO_FUTURE_DIVISION,
+//            CodeFlag.CO_FUTURE_PRINT_FUNCTION,
+//            CodeFlag.CO_FUTURE_UNICODE_LITERALS
     );
 
     static {
diff --git a/src/org/python/compiler/CodeCompiler.java b/src/org/python/compiler/CodeCompiler.java
@@ -1761,7 +1761,7 @@ public Object visitBinOp(BinOp node) throws Exception {
                 name = "_matmul";
                 break;
             case Div:
-                name = "_div";
+                name = "_truediv";
                 break;
             case Mod:
                 name = "_mod";
@@ -1789,9 +1789,9 @@ public Object visitBinOp(BinOp node) throws Exception {
                 break;
         }
 
-        if (node.getInternalOp() == operatorType.Div && module.getFutures().areDivisionOn()) {
-            name = "_truediv";
-        }
+//        if (node.getInternalOp() == operatorType.Div && module.getFutures().areDivisionOn()) {
+//            name = "_truediv";
+//        }
         code.invokevirtual(p(PyObject.class), name, sig(PyObject.class, PyObject.class));
         return null;
     }
@@ -1872,9 +1872,9 @@ public Object visitAugAssign(AugAssign node) throws Exception {
                 name = "_ifloordiv";
                 break;
         }
-        if (node.getInternalOp() == operatorType.Div && module.getFutures().areDivisionOn()) {
-            name = "_itruediv";
-        }
+//        if (node.getInternalOp() == operatorType.Div && module.getFutures().areDivisionOn()) {
+//            name = "_itruediv";
+//        }
         code.invokevirtual(p(PyObject.class), name, sig(PyObject.class, PyObject.class));
         code.freeLocal(target);
 
diff --git a/src/org/python/compiler/Future.java b/src/org/python/compiler/Future.java
@@ -54,16 +54,16 @@ private boolean check(ImportFrom cand) throws Exception {
     public void preprocessFutures(mod node, org.python.core.CompilerFlags cflags)
             throws Exception {
         if (cflags != null) {
-            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_DIVISION))
-                FutureFeature.division.addTo(features);
-            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_WITH_STATEMENT))
-                FutureFeature.with_statement.addTo(features);
-            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT))
-                FutureFeature.absolute_import.addTo(features);
-            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_PRINT_FUNCTION))
-                FutureFeature.print_function.addTo(features);
-            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_UNICODE_LITERALS))
-                FutureFeature.unicode_literals.addTo(features);
+//            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_DIVISION))
+//                FutureFeature.division.addTo(features);
+//            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_WITH_STATEMENT))
+//                FutureFeature.with_statement.addTo(features);
+//            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT))
+//                FutureFeature.absolute_import.addTo(features);
+//            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_PRINT_FUNCTION))
+//                FutureFeature.print_function.addTo(features);
+//            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_UNICODE_LITERALS))
+//                FutureFeature.unicode_literals.addTo(features);
         }
         int beg = 0;
         List<stmt> suite = null;
@@ -102,15 +102,15 @@ public static void checkFromFuture(ImportFrom node) throws Exception {
         node.from_future_checked = true;
     }
 
-    public boolean areDivisionOn() {
-        return featureSet.contains(FutureFeature.division);
-    }
-
-    public boolean withStatementSupported() {
-        return featureSet.contains(FutureFeature.with_statement);
-    }
+//    public boolean areDivisionOn() {
+//        return featureSet.contains(FutureFeature.division);
+//    }
 
-    public boolean isAbsoluteImportOn() {
-        return featureSet.contains(FutureFeature.absolute_import);
-    }
+//    public boolean withStatementSupported() {
+//        return featureSet.contains(FutureFeature.with_statement);
+//    }
+//
+//    public boolean isAbsoluteImportOn() {
+//        return featureSet.contains(FutureFeature.absolute_import);
+//    }
 }
diff --git a/src/org/python/compiler/Module.java b/src/org/python/compiler/Module.java
@@ -265,7 +265,6 @@ class PyCodeConstant extends Constant implements ClassConstants, Opcodes {
     PyCodeConstant(mod tree, String name, boolean fast_locals, String className, boolean classBody,
             boolean printResults, int firstlineno, ScopeInfo scope, CompilerFlags cflags,
             Module module) throws Exception {
-
         this.co_name = name;
         this.co_firstlineno = firstlineno;
         this.module = module;
@@ -317,22 +316,30 @@ class PyCodeConstant extends Constant implements ClassConstants, Opcodes {
         jy_npurecell = scope.jy_npurecell;
 
         if (CodeCompiler.checkOptimizeGlobals(fast_locals, scope)) {
-            _moreflags |= CodeFlag.CO_OPTIMIZED.flag;
+            _moreflags |= CodeFlag.CO_OPTIMIZED.flag | CodeFlag.CO_NEWLOCALS.flag;
+        }
+
+        if (scope.isNested()) {
+            _moreflags |= CodeFlag.CO_NESTED.flag;
+        }
+
+        if (scope.freevars.isEmpty() && scope.cellvars.isEmpty()) {
+            _moreflags |= CodeFlag.CO_NOFREE.flag;
         }
 
         if (scope.async) {
             _moreflags |= CodeFlag.CO_COROUTINE.flag;
         } else if (scope.generator) {
             _moreflags |= CodeFlag.CO_GENERATOR.flag;
         }
-        if (cflags != null) {
-            if (cflags.isFlagSet(CodeFlag.CO_GENERATOR_ALLOWED)) {
-                _moreflags |= CodeFlag.CO_GENERATOR_ALLOWED.flag;
-            }
-            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_DIVISION)) {
-                _moreflags |= CodeFlag.CO_FUTURE_DIVISION.flag;
-            }
-        }
+//        if (cflags != null) {
+//            if (cflags.isFlagSet(CodeFlag.CO_GENERATOR_ALLOWED)) {
+//                _moreflags |= CodeFlag.CO_GENERATOR_ALLOWED.flag;
+//            }
+//            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_DIVISION)) {
+//                _moreflags |= CodeFlag.CO_FUTURE_DIVISION.flag;
+//            }
+//        }
         moreflags = _moreflags;
     }
 
@@ -437,7 +444,6 @@ void put(Code c) throws IOException {
     }
 }
 
-
 public class Module implements Opcodes, ClassConstants, CompilationContext {
 
     ClassFile classfile;
diff --git a/src/org/python/compiler/ScopeInfo.java b/src/org/python/compiler/ScopeInfo.java
@@ -314,4 +314,8 @@ public void noteReturnValue() {
     public boolean isFunction() {
         return kind == FUNCSCOPE;
     }
+
+    public boolean isNested() {
+        return isFunction() && up.isFunction();
+    }
 }
diff --git a/src/org/python/core/CodeFlag.java b/src/org/python/core/CodeFlag.java
@@ -34,6 +34,11 @@ public enum CodeFlag {
      * Denotes that nested scopes are enabled in the code block.
      */
     CO_NESTED(0x0010),
+
+    /**
+     * The flag is set if there are no free or cell variables.
+     */
+    CO_NOFREE(0x0040),
     /**
      *  The CO_COROUTINE flag is set for coroutine functions (defined with
      *  ``async def`` keywords)
diff --git a/src/org/python/core/CompilerFlags.java b/src/org/python/core/CompilerFlags.java
@@ -7,6 +7,7 @@
 package org.python.core;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 
 import org.python.Version;
@@ -21,7 +22,8 @@ public class CompilerFlags implements Serializable {
     public boolean source_is_utf8;
 
     public String encoding;
-    private final Set<CodeFlag> flags = Version.getDefaultCodeFlags();
+//    private final Set<CodeFlag> flags = Version.getDefaultCodeFlags();
+    private final Set<CodeFlag> flags = new HashSet<>();
 
     public CompilerFlags() {
     }
@@ -60,16 +62,17 @@ public boolean isFlagSet(CodeFlag flag) {
     @Override
     public String toString() {
         return String.format(
-                "CompilerFlags[division=%s nested_scopes=%s generators=%s "
-                        + "with_statement=%s absolute_import=%s only_ast=%s "
-                        + "dont_imply_dedent=%s  source_is_utf8=%s]",
-                isFlagSet(CodeFlag.CO_FUTURE_DIVISION),
+                "CompilerFlags[nested_scopes=%s only_ast=%s dont_imply_dedent=%s source_is_utf8=%s]",
+//                "CompilerFlags[division=%s nested_scopes=%s generators=%s "
+//                        + "with_statement=%s absolute_import=%s only_ast=%s "
+//                        + "dont_imply_dedent=%s  source_is_utf8=%s]",
+//                isFlagSet(CodeFlag.CO_FUTURE_DIVISION),
                 isFlagSet(CodeFlag.CO_NESTED),
-                isFlagSet(CodeFlag.CO_GENERATOR_ALLOWED),
-                isFlagSet(CodeFlag.CO_FUTURE_WITH_STATEMENT),
-                isFlagSet(CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT),
-                isFlagSet(CodeFlag.CO_FUTURE_PRINT_FUNCTION),
-                isFlagSet(CodeFlag.CO_FUTURE_UNICODE_LITERALS),
+//                isFlagSet(CodeFlag.CO_GENERATOR_ALLOWED),
+//                isFlagSet(CodeFlag.CO_FUTURE_WITH_STATEMENT),
+//                isFlagSet(CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT),
+//                isFlagSet(CodeFlag.CO_FUTURE_PRINT_FUNCTION),
+//                isFlagSet(CodeFlag.CO_FUTURE_UNICODE_LITERALS),
                 only_ast,
                 dont_imply_dedent,
                 source_is_utf8);
@@ -82,13 +85,13 @@ public static CompilerFlags getCompilerFlags() {
     private static final int CO_ALL_FEATURES = CompilerFlags.PyCF_DONT_IMPLY_DEDENT
             | CompilerFlags.PyCF_ONLY_AST
             | CompilerFlags.PyCF_SOURCE_IS_UTF8
-            | CodeFlag.CO_NESTED.flag
-            | CodeFlag.CO_GENERATOR_ALLOWED.flag
-            | CodeFlag.CO_FUTURE_DIVISION.flag
-            | CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT.flag
-            | CodeFlag.CO_FUTURE_WITH_STATEMENT.flag
-            | CodeFlag.CO_FUTURE_PRINT_FUNCTION.flag
-            | CodeFlag.CO_FUTURE_UNICODE_LITERALS.flag;
+            | CodeFlag.CO_NESTED.flag;
+//            | CodeFlag.CO_GENERATOR_ALLOWED.flag
+//            | CodeFlag.CO_FUTURE_DIVISION.flag
+//            | CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT.flag
+//            | CodeFlag.CO_FUTURE_WITH_STATEMENT.flag
+//            | CodeFlag.CO_FUTURE_PRINT_FUNCTION.flag
+//            | CodeFlag.CO_FUTURE_UNICODE_LITERALS.flag;
 
     public static CompilerFlags getCompilerFlags(int flags, PyFrame frame) {
         if ((flags & ~CO_ALL_FEATURES) != 0) {
diff --git a/src/org/python/core/FutureFeature.java b/src/org/python/core/FutureFeature.java
@@ -6,31 +6,31 @@ public enum FutureFeature implements Pragma {
     /**
      * Enables nested scopes.
      */
-    nested_scopes(CodeFlag.CO_NESTED),
+//    nested_scopes(CodeFlag.CO_NESTED),
     /**
      * Makes integer / integer division return float.
      */
-    division(CodeFlag.CO_FUTURE_DIVISION),
+//    division(CodeFlag.CO_FUTURE_DIVISION),
     /**
      * Enables generators.
      */
-    generators(CodeFlag.CO_GENERATOR_ALLOWED),
+//    generators(CodeFlag.CO_GENERATOR_ALLOWED),
     /**
      * Enables absolute imports.
      */
-    absolute_import(CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT),
+//    absolute_import(CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT),
     /**
      * Enables the with statement.
      */
-    with_statement(CodeFlag.CO_FUTURE_WITH_STATEMENT),
+//    with_statement(CodeFlag.CO_FUTURE_WITH_STATEMENT),
     /**
      * Enables the print function.
      */
-    print_function(CodeFlag.CO_FUTURE_PRINT_FUNCTION),
+//    print_function(CodeFlag.CO_FUTURE_PRINT_FUNCTION),
     /**
      * Enables unicode literals.
      */
-    unicode_literals(CodeFlag.CO_FUTURE_UNICODE_LITERALS),
+//    unicode_literals(CodeFlag.CO_FUTURE_UNICODE_LITERALS),
     /**
      * Use braces for block delimiters instead of indentation.
      */
diff --git a/src/org/python/core/PyBytecode.java b/src/org/python/core/PyBytecode.java
@@ -432,12 +432,7 @@ protected PyObject interpret(PyFrame f, ThreadState ts) {
                     case Opcode.BINARY_DIVIDE: {
                         PyObject b = stack.pop();
                         PyObject a = stack.pop();
-
-                        if (!co_flags.isFlagSet(CodeFlag.CO_FUTURE_DIVISION)) {
-                            stack.push(a._div(b));
-                        } else {
-                            stack.push(a._truediv(b));
-                        }
+                        stack.push(a._truediv(b));
                         break;
                     }
 
@@ -543,11 +538,7 @@ protected PyObject interpret(PyFrame f, ThreadState ts) {
                     case Opcode.INPLACE_DIVIDE: {
                         PyObject b = stack.pop();
                         PyObject a = stack.pop();
-                        if (!co_flags.isFlagSet(CodeFlag.CO_FUTURE_DIVISION)) {
-                            stack.push(a._idiv(b));
-                        } else {
-                            stack.push(a._itruediv(b));
-                        }
+                        stack.push(a._itruediv(b));
                         break;
                     }
 
diff --git a/src/org/python/util/jython.java b/src/org/python/util/jython.java
@@ -294,7 +294,7 @@ public static void run(String[] args) {
                 Options.division_warning = 2;
             } else if ("new".equals(opts.division)) {
                 Options.Qnew = true;
-                interp.cflags.setFlag(CodeFlag.CO_FUTURE_DIVISION);
+//                interp.cflags.setFlag(CodeFlag.CO_FUTURE_DIVISION);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -314,4 +314,8 @@ public void noteReturnValue() {`
`314`	`314`	`public boolean isFunction() {`
`315`	`315`	`return kind == FUNCSCOPE;`
`316`	`316`	`}`
	`317`	`+`
	`318`	`+ public boolean isNested() {`
	`319`	`+ return isFunction() && up.isFunction();`
	`320`	`+ }`
`317`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ public static void run(String[] args) {`
`294`	`294`	`Options.division_warning = 2;`
`295`	`295`	`} else if ("new".equals(opts.division)) {`
`296`	`296`	`Options.Qnew = true;`
`297`		`- interp.cflags.setFlag(CodeFlag.CO_FUTURE_DIVISION);`
	`297`	`+// interp.cflags.setFlag(CodeFlag.CO_FUTURE_DIVISION);`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`