Changeset 4085

Timestamp:

09/27/03 19:24:15 (20 years ago)

Author:

piso

Message:

MAKE-STRING-INPUT-STREAM

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (2 diffs)
• StringInputStream.java (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/Autoload.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.76 2003-09-25 15:37:08 piso Exp $
+ * $Id: Autoload.java,v 1.77 2003-09-27 19:24:15 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -212 +212 @@
         autoload("logxor", "logxor");
         autoload("make-condition", "make_condition");
+        autoload("make-string-input-stream", "StringInputStream");
         autoload("make-string-output-stream", "StringOutputStream");
         autoload("namestring", "Pathname");

trunk/j/src/org/armedbear/lisp/StringInputStream.java

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: StringInputStream.java,v 1.1 2003-02-23 01:35:00 piso Exp $
+ * $Id: StringInputStream.java,v 1.2 2003-09-27 19:23:56 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -28 +28 @@
         super(s);
     }
+
+    // ### make-string-input-stream
+    // make-string-input-stream string &optional start end => string-stream
+    private static final Primitive MAKE_STRING_OUTPUT_STREAM =
+        new Primitive("make-string-input-stream") {
+        public LispObject execute(LispObject arg) throws ConditionThrowable
+        {
+            return new StringInputStream(LispString.getValue(arg));
+        }
+        public LispObject execute(LispObject first, LispObject second)
+            throws ConditionThrowable
+        {
+            String s = LispString.getValue(first);
+            int start = Fixnum.getValue(second);
+            return new StringInputStream(s.substring(start));
+        }
+        public LispObject execute(LispObject first, LispObject second,
+                                  LispObject third)
+            throws ConditionThrowable
+        {
+            String s = LispString.getValue(first);
+            int start = Fixnum.getValue(second);
+            if (third == NIL)
+                return new StringInputStream(s.substring(start));
+            int end = Fixnum.getValue(third);
+            return new StringInputStream(s.substring(start, end));
+        }
+    };
 }