Implement popen, fix createDirectories, shorten function name for 0.4.0

Author: mmhelloworld

idris-jvm-assembler/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.mmhelloworld</groupId>
         <artifactId>idris-jvm</artifactId>
-        <version>0.3.0</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

idris-jvm-assembler/src/main/java/io/github/mmhelloworld/idrisjvm/assembler/IdrisName.java

@@ -22,13 +22,13 @@ public final class IdrisName {
     private static final Map<Character, String> replacements = new HashMap<>();
 
     static {
-        replacements.put(' ', "$spc");
+        replacements.put(' ', "$s");
         replacements.put('!', "$not");
-        replacements.put('"', "$dquo");
+        replacements.put('"', "$dq");
         replacements.put('#', "$hash");
         replacements.put('%', "$mod");
         replacements.put('&', "$and");
-        replacements.put('\'', "$squo");
+        replacements.put('\'', "$q");
         replacements.put('(', "$lpar");
         replacements.put(')', "$rpar");
         replacements.put('*', "$mul");

idris-jvm-compiler/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.mmhelloworld</groupId>
         <artifactId>idris-jvm</artifactId>
-        <version>0.3.0</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

idris-jvm-runtime/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.mmhelloworld</groupId>
         <artifactId>idris-jvm</artifactId>
-        <version>0.3.0</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/ChannelIo.java

@@ -2,10 +2,12 @@
 
 import java.io.Closeable;
 import java.io.EOFException;
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channel;
+import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SeekableByteChannel;
@@ -27,6 +29,7 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import static io.github.mmhelloworld.idrisjvm.runtime.Directories.workingDir;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.attribute.PosixFilePermission.GROUP_EXECUTE;
 import static java.nio.file.attribute.PosixFilePermission.GROUP_READ;
@@ -120,6 +123,14 @@ public static ChannelIo open(String name, String mode) {
         }
     }
 
+    public static ChannelIo popen(String command, String mode) throws IOException {
+        Process process = new ProcessBuilder(IdrisSystem.getCommand(command))
+            .directory(new File(workingDir))
+            .start();
+        return new ChannelIo(null, new ReadableWritableChannel(Channels.newChannel(process.getInputStream()),
+            Channels.newChannel(process.getOutputStream())));
+    }
+
     public static void close(ChannelIo file) {
         file.close();
     }
@@ -129,17 +140,17 @@ public static int chmod(String file, int mode) {
             .chmod(mode);
     }
 
-    public static void createDirectories(Path dirPath) throws IOException {
-        if (dirPath != null) {
-            java.nio.file.Files.createDirectories(dirPath);
+    public static void createDirectories(Path path) throws IOException {
+        if (path != null && (!Files.isSymbolicLink(path) || !Files.exists(path))) {
+            Files.createDirectories(path);
         }
     }
 
     public static void writeFile(String pathString, String content) throws IOException {
         Path path = Paths.createPath(pathString);
         byte[] bytes = content.getBytes(UTF_8);
         createDirectories(path.getParent());
-        java.nio.file.Files.write(path, bytes);
+        Files.write(path, bytes);
     }
 
     public static int flush(ChannelIo file) {
@@ -334,9 +345,7 @@ public int write(ByteBuffer src) throws IOException {
     }
 
     private static ChannelIo open(Path path, OpenOption... openOptions) throws IOException {
-        if (path.getParent() != null) {
-            java.nio.file.Files.createDirectories(path.getParent());
-        }
+        ensureParentDirectory(path);
         return new ChannelIo(path, FileChannel.open(path, openOptions));
     }
 

idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/Directories.java

@@ -82,7 +82,7 @@ public static void closeDirectory(Object directory) {
     public static Object getNextDirectoryEntry(Object directory) {
         Iterator<Path> iterator = ((Directory) directory).getIterator();
         if (iterator.hasNext()) {
-            return iterator.next().toString();
+            return iterator.next().getFileName().toString();
         } else {
             Runtime.setErrorNumber(2);
             return null;

idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/IdrisSystem.java

@@ -100,15 +100,7 @@ public static Object malloc(int length) {
         return new byte[length];
     }
 
-    private static String getOsNameProperty() {
-        try {
-            return System.getProperty("os.name").toLowerCase(Locale.ROOT);
-        } catch (SecurityException exception) {
-            return "";
-        }
-    }
-
-    private static String[] getCommand(String command) {
+    public static String[] getCommand(String command) {
         boolean isWindows = OS_NAME.equals("windows");
         String shell = isWindows ? "cmd.exe" : "sh";
         String shellSwitch = isWindows ? "/c" : "-c";
@@ -134,4 +126,12 @@ private static String[] getCommand(String command) {
         }
         return new String[] {shell, shellSwitch, command};
     }
+
+    private static String getOsNameProperty() {
+        try {
+            return System.getProperty("os.name").toLowerCase(Locale.ROOT);
+        } catch (SecurityException exception) {
+            return "";
+        }
+    }
 }

idris-jvm-runtime/src/main/java/io/github/mmhelloworld/idrisjvm/runtime/ReadableWritableChannel.java

@@ -0,0 +1,37 @@
+package io.github.mmhelloworld.idrisjvm.runtime;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+
+final class ReadableWritableChannel implements ReadableByteChannel, WritableByteChannel {
+    private final ReadableByteChannel reader;
+    private final WritableByteChannel writer;
+
+    ReadableWritableChannel(ReadableByteChannel reader, WritableByteChannel writer) {
+        this.reader = reader;
+        this.writer = writer;
+    }
+
+    @Override
+    public int read(ByteBuffer byteBuffer) throws IOException {
+        return reader.read(byteBuffer);
+    }
+
+    @Override
+    public int write(ByteBuffer byteBuffer) throws IOException {
+        return writer.write(byteBuffer);
+    }
+
+    @Override
+    public boolean isOpen() {
+        return reader.isOpen() || writer.isOpen();
+    }
+
+    @Override
+    public void close() throws IOException {
+        reader.close();
+        writer.close();
+    }
+}

idris-jvm-tests/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.mmhelloworld</groupId>
         <artifactId>idris-jvm</artifactId>
-        <version>0.3.0</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

libs/base/System/File.idr

@@ -67,8 +67,10 @@ prim__eof : FilePtr -> PrimIO Int
          jvm' fileClass "flush" fileClass "int"
 prim__flush : FilePtr -> PrimIO Int
 %foreign support "idris2_popen"
+         jvm' fileClass "popen" "String String" fileClass
 prim__popen : String -> String -> PrimIO FilePtr
 %foreign support "idris2_pclose"
+         jvm' fileClass "close" fileClass "void"
 prim__pclose : FilePtr -> PrimIO ()
 
 %foreign support "idris2_removeFile"

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.mmhelloworld</groupId>
     <artifactId>idris-jvm</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Idris 2 JVM</name>
 

src/Compiler/Jvm/Jname.idr

@@ -50,13 +50,13 @@ jvmName : Name -> Jname
 jvmName (NS ns n) = Jqualified (replace (cleanupIdentifier $ showNSWithSep "$" ns) '$' '/') $ getSimpleName (jvmName n)
 jvmName (UN n) = Jsimple $ cleanupIdentifier n
 jvmName (MN n i) = Jsimple $ cleanupIdentifier n ++ "$" ++ show i
-jvmName (PV n d) = Jsimple $ "$patvar" ++ getSimpleName (jvmName n)
+jvmName (PV n d) = Jsimple $ "$p" ++ getSimpleName (jvmName n)
 jvmName (DN str n) = Jsimple $ cleanupIdentifier str ++ getSimpleName (jvmName n)
 jvmName (RF str) = Jsimple $ cleanupIdentifier str
-jvmName (Nested (i, x) n) = Jsimple $ "$nested" ++ show i ++ "$" ++ show x ++ "$" ++ getSimpleName (jvmName n)
-jvmName (CaseBlock x y) = Jsimple $ "$case" ++ cleanupIdentifier (show x) ++ "$" ++ show y
-jvmName (WithBlock x y) = Jsimple $ "$with" ++ cleanupIdentifier (show x) ++ "$" ++ show y
-jvmName (Resolved i) = Jsimple $ "$resolved" ++ show i
+jvmName (Nested (i, x) n) = Jsimple $ "$n" ++ show i ++ "$" ++ show x ++ "$" ++ getSimpleName (jvmName n)
+jvmName (CaseBlock x y) = Jsimple $ "$c" ++ cleanupIdentifier (show x) ++ "$" ++ show y
+jvmName (WithBlock x y) = Jsimple $ "$w" ++ cleanupIdentifier (show x) ++ "$" ++ show y
+jvmName (Resolved i) = Jsimple $ "$r" ++ show i
 
 export
 jvmSimpleName : Name -> String