handle more data types in PosixModuleBuiltins

Author: lukasstadler

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

@@ -81,6 +81,7 @@
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
+import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
@@ -94,6 +95,7 @@
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.profiles.ValueProfile;
 
 @CoreFunctions(defineModule = "posix")
@@ -373,6 +375,7 @@ Object setInheritable(int fd, @SuppressWarnings("unused") Object inheritable) {
 
     @Builtin(name = "stat", minNumOfArguments = 1, maxNumOfArguments = 2)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class StatNode extends PythonBinaryBuiltinNode {
         private static final int S_IFIFO = 0010000;
         private static final int S_IFCHR = 0020000;
@@ -507,6 +510,7 @@ protected static StatNode create() {
 
     @Builtin(name = "listdir", fixedNumOfArguments = 1)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class ListdirNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
@@ -533,16 +537,24 @@ Object listdir(String path) {
 
     @Builtin(name = "dup", fixedNumOfArguments = 1)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class DupNode extends PythonFileNode {
         @Specialization
         @TruffleBoundary
         int dup(int fd) {
             return dupFile(fd);
         }
+
+        @Specialization
+        @TruffleBoundary
+        int dup(PInt fd) {
+            return dupFile(fd.intValue());
+        }
     }
 
     @Builtin(name = "open", minNumOfArguments = 2, maxNumOfArguments = 4, keywordArguments = {"mode", "dir_fd"})
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class OpenNode extends PythonFileNode {
         @Specialization(guards = {"isNoValue(mode)", "isNoValue(dir_fd)"})
         Object open(String pathname, int flags, @SuppressWarnings("unused") PNone mode, PNone dir_fd) {
@@ -601,6 +613,7 @@ Object open(String pathname, int flags, int fileMode, @SuppressWarnings("unused"
 
     @Builtin(name = "lseek", fixedNumOfArguments = 3)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class LseekNode extends PythonFileNode {
         @Specialization
         @TruffleBoundary
@@ -647,6 +660,7 @@ Object close(int fd) {
 
     @Builtin(name = "unlink", fixedNumOfArguments = 1)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class UnlinkNode extends PythonFileNode {
         @Specialization
         @TruffleBoundary
@@ -672,6 +686,7 @@ public abstract static class RmdirNode extends UnlinkNode {
 
     @Builtin(name = "mkdir", fixedNumOfArguments = 1, keywordArguments = {"mode", "dir_fd"})
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class MkdirNode extends PythonFileNode {
         @Specialization
         Object mkdir(String path, @SuppressWarnings("unused") PNone mode, PNone dirFd) {
@@ -692,6 +707,7 @@ Object mkdir(String path, @SuppressWarnings("unused") int mode, @SuppressWarning
 
     @Builtin(name = "write", fixedNumOfArguments = 2)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class WriteNode extends PythonFileNode {
 
         public abstract Object executeWith(Object fd, Object data);
@@ -736,16 +752,6 @@ Object writeStd(int fd, String data) {
             return writeStd(fd, data.getBytes());
         }
 
-        @Specialization(guards = "fd == 0 || fd > 2")
-        Object write(int fd, PString data) {
-            return write(fd, data.getValue());
-        }
-
-        @Specialization(guards = {"fd <= 2", "fd > 0"})
-        Object writeStd(int fd, PString data) {
-            return writeStd(fd, data.getValue());
-        }
-
         @Specialization(guards = "fd == 0 || fd > 2")
         @TruffleBoundary
         Object write(int fd, PBytes data) {
@@ -783,6 +789,7 @@ protected WriteNode create() {
 
     @Builtin(name = "read", fixedNumOfArguments = 2)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class ReadNode extends PythonFileNode {
         @Specialization
         @TruffleBoundary
@@ -804,6 +811,7 @@ Object read(int fd, long requestedSize) {
 
     @Builtin(name = "isatty", fixedNumOfArguments = 1)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class IsATTYNode extends PythonBuiltinNode {
         @Specialization
         boolean isATTY(int fd) {
@@ -821,6 +829,7 @@ boolean isATTY(int fd) {
 
     @Builtin(name = "_exit", fixedNumOfArguments = 1)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class ExitNode extends PythonBuiltinNode {
         @TruffleBoundary
         @Specialization
@@ -831,6 +840,7 @@ Object exit(int status) {
 
     @Builtin(name = "chmod", minNumOfArguments = 2, keywordArguments = {"dir_fd", "follow_symlinks"})
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class ChmodNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
@@ -856,6 +866,7 @@ Object chmod(Object path, Object mode, Object dir_fd, Object follow_symlinks) {
 
     @Builtin(name = "utime", minNumOfArguments = 1, keywordArguments = {"times", "ns", "dir_fd", "follow_symlinks"})
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class UtimeNode extends PythonBuiltinNode {
         @SuppressWarnings("unused")
         @Specialization
@@ -959,6 +970,7 @@ private void setAtime(String path, long mtime) {
     // FIXME: this is not nearly ready, just good enough for now
     @Builtin(name = "system", fixedNumOfArguments = 1)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class SystemNode extends PythonBuiltinNode {
         static final String[] shell = System.getProperty("os.name").toLowerCase().startsWith("windows") ? new String[]{"cmd.exe", "/c"}
                         : new String[]{(System.getenv().getOrDefault("SHELL", "sh")), "-c"};
@@ -1106,6 +1118,7 @@ public abstract static class ReplaceNode extends RenameNode {
 
     @Builtin(name = "urandom", fixedNumOfArguments = 1)
     @GenerateNodeFactory
+    @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class URandomNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary