Add READ, READ-FROM-STRING, and READ-PRESERVING-WHITESPACE.

4 files changed, 58 insertions, 0 deletions

diff --git a/MLKStringInputStream.h b/MLKStringInputStream.h
index 57a6c82..9545378 100644
--- a/MLKStringInputStream.h
+++ b/MLKStringInputStream.h
@@ -24,4 +24,5 @@
 @interface MLKStringInputStream : MLKStream
 -(MLKStringInputStream *) init;
 -(MLKStringInputStream *) initWithString:(NSString *)string;
++(MLKStringInputStream *) streamWithString:(NSString *)string;
 @end
diff --git a/MLKStringInputStream.m b/MLKStringInputStream.m
index f228869..35965b9 100644
--- a/MLKStringInputStream.m
+++ b/MLKStringInputStream.m
@@ -39,4 +39,9 @@
                      encoding:NSUnicodeStringEncoding];
   return self;
 }
+
++(MLKStringInputStream *) streamWithString:(NSString *)string
+{
+  return AUTORELEASE ([[self alloc] initWithString:string]);
+}
 @end
diff --git a/init.lisp b/init.lisp
index 36d0b3e..876ff74 100644
--- a/init.lisp
+++ b/init.lisp
@@ -24,6 +24,7 @@
 (load "destructuring-bind.lisp")
 (load "defun-1.lisp")
 (load "list-functions.lisp")
+(load "reader.lisp")
 (load "control-flow.lisp")
 (load "types.lisp")
 (load "list-functions-2.lisp")
diff --git a/reader.lisp b/reader.lisp
new file mode 100644
index 0000000..22f962d
--- /dev/null
+++ b/reader.lisp
@@ -0,0 +1,51 @@
+;;; -*- mode: lisp; coding: utf-8 -*-
+;;; Étoilisp/Mulklisp, a Common Lisp subset for the Étoilé runtime.
+;;; Copyright (C) 2008  Matthias Andreas Benkard.
+;;;
+;;; This program is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation, either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+(in-package #:common-lisp)
+
+(export '(read read-preserving-whitespace read-from-string))
+
+(defun read (&optional stream eof-error-p eof-value recursive-p)
+  (send-by-name (find-objc-class "MLKReader")
+                "readFromStream:eofError:eofValue:recursive:preserveWhitespace:"
+                stream
+                eof-error-p             ;FIXME: this isn't a BOOL
+                eof-value
+                recursive-p
+                nil))                   ;FIXME: this neither
+
+(defun read-preserving-whitespace (&optional stream eof-error-p eof-value recursive-p)
+  (send-by-name (find-objc-class "MLKReader")
+                "readFromStream:eofError:eofValue:recursive:preserveWhitespace:"
+                stream
+                eof-error-p  ;FIXME: this isn't a BOOL
+                eof-value
+                recursive-p
+                t))          ;FIXME: this neither
+
+(defun read-from-string (string &optional eof-error-p eof-value &key start end preserve-whitespace)
+  (let ((stream (send-by-name (find-objc-class "MLKStringInputStream")
+                              "streamWithString:"
+                              string)))
+    (send-by-name (find-objc-class "MLKReader")
+                  "readFromStream:eofError:eofValue:recursive:preserveWhitespace:"
+                  stream
+                  eof-error-p
+                  eof-value
+                  nil
+                  preserve-whitespace)))