Better exception message generation.

Author: donaldh

src/vm/jvm/runtime/org/perl6/nqp/runtime/IOExceptionMessages.java

@@ -0,0 +1,31 @@
+package org.perl6.nqp.runtime;
+
+import java.io.FileNotFoundException;
+import java.nio.file.AccessDeniedException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.NotLinkException;
+
+public class IOExceptionMessages {
+    
+    public static String message(Exception e) {
+        if (e instanceof FileNotFoundException
+            || e instanceof NoSuchFileException) {
+            return "File " + e.getMessage() + " not found";
+        } else if (e instanceof AccessDeniedException) {
+            return "Access to " + e.getMessage() + " is denied";
+        } else if (e instanceof DirectoryNotEmptyException) {
+            return "Directory " + e.getMessage() + " not empty";
+        } else if (e instanceof FileAlreadyExistsException) {
+            return "File " + e.getMessage() + " already exists";
+        } else if (e instanceof NotDirectoryException) {
+            return "File " + e.getMessage() + " is not a directory";
+        } else if (e instanceof NotLinkException) {
+            return "File " + e.getMessage() + " is not a link";
+        } else {
+            return e.getClass().getSimpleName() + ": " + e.getMessage();
+        }
+    }
+}

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -611,11 +611,8 @@ public static long chmod(String path, long mode, ThreadContext tc) {
             Set<PosixFilePermission> perms = modeToPosixFilePermission(mode);
             Files.setPosixFilePermissions(path_o, perms);
         }
-        catch (IOException e) {
-            die_s("nqp::chmod: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::chmod: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
         return 0;
     }
@@ -626,11 +623,8 @@ public static long unlink(String path, ThreadContext tc) {
                 return -2;
             }
         }
-        catch (IOException e) {
-            die_s("nqp::unlink: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::unlink: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
         return 0;
     }
@@ -643,11 +637,8 @@ public static long rmdir(String path, ThreadContext tc) {
             }
             Files.delete(path_o);
         }
-        catch (IOException e) {
-            die_s("nqp::rmdir: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::rmdir: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
         return 0;
     }
@@ -666,13 +657,9 @@ public static long mkdir(String path, long mode, ThreadContext tc) {
             Files.createDirectory(Paths.get(path),
                         PosixFilePermissions.asFileAttribute(modeToPosixFilePermission(mode)));
         }
-        catch (IOException e) {
-            die_s("nqp::mkdir: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::mkdir: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
-
         return 0;
     }
 
@@ -682,11 +669,8 @@ public static long rename(String before, String after, ThreadContext tc) {
         try {
             Files.move(before_o, after_o);
         }
-        catch (IOException e) {
-            die_s("nqp::rename: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::rename: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
         return 0;
     }
@@ -697,11 +681,8 @@ public static long copy(String before, String after, ThreadContext tc) {
         try {
             Files.copy(before_o, after_o);
         }
-        catch (IOException e) {
-            die_s("nqp::copy: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::copy: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
         return 0;
     }
@@ -712,11 +693,8 @@ public static long link(String before, String after, ThreadContext tc) {
         try {
             Files.createLink(before_o, after_o);
         }
-        catch (IOException e) {
-            die_s("nqp::link: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::link: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
         return 0;
     }
@@ -768,11 +746,8 @@ public static long symlink(String before, String after, ThreadContext tc) {
         try {
             Files.createSymbolicLink(before_o, after_o);
         }
-        catch (IOException e) {
-            die_s("nqp::symlink: " + e.getClass().getSimpleName() + ": " + e.getMessage(), tc);            
-        }
         catch (Exception e) {
-            die_s("nqp::symlink: unhandled exception", tc);
+            die_s(IOExceptionMessages.message(e), tc);
         }
         return 0;
     }