Changeset 13512

Timestamp:

08/19/11 15:43:32 (11 years ago)

Author:

ehuelsmann

Message:

Re #116: Implement some infrastructure to load from other sources than
plain java.lang.String-s.

File:

• trunk/abcl/src/org/armedbear/lisp/Lisp.java (modified) (4 diffs)

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -35 +35 @@
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
 import java.math.BigInteger;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLDecoder;
+import java.nio.charset.Charset;
 import java.util.Hashtable;
 
@@ -1240 +1240 @@
 
   // Used by the compiler.
-  public static final LispObject readObjectFromString(String s)
+  public static LispObject readObjectFromString(String s)
+  {
+      return readObjectFromReader(new StringReader(s));
+  }
+  
+  final static Charset UTF8CHARSET = Charset.forName("UTF-8");
+  public static LispObject readObjectFromStream(InputStream s)
+  {
+      return readObjectFromReader(new InputStreamReader(s));
+  }
+  
+  public static LispObject readObjectFromReader(Reader r)
   {
     LispThread thread = LispThread.currentThread();
@@ -1254 +1265 @@
         // No need to bind the default read table, because the default fasl
         // read table is used below
-        return new StringInputStream(s).read(true, NIL, false,
+        return new Stream(Symbol.SYSTEM_STREAM, r).read(true, NIL, false,
                                              LispThread.currentThread(),
                                              Stream.faslReadtable);
@@ -1262 +1273 @@
     }
   }
-
-    @Deprecated
+  
+  @Deprecated
   public static final LispObject loadCompiledFunction(final String namestring)
   {