Changeset 4052

Timestamp:

09/25/03 16:33:18 (20 years ago)

Author:

piso

Message:

%WRITE-STRING, %WRITE-NEWLINE

File:

• trunk/j/src/org/armedbear/lisp/Primitives.java (modified) (4 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.437 2003-09-25 15:36:14 piso Exp $
+ * $Id: Primitives.java,v 1.438 2003-09-25 16:33:18 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -3440 +3440 @@
     };
 
-    // ### write-string
-    // write-string string &optional output-stream &key start end => string
-    private static final Primitive WRITE_STRING =
-        new Primitive("write-string") {
+    // ### %write-string
+    // write-string string output-stream start end => string
+    private static final Primitive _WRITE_STRING =
+        new Primitive("%write-string", PACKAGE_SYS, false)
+    {
         public LispObject execute(LispObject[] args) throws ConditionThrowable
         {
-            if (args.length == 0)
-                throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
-            LispString string = checkString(args[0]);
+            if (args.length != 4)
+                throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
+            String s = LispString.getValue(args[0]);
             CharacterOutputStream out = null;
             if (args.length == 1)
@@ -3454 +3455 @@
             else {
                 LispObject streamArg = args[1];
+                if (streamArg == T)
+                    streamArg = _TERMINAL_IO_.symbolValue();
+                else if (streamArg == NIL)
+                    streamArg = _STANDARD_OUTPUT_.symbolValue();
                 if (streamArg instanceof CharacterOutputStream)
                     out = (CharacterOutputStream) streamArg;
-                else if (streamArg == T || streamArg == NIL)
-                    out = getStandardOutput();
+                else if (streamArg instanceof TwoWayStream)
+                    out = ((TwoWayStream)streamArg).getOutputStream();
                 else
-                    throw new ConditionThrowable(new TypeError(args[1],
-                                                               "character output stream"));
-            }
-            out.writeString(string);
-            return string;
+                    throw new ConditionThrowable(new TypeError(args[1], "character output stream"));
+            }
+            int start = Fixnum.getValue(args[2]);
+            int end = Fixnum.getValue(args[3]);
+            out.writeString(s.substring(start, end));
+            return args[0];
+        }
+    };
+
+    // ### %write-newline
+    // write-string string output-stream start end => string
+    private static final Primitive1 _WRITE_NEWLINE =
+        new Primitive1("%write-newline", PACKAGE_SYS, false)
+    {
+        public LispObject execute(LispObject arg) throws ConditionThrowable
+        {
+            LispObject streamArg = arg;
+            if (streamArg == T)
+                streamArg = _TERMINAL_IO_.symbolValue();
+            else if (streamArg == NIL)
+                streamArg = _STANDARD_OUTPUT_.symbolValue();
+            final CharacterOutputStream out;
+            if (streamArg instanceof CharacterOutputStream)
+                out = (CharacterOutputStream) streamArg;
+            else if (streamArg instanceof TwoWayStream)
+                out = ((TwoWayStream)streamArg).getOutputStream();
+            else
+                throw new ConditionThrowable(new TypeError(streamArg, "character output stream"));
+            out.writeString(System.getProperty("line.separator"));
+            return NIL;
         }
     };
@@ -3506 +3536 @@
                 out = ((TwoWayStream)streamArg).getOutputStream();
             else
-                throw new ConditionThrowable(new TypeError(args[1], "character output stream"));
+                throw new ConditionThrowable(new TypeError(args[0], "character output stream"));
         }
         out.flushOutput();