Merge remote-tracking branch 'origin/master' into tim/numpy-building

Author: timfel

graalpython/com.oracle.graal.python.cext/include/pyfpe.h

@@ -1,11 +1,6 @@
-#ifndef Py_PYFPE_H
-#define Py_PYFPE_H
-#ifdef __cplusplus
-extern "C" {
-#endif
 /*
      ---------------------------------------------------------------------
-    /                       Copyright (c) 1996.                           \
+    /                       Copyright (c) 1996, 2018.                      \
    |          The Regents of the University of California.                 |
    |                        All rights reserved.                           |
    |                                                                       |
@@ -41,6 +36,11 @@ extern "C" {
      ---------------------------------------------------------------------
 */
 
+#ifndef Py_PYFPE_H
+#define Py_PYFPE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*
  *       Define macros for handling SIGFPE.
  *       Lee Busby, LLNL, November, 1996

graalpython/com.oracle.graal.python.cext/src/ceval.c

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ *     one is included with the Software (each a "Larger Work" to which the
+ *     Software is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "capi.h"
+
+#ifndef Py_DEFAULT_RECURSION_LIMIT
+#define Py_DEFAULT_RECURSION_LIMIT 1000
+#endif
+int _Py_CheckRecursionLimit = Py_DEFAULT_RECURSION_LIMIT;
+

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -65,6 +65,7 @@ public static void main(String[] args) {
     private String commandString = null;
     private String inputFile = null;
     private boolean inspectFlag = false;
+    private boolean verboseFlag = false;
     private boolean runCC = false;
     private boolean runLD = false;
     private VersionAction versionAction = VersionAction.None;
@@ -81,6 +82,9 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
                 case "-B":
                     System.out.println("Warning: " + arg + " does nothing on GraalPython.");
                     break;
+                case "-v":
+                    verboseFlag = true;
+                    break;
                 case "-V":
                 case "--version":
                     versionAction = VersionAction.PrintAndExit;
@@ -160,7 +164,10 @@ protected void launch(Builder contextBuilder) {
         // to print Python exceptions
         contextBuilder.option("python.AlwaysRunExcepthook", "true");
         if (inspectFlag) {
-            contextBuilder.option("python.PythonInspectFlag", "true");
+            contextBuilder.option("python.InspectFlag", "true");
+        }
+        if (verboseFlag) {
+            contextBuilder.option("python.VerboseFlag", "true");
         }
 
         ConsoleHandler consoleHandler = createConsoleHandler(System.in, System.out);

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -39,13 +39,18 @@
 package com.oracle.graal.python.tck;
 
 import static org.graalvm.polyglot.tck.TypeDescriptor.ANY;
+import static org.graalvm.polyglot.tck.TypeDescriptor.ARRAY;
 import static org.graalvm.polyglot.tck.TypeDescriptor.BOOLEAN;
+import static org.graalvm.polyglot.tck.TypeDescriptor.EXECUTABLE;
+import static org.graalvm.polyglot.tck.TypeDescriptor.HOST_OBJECT;
+import static org.graalvm.polyglot.tck.TypeDescriptor.NATIVE_POINTER;
 import static org.graalvm.polyglot.tck.TypeDescriptor.NULL;
 import static org.graalvm.polyglot.tck.TypeDescriptor.NUMBER;
 import static org.graalvm.polyglot.tck.TypeDescriptor.OBJECT;
 import static org.graalvm.polyglot.tck.TypeDescriptor.STRING;
 import static org.graalvm.polyglot.tck.TypeDescriptor.array;
 import static org.graalvm.polyglot.tck.TypeDescriptor.executable;
+import static org.graalvm.polyglot.tck.TypeDescriptor.intersection;
 import static org.graalvm.polyglot.tck.TypeDescriptor.union;
 
 import java.io.IOException;
@@ -100,6 +105,8 @@ private static void addStatementSnippet(Context context, List<Snippet> snippets,
 
     public Collection<? extends Snippet> createValueConstructors(Context context) {
         List<Snippet> snippets = new ArrayList<>();
+        final TypeDescriptor noType = intersection();
+        final TypeDescriptor allTypes = intersection(noType, NULL, BOOLEAN, NUMBER, STRING, HOST_OBJECT, NATIVE_POINTER, OBJECT, ARRAY, EXECUTABLE);
         // @formatter:off
         addValueSnippet(context, snippets, "BooleanType:True",  BOOLEAN,    "lambda: True");
         addValueSnippet(context, snippets, "BooleanType:False", BOOLEAN,    "lambda: False");
@@ -108,11 +115,11 @@ public Collection<? extends Snippet> createValueConstructors(Context context) {
         addValueSnippet(context, snippets, "FloatType",         NUMBER,     "lambda: 1.1");
         addValueSnippet(context, snippets, "ComplexType",       OBJECT,     "lambda: 1.0j");
         addValueSnippet(context, snippets, "StringType",        STRING,     "lambda: 'spam'");
-        addValueSnippet(context, snippets, "TupleType:Empty",   array(NULL),                    "lambda: ()");
+        addValueSnippet(context, snippets, "TupleType:Empty",   array(allTypes),                     "lambda: ()");
         addValueSnippet(context, snippets, "TupleType:Number",  array(NUMBER),                  "lambda: (1, 2.1)");
         addValueSnippet(context, snippets, "TupleType:String",  array(STRING),                  "lambda: ('foo', 'bar')");
         addValueSnippet(context, snippets, "TupleType:Mixed",   array(union(NUMBER, STRING)),   "lambda: ('foo', 1)");
-        addValueSnippet(context, snippets, "ListType:Empty",    array(NULL),                    "lambda: []");
+        addValueSnippet(context, snippets, "ListType:Empty",    array(allTypes),                     "lambda: []");
         addValueSnippet(context, snippets, "ListType:Number",   array(NUMBER),                  "lambda: [1, 2.1]");
         addValueSnippet(context, snippets, "ListType:String",   array(STRING),                  "lambda: ['foo', 'bar']");
         addValueSnippet(context, snippets, "ListType:Mixed",    array(union(NUMBER, STRING)),   "lambda: ['foo', 1]");

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_long.py

@@ -219,7 +219,7 @@ def compile_module(self, name):
         ),
         resultspec="O",
         argspec='n',
-        arguments=["Py_ssize_t n"],
+        arguments=["void* ptr"],
         cmpfunc=unhandled_error_compare
     )
 

graalpython/com.oracle.graal.python.test/src/tests/list_tests.py

@@ -8,7 +8,7 @@
 
 import sys
 import os
-#from functools import cmp_to_key
+from functools import cmp_to_key
 import seq_tests
 #from test import support
 
@@ -489,8 +489,6 @@ def test_copy(self):
 
         self.assertRaises(TypeError, u.copy, None)
 
-    # TODO cmp_to_key is not available yet
-    '''
     def test_sort(self):
         u = self.type2test([1, 0])
         u.sort()
@@ -538,7 +536,6 @@ def selfmodifyingComparison(x,y):
                           key=cmp_to_key(selfmodifyingComparison))
 
         self.assertRaises(TypeError, z.sort, 42, 42, 42, 42)
-    '''
 
     def test_slice(self):
         u = self.type2test("spam")

graalpython/com.oracle.graal.python.test/src/tests/test_issubclass.py

@@ -164,3 +164,13 @@ def test_subclass_tuple():
 
     assert issubclass(int, (int, (float, int)))
     assert issubclass(str, (str, (Child, str)))
+
+
+def test_abstract_numbers_issubclass():
+    from numbers import Number, Integral, Complex, Real
+    assert issubclass(int, Number)
+    assert issubclass(int, Integral)
+    assert issubclass(int, Complex)
+
+    assert not issubclass(complex, Real)
+    assert issubclass(complex, Complex)

graalpython/com.oracle.graal.python.test/src/tests/test_set.py

@@ -53,3 +53,10 @@ def test_set_or():
 
     union = s1 | s4
     assert union == {1, 2, 3}
+
+
+def test_set_remove():
+    s = {1, 2, 3}
+    assert s == {1, 2, 3}
+    s.remove(3)
+    assert s == {1, 2}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -26,6 +26,7 @@
 package com.oracle.graal.python;
 
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 
 import org.graalvm.options.OptionDescriptors;
@@ -117,7 +118,13 @@ private static boolean optionsAllowPreInitializedContext(PythonContext context,
         // Verify that the option for using a shared core is the same as
         // at image building time
         final boolean useSharedCore = newEnv.getOptions().get(PythonOptions.SharedCore);
-        return context.getCore().hasSingletonContext() == !useSharedCore;
+        boolean canUsePreinitializedContext = context.getCore().hasSingletonContext() == !useSharedCore;
+        if (canUsePreinitializedContext) {
+            PythonCore.writeInfo(newEnv, "Using preinitialized context.");
+        } else {
+            PythonCore.writeInfo(newEnv, "Not using preinitialized context.");
+        }
+        return canUsePreinitializedContext;
     }
 
     @Override
@@ -137,6 +144,12 @@ private void ensureHomeInOptions(Env env) {
         String coreHome = env.getOptions().get(PythonOptions.CoreHome);
         String stdLibHome = env.getOptions().get(PythonOptions.StdLibHome);
 
+        PythonCore.writeInfo(env, (MessageFormat.format("Initial locations:" +
+                        "\n\tLanguage home: {0}" +
+                        "\n\tSysPrefix: {1}" +
+                        "\n\tCoreHome: {2}" +
+                        "\n\tStdLibHome: {3}", languageHome, sysPrefix, coreHome, stdLibHome)));
+
         TruffleFile home = null;
         if (languageHome != null) {
             home = env.getTruffleFile(languageHome);
@@ -187,6 +200,12 @@ private void ensureHomeInOptions(Env env) {
                 }
                 env.getOptions().set(PythonOptions.StdLibHome, stdLibHome);
             }
+
+            PythonCore.writeInfo(env, (MessageFormat.format("Updated locations:" +
+                            "\n\tLanguage home: {0}" +
+                            "\n\tSysPrefix: {1}" +
+                            "\n\tCoreHome: {2}" +
+                            "\n\tStdLibHome: {3}", home.getPath(), sysPrefix, coreHome, stdLibHome)));
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -731,11 +731,6 @@ private boolean isInstanceCheckInternal(Object derived, Object cls) {
 
         public abstract boolean executeWith(Object derived, Object cls);
 
-        @Specialization
-        public boolean isSubclassType(Object derived, PythonClass cls) {
-            return derived == cls || isSubtypeNode.execute(derived, cls);
-        }
-
         @Specialization(guards = "clsTuple.len() == cachedLen", limit = "getVariableArgumentInlineCacheLimit()")
         @ExplodeLoop
         public boolean isSubclassTupleConstantLen(Object derived, PTuple clsTuple,