[GR-15799] Fix isUpper/isLower to behave more like the python equivalent

PullRequest: graalpython/515

Author: timfel

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

@@ -541,6 +541,8 @@ def test_islower(self):
         self.checkequal(True, 'abc', 'islower')
         self.checkequal(False, 'aBc', 'islower')
         self.checkequal(True, 'abc\n', 'islower')
+        self.checkequal(True, 'a_b!c\n', 'islower')
+        self.checkequal(False, 'A_b!c\n', 'islower')
         self.checkraises(TypeError, 'abc', 'islower', 42)
         self.checkequalnofix(False, '\u1FFc', 'islower')
         self.assertFalse('\u2167'.islower())
@@ -563,6 +565,8 @@ def test_isupper(self):
         self.checkequal(True, 'ABC', 'isupper')
         self.checkequal(False, 'AbC', 'isupper')
         self.checkequal(True, 'ABC\n', 'isupper')
+        self.checkequal(True, 'A_B!C\n', 'isupper')
+        self.checkequal(False, 'a_B!C\n', 'isupper')
         self.checkraises(TypeError, 'abc', 'isupper', 42)
         if not sys.platform.startswith('java'):
             self.checkequalnofix(False, '\u1FFc', 'isupper')

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

@@ -53,8 +53,10 @@
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.nodes.util.CastToIndexNode;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -77,18 +79,21 @@ Object socket(LazyPythonClass cls, @SuppressWarnings("unused") PNone family, @Su
         }
 
         @Specialization(guards = {"isNoValue(type)", "isNoValue(proto)", "isNoValue(fileno)"})
-        Object socket(LazyPythonClass cls, int family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno) {
-            return createSocketInternal(cls, family, PSocket.SOCK_STREAM, 0);
+        Object socket(LazyPythonClass cls, Object family, @SuppressWarnings("unused") PNone type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno,
+                        @Cached CastToIndexNode cast) {
+            return createSocketInternal(cls, cast.execute(family), PSocket.SOCK_STREAM, 0);
         }
 
         @Specialization(guards = {"isNoValue(proto)", "isNoValue(fileno)"})
-        Object socket(LazyPythonClass cls, int family, int type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno) {
-            return createSocketInternal(cls, family, type, 0);
+        Object socket(LazyPythonClass cls, Object family, Object type, @SuppressWarnings("unused") PNone proto, @SuppressWarnings("unused") PNone fileno,
+                        @Cached CastToIndexNode cast) {
+            return createSocketInternal(cls, cast.execute(family), cast.execute(type), 0);
         }
 
         @Specialization(guards = {"isNoValue(fileno)"})
-        Object socket(LazyPythonClass cls, int family, int type, int proto, @SuppressWarnings("unused") PNone fileno) {
-            return createSocketInternal(cls, family, type, proto);
+        Object socket(LazyPythonClass cls, Object family, Object type, Object proto, @SuppressWarnings("unused") PNone fileno,
+                        @Cached CastToIndexNode cast) {
+            return createSocketInternal(cls, cast.execute(family), cast.execute(type), cast.execute(proto));
         }
 
         private Object createSocketInternal(LazyPythonClass cls, int family, int type, int proto) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -1713,21 +1713,21 @@ abstract static class IsLowerNode extends PythonUnaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         boolean doString(String self) {
-            int spaces = 0;
+            int uncased = 0;
             if (self.length() == 0) {
                 return false;
             }
             for (int i = 0; i < self.length(); i++) {
                 int codePoint = self.codePointAt(i);
                 if (!Character.isLowerCase(codePoint)) {
-                    if (Character.isWhitespace(codePoint)) {
-                        spaces++;
+                    if (Character.toLowerCase(codePoint) == Character.toUpperCase(codePoint)) {
+                        uncased++;
                     } else {
                         return false;
                     }
                 }
             }
-            return spaces == 0 || self.length() > spaces;
+            return uncased == 0 || self.length() > uncased;
         }
     }
 
@@ -1827,21 +1827,21 @@ abstract static class IsUpperNode extends PythonUnaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         boolean doString(String self) {
-            int spaces = 0;
+            int uncased = 0;
             if (self.length() == 0) {
                 return false;
             }
             for (int i = 0; i < self.length(); i++) {
                 int codePoint = self.codePointAt(i);
                 if (!Character.isUpperCase(codePoint)) {
-                    if (Character.isWhitespace(codePoint)) {
-                        spaces++;
+                    if (Character.toLowerCase(codePoint) == Character.toUpperCase(codePoint)) {
+                        uncased++;
                     } else {
                         return false;
                     }
                 }
             }
-            return spaces == 0 || self.length() > spaces;
+            return uncased == 0 || self.length() > uncased;
 
         }
     }