Merge remote-tracking branch 'origin/master' into topic/GR-13107

Author: timfel

ci.jsonnet

@@ -251,6 +251,8 @@
     // unittests 
     testGate(type="unittest", platform="linux"),
     testGate(type="unittest", platform="darwin"),
+    testGate(type="svm-unittest", platform="linux"),
+    testGate(type="svm-unittest", platform="darwin"),
 
     // junit 
     testGate(type="junit", platform="linux"),

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

@@ -109,4 +109,14 @@ public int read() throws IOException {
             }
         };
     }
+
+    public int getTerminalWidth() {
+        // deafult value
+        return 80;
+    }
+
+    public int getTerminalHeight() {
+        // default value
+        return 25;
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -247,6 +247,9 @@ protected void launch(Builder contextBuilder) {
 
         ConsoleHandler consoleHandler = createConsoleHandler(System.in, System.out);
         contextBuilder.arguments(getLanguageId(), programArgs.toArray(new String[0])).in(consoleHandler.createInputStream());
+        contextBuilder.option("python.TerminalIsInteractive", Boolean.toString(stdinIsInteractive));
+        contextBuilder.option("python.TerminalWidth", Integer.toString(consoleHandler.getTerminalWidth()));
+        contextBuilder.option("python.TerminalHeight", Integer.toString(consoleHandler.getTerminalHeight()));
 
         int rc = 1;
         try (Context context = contextBuilder.build()) {
@@ -360,7 +363,7 @@ protected void printHelp(OptionCategory maxCategory) {
                         "-B     : don't write .py[co] files on import; also PYTHONDONTWRITEBYTECODE=x\n" +
                         "-c cmd : program passed in as string (terminates option list)\n" +
                         // "-d : debug output from parser; also PYTHONDEBUG=x\n" +
-                        // "-E : ignore PYTHON* environment variables (such as PYTHONPATH)\n" +
+                        "-E     : ignore PYTHON* environment variables (such as PYTHONPATH)\n" +
                         "-h     : print this help message and exit (also --help)\n" +
                         "-i     : inspect interactively after running script; forces a prompt even\n" +
                         "         if stdin does not appear to be a terminal; also PYTHONINSPECT=x\n" +

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

@@ -268,4 +268,15 @@ public String[] getHistory() {
         }
         return result;
     }
+
+    @Override
+    public int getTerminalHeight() {
+        return console.getTerminal().getHeight();
+    }
+
+    @Override
+    public int getTerminalWidth() {
+        return console.getTerminal().getWidth();
+    }
+
 }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -71,6 +71,7 @@
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNode;
 import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
 import com.oracle.graal.python.nodes.expression.CastToBooleanNode.NotNode;
+import com.oracle.graal.python.nodes.expression.ContainsNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.expression.IsNode;
 import com.oracle.graal.python.nodes.expression.OrNode;
@@ -358,9 +359,9 @@ public void parseComparisons() {
         parseAs("x <= y", BinaryComparisonNode.class);
         parseAs("x <> y", BinaryComparisonNode.class);
         parseAs("x != y", BinaryComparisonNode.class);
-        parseAs("x in y", BinaryComparisonNode.class);
+        parseAs("x in y", ContainsNode.class);
         CastToBooleanNode notNode = parseAs("x not in y", CastToBooleanNode.NotNode.class);
-        getChild(notNode, 0, BinaryComparisonNode.class);
+        getChild(notNode, 0, ContainsNode.class);
         parseAs("x is y", IsNode.class);
         notNode = parseAs("x is not y", CastToBooleanNode.NotNode.class);
         getChild(notNode, 0, IsNode.class);

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

@@ -85,3 +85,18 @@ def test_destructuring():
     # TODO not supported yet
 #     a, b, c = "\U0001d49c\U0001d49e\U0001d4b5"
 #     assert a == '𝒜' and b == '𝒞' and c == '𝒵'
+
+
+def test_assigning_hidden_keys():
+    class A():
+        def __init__(self):
+            self.__dict__["xyz"] = 1
+
+    ary = [A(), A(), A(), A(), A(), A()]
+    for a in ary:
+        a.foo = 12
+
+    for a in ary:
+        id(a) # id is stored in a HiddenKey
+
+    return

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

@@ -529,3 +529,8 @@ def test_strip_bytearray():
     assert bytearray(b'abc').strip(b'ac') == b'b'
     assert bytearray(b'abc').lstrip(b'ac') == b'bc'
     assert bytearray(b'abc').rstrip(b'ac') == b'ab'
+
+def test_strip_bytes():
+    assert b'abc'.strip(b'ac') == b'b'
+    assert b'abc'.lstrip(b'ac') == b'bc'
+    assert b'abc'.rstrip(b'ac') == b'ab'

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

@@ -176,6 +176,12 @@ def __len__(self):
     assert set(d.keys()) == key_set, "unexpected keys: %s" % str(d.keys())
     assert set(d.values()) == { 97, 98, 99, 100 }, "unexpected values: %s" % str(d.values())
 
+def test_init_kwargs():
+    kwargs = {'ONE':'one', 'TWO' : 'two'}
+    d = dict([(1,11),(2,22)], **kwargs)
+    assert len(d) == 4, "invalid length, expected 4 but was %d" % len(d)
+    assert set(d.keys()) == {1,2,'ONE','TWO'}, "unexpected keys: %s" % str(d.keys())
+    assert set(d.values()) == { 11, 22, 'one', 'two' }, "unexpected values: %s" % str(d.values())
 
 def test_custom_key_object0():
     class CollisionKey:

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -178,3 +178,46 @@ def func(*args):
     gen = (x for x in range(10))
     assert func(*lst) == set(lst)
     assert func(*gen) == set(lst)
+
+
+def test_generator_cell_confusion():
+    # tfel: this demonstrates various errors we can get when we get confused
+    # about the generator scopes and their parents for eager iterator
+    # evaluation. In fact, all of these should work
+    def unbound_local_l2():
+        l1 = []
+        l2 = []
+        return [
+            link for link in (
+                (url for url in l1),
+                (url for url in l2)
+            )
+        ]
+
+    assert len(unbound_local_l2()) == 2
+
+    def assertion_error_getting_closure_from_locals():
+        l1 = []
+        l2 = []
+        l3 = []
+        return [
+            link for link in (
+                (url for url in l1),
+                (url for url in l2),
+                (url for url in l3),
+            )
+        ]
+
+    assert len(assertion_error_getting_closure_from_locals()) == 3
+
+    def illegal_state_expected_cell_got_list():
+        l11, l1 = [], []
+        l22, l2 = [], []
+        return [
+            link for link in (
+                (url for url in l1),
+                (url for url in l2),
+            )
+        ]
+
+    assert len(illegal_state_expected_cell_got_list()) == 2

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -60,29 +60,29 @@ def test_int_subclassing():
     MAXREPEAT = _NamedIntConstant(1, 'MAXREPEAT')
     assert MAXREPEAT == 1
     assert str(MAXREPEAT) == "MAXREPEAT"
-    
+
 
 def test_boolean2int():
     assert int(True) == 1
     assert int(False) == 0
-    
-    
+
+
 def test_int_from_custom():
     class CustomInt4():
         def __int__(self):
             return 1
-    
+
     class CustomInt8():
         def __int__(self):
             return 0xCAFEBABECAFED00D
-        
+
     class SubInt(int):
         def __int__(self):
             return 0xBADF00D
-        
+
     class NoInt():
         pass
-        
+
     assert int(CustomInt4()) == 1
     assert int(CustomInt8()) == 0xCAFEBABECAFED00D
     assert CustomInt8() != 0xCAFEBABECAFED00D
@@ -124,7 +124,7 @@ def builtinTest(number):
     builtinTest(9)
     builtinTest(6227020800)
     builtinTest(9999992432902008176640000999999)
-    
+
     assert True.__int__() == 1
     assert False.__int__() == 0
 
@@ -161,13 +161,13 @@ def builtinTest(number):
     builtinTest(9)
     builtinTest(6227020800)
     builtinTest(9999992432902008176640000999999)
-    
+
     assert True.real == 1
     assert False.real == 0
     assert True.imag == 0
     assert False.imag == 0
 
-def test_real_imag_subclass():    
+def test_real_imag_subclass():
     def subclassTest(number):
         a = MyInt(number)
         b = a.real
@@ -202,7 +202,7 @@ def builtinTest(number):
     builtinTest(9)
     builtinTest(6227020800)
     builtinTest(9999992432902008176640000999999)
-    
+
     assert True.numerator == 1
     assert False.numerator == 0
     assert True.denominator == 1
@@ -240,7 +240,7 @@ def builtinTest(number):
     builtinTest(9)
     builtinTest(6227020800)
     builtinTest(9999992432902008176640000999999)
-    
+
     assert True.conjugate() == 1
     assert False.conjugate() == 0
 
@@ -282,7 +282,7 @@ def builtinTest(number):
     builtinTest(9)
     builtinTest(6227020800)
     builtinTest(9999992432902008176640000999999)
-    
+
     assert True.__trunc__() == 1
     assert False.__trunc__() == 0
 
@@ -325,7 +325,7 @@ def test_create_int_from_string():
 
 
 class FromBytesTests(unittest.TestCase):
-    
+
     def check(self, tests, byteorder, signed=False):
         for test, expected in tests.items():
             try:
@@ -447,10 +447,10 @@ def test_from_list(self):
         class LyingList(list):
             def __iter__(self):
                 return iter([10, 20, 30, 40])
-        
+
         self.assertEqual(
             int.from_bytes(LyingList([255, 1, 1]), 'big'), 169090600)
-         
+
     def test_from_tuple(self):
         self.assertEqual(
             int.from_bytes((255, 0, 0), 'big', signed=True), -65536)
@@ -464,7 +464,7 @@ def __iter__(self):
                 return iter((15, 25, 35, 45))
         self.assertEqual(
             int.from_bytes(LyingTuple((255, 1, 1)), 'big'), 253305645)
-        
+
     def test_from_bytearray(self):
         self.assertEqual(int.from_bytes(
             bytearray(b'\xff\x00\x00'), 'big', signed=True), -65536)
@@ -487,11 +487,10 @@ def test_wrong_input(self):
         self.assertRaises(TypeError, int.from_bytes, 0, 'big')
         self.assertRaises(TypeError, int.from_bytes, 0, 'big', True)
 
-        #TODO uncoment these tests, when GR-12453 is fixed
-        #self.assertRaises(TypeError, int.from_bytes, "", 'big')
-        #self.assertRaises(TypeError, int.from_bytes, "\x00", 'big')
-        #self.assertRaises(TypeError, MyInt.from_bytes, "", 'big')
-        #self.assertRaises(TypeError, MyInt.from_bytes, "\x00", 'big')
+        self.assertRaises(TypeError, int.from_bytes, "", 'big')
+        self.assertRaises(TypeError, int.from_bytes, "\x00", 'big')
+        self.assertRaises(TypeError, MyInt.from_bytes, "", 'big')
+        self.assertRaises(TypeError, MyInt.from_bytes, "\x00", 'big')
         self.assertRaises(TypeError, MyInt.from_bytes, 0, 'big')
         self.assertRaises(TypeError, int.from_bytes, 0, 'big', True)
 
@@ -550,7 +549,7 @@ class mybyteslike2():
             def __bytes__(self):
                 return array.array('b', [2, 2, 3])
 
-        self.assertRaises(TypeError, int.from_bytes, mybyteslike2(), 'big') 
+        self.assertRaises(TypeError, int.from_bytes, mybyteslike2(), 'big')
 
     def test_from_list_with_byteslike(self):
         class StrangeList(list):
@@ -564,7 +563,7 @@ def __iter__(self):
 class ToBytesTests(unittest.TestCase):
 
     class MyInt(int):
-        pass 
+        pass
 
     def check(self, tests, byteorder, signed=False):
         for test, expected in tests.items():
@@ -634,7 +633,7 @@ def test_SignedLittleEndian(self):
         }
         self.check(tests2, 'little', signed=True)
         self.checkPIntSpec(tests2, 'little', signed=True)
- 
+
     def test_UnsignedBigEndian(self):
         # Convert integers to unsigned big-endian byte arrays.
         tests3 = {
@@ -706,7 +705,5 @@ def __int__(self):
                 return 3
             def __index__(self):
                 return 4
-        
-        self.assertEqual(MyTest(1).to_bytes(MyTest(10), 'big'), b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')
-
 
+        self.assertEqual(MyTest(1).to_bytes(MyTest(10), 'big'), b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01')