Changeset 13512
- Timestamp:
- 08/19/11 15:43:32 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/Lisp.java
r13445 r13512 35 35 36 36 import java.io.File; 37 import java.io.FileInputStream;38 import java.io.FileNotFoundException;39 37 import java.io.IOException; 40 38 import java.io.InputStream; 39 import java.io.InputStreamReader; 40 import java.io.Reader; 41 import java.io.StringReader; 41 42 import java.math.BigInteger; 42 import java.net.MalformedURLException;43 43 import java.net.URL; 44 import java.n et.URLDecoder;44 import java.nio.charset.Charset; 45 45 import java.util.Hashtable; 46 46 … … 1240 1240 1241 1241 // Used by the compiler. 1242 public static final LispObject readObjectFromString(String s) 1242 public static LispObject readObjectFromString(String s) 1243 { 1244 return readObjectFromReader(new StringReader(s)); 1245 } 1246 1247 final static Charset UTF8CHARSET = Charset.forName("UTF-8"); 1248 public static LispObject readObjectFromStream(InputStream s) 1249 { 1250 return readObjectFromReader(new InputStreamReader(s)); 1251 } 1252 1253 public static LispObject readObjectFromReader(Reader r) 1243 1254 { 1244 1255 LispThread thread = LispThread.currentThread(); … … 1254 1265 // No need to bind the default read table, because the default fasl 1255 1266 // read table is used below 1256 return new Str ingInputStream(s).read(true, NIL, false,1267 return new Stream(Symbol.SYSTEM_STREAM, r).read(true, NIL, false, 1257 1268 LispThread.currentThread(), 1258 1269 Stream.faslReadtable); … … 1262 1273 } 1263 1274 } 1264 1265 1275 1276 @Deprecated 1266 1277 public static final LispObject loadCompiledFunction(final String namestring) 1267 1278 {
Note: See TracChangeset
for help on using the changeset viewer.