Improve File Implementation

smarr · Feb 11, 2018 · da8107d · da8107d
1 parent 0611fdb
commit da8107d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 18 deletions.
diff --git a/core-lib/Files.ns b/core-lib/Files.ns
@@ -1,8 +1,8 @@
 class Files usingVmMirror: vmMirror usingPlatform: platform = Value (
 (* This code was derived from Newspeak File classes, which is why the Sun Microsystems copyright and BSD license below applies.
-Original Newspeak version of classes:  
-https://bitbucket.org/newspeaklanguage/newspeak/src/38a47c705f1a1ab3359f2a58b79e8c728bfb218f/Files.ns 
-https://bitbucket.org/newspeaklanguage/newspeak/src/38a47c705f1a1ab3359f2a58b79e8c728bfb218f/Win32Files.ns 
+Original Newspeak version of classes:
+https://bitbucket.org/newspeaklanguage/newspeak/src/38a47c705f1a1ab3359f2a58b79e8c728bfb218f/Files.ns
+https://bitbucket.org/newspeaklanguage/newspeak/src/38a47c705f1a1ab3359f2a58b79e8c728bfb218f/Win32Files.ns
 
 Copyright (c) 1995-2006 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
 Copyright 2008-2009 Gilad Bracha and other contributors.
@@ -92,8 +92,8 @@ DAMAGE.>> *)
       ^ (vmMirror fileCreateFileDescriptorFor: obj) mode: m.
     )
 
-    public new = ( self error: 'Please use for:mode: instead of new!\n' 
-     + '\talternatively the open method of a FilePath object can be used.' 
+    public new = ( self error: 'Please use for:mode: instead of new!\n'
+     + '\talternatively the open method of a FilePath object can be used.'
     )
   )
 
@@ -406,7 +406,7 @@ DAMAGE.>> *)
   (* FilePaths are FilePatterns without wildcard characters,
      which means they match individual files, not sets of files. *)
   public class FilePath = FilePattern ()(
-    
+
     (* concatenation *)
     public , extension <FilePattern> ^ <FilePattern> = (
       ^ extension extendPath: self (* ) *)

diff --git a/src/som/vmobjects/SFileDescriptor.java b/src/som/vmobjects/SFileDescriptor.java
@@ -9,7 +9,6 @@
 
 import som.interpreter.nodes.dispatch.BlockDispatchNode;
 import som.primitives.PathPrims;
-import som.vm.Symbols;
 import som.vm.constants.Classes;
 import som.vmobjects.SArray.SMutableArray;
 
@@ -19,10 +18,11 @@ public class SFileDescriptor extends SObjectWithClass {
 
   public static final int BUFFER_SIZE = 32 * 1024;
 
-  private boolean open       = false;
-  private SArray  buffer;
-  private SSymbol mode;
-  private int     bufferSize = BUFFER_SIZE;
+  private boolean     open       = false;
+  private SArray      buffer;
+  private SSymbol     mode;
+  private int         bufferSize = BUFFER_SIZE;
+  private AccessModes access;
 
   private RandomAccessFile raf;
   private final File       f;
@@ -41,13 +41,13 @@ public void openFile(final SBlock fail, final BlockDispatchNode dispatchHandler)
     buffer = new SMutableArray(storage, Classes.arrayClass);
 
     try {
-      if (mode == Symbols.symbolFor("read")) {
-        raf = new RandomAccessFile(f, "r");
-      } else if (mode == Symbols.symbolFor("readwrite")) {
-        raf = new RandomAccessFile(f, "rw");
-      } else {
-        dispatchHandler.executeDispatch(new Object[] {fail, "invalid access mode"});
-      }
+      this.access = AccessModes.valueOf(mode.getString().toUpperCase());
+    } catch (Exception e) {
+      dispatchHandler.executeDispatch(new Object[] {fail, "invalid access mode: " + mode});
+    }
+
+    try {
+      raf = new RandomAccessFile(f, access.getMode());
     } catch (FileNotFoundException e) {
       dispatchHandler.executeDispatch(new Object[] {fail, e.toString()});
     }
@@ -71,6 +71,11 @@ public int read(final long position, final SBlock fail,
       return 0;
     }
 
+    if (access == AccessModes.WRITE) {
+      fail.getMethod().invoke(new Object[] {fail, "Opened in write only"});
+      return 0;
+    }
+
     long[] storage = (long[]) buffer.getStoragePlain();
     byte[] buff = new byte[bufferSize];
     int bytes = 0;
@@ -100,6 +105,11 @@ public void write(final int nBytes, final long position, final SBlock fail,
       return;
     }
 
+    if (access == AccessModes.READ) {
+      fail.getMethod().invoke(new Object[] {fail, "Opened in read only"});
+      return;
+    }
+
     long[] storage = (long[]) buffer.getStoragePlain();
     byte[] buff = new byte[bufferSize];
 
@@ -157,4 +167,17 @@ public void setBufferSize(final int bufferSize) {
   public void setMode(final SSymbol mode) {
     this.mode = mode;
   }
+
+  private enum AccessModes {
+    READ("r"), WRITE("rw"), READWRITE("rw");
+    String mode;
+
+    AccessModes(final String mode) {
+      this.mode = mode;
+    }
+
+    String getMode() {
+      return mode;
+    }
+  }
 }