Merge branch 'read-fix'

[bpt/guile.git] / module / system / repl / common.scm

diff --git a/module/system/repl/common.scm b/module/system/repl/common.scm
index cbc8bc4..9570d1d 100644 (file)
--- a/module/system/repl/common.scm
+++ b/module/system/repl/common.scm
@@ -1,53 +1,52 @@
 ;;; Repl common routines
 
-;; Copyright (C) 2001 Free Software Foundation, Inc.
-
-;; 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 2, 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; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Copyright (C) 2001, 2008, 2009 Free Software Foundation, Inc.
+
+;;; This library is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU Lesser General Public
+;;; License as published by the Free Software Foundation; either
+;;; version 3 of the License, or (at your option) any later version.
+;;;
+;;; This library 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
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this library; if not, write to the Free Software
+;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 ;;; Code:
 
 (define-module (system repl common)
-  :use-syntax (system base syntax)
-  :use-module (system base compile)
-  :use-module (system base language)
-  :use-module (system vm core)
-  :export (<repl> make-repl repl-vm repl-language repl-options
-                  repl-tm-stats repl-gc-stats repl-vm-stats
-           repl-welcome repl-prompt repl-read repl-compile repl-eval
-           repl-print repl-option-ref repl-option-set!
-           puts ->string user-error))
+  #:use-module (system base syntax)
+  #:use-module (system base compile)
+  #:use-module (system base language)
+  #:use-module (system vm vm)
+  #:export (<repl> make-repl repl-vm repl-language repl-options
+            repl-tm-stats repl-gc-stats
+            repl-welcome repl-prompt repl-read repl-compile repl-eval
+            repl-parse repl-print repl-option-ref repl-option-set!
+            puts ->string user-error))
 
 \f
 ;;;
 ;;; Repl type
 ;;;
 
-(define-record (<repl> vm language options tm-stats gc-stats vm-stats))
+(define-record/keywords <repl> vm language options tm-stats gc-stats)
 
 (define repl-default-options
-  '((trace . #f)))
+  '((trace . #f)
+    (interp . #f)))
 
 (define %make-repl make-repl)
 (define (make-repl lang)
-  (%make-repl :vm (the-vm)
-              :language (lookup-language lang)
-              :options repl-default-options
-              :tm-stats (times)
-              :gc-stats (gc-stats)
-              :vm-stats (vm-stats (the-vm))))
+  (%make-repl #:vm (the-vm)
+              #:language (lookup-language lang)
+              #:options repl-default-options
+              #:tm-stats (times)
+              #:gc-stats (gc-stats)))
 
 (define (repl-welcome repl)
   (let ((language (repl-language repl)))
@@ -61,21 +60,37 @@
           (module-name (current-module))))
 
 (define (repl-read repl)
-  ((language-reader (repl-language repl))))
+  ((language-reader (repl-language repl)) (current-input-port)
+                                          (current-module)))
 
 (define (repl-compile repl form . opts)
-  (apply compile-in form (current-module) (repl-language repl) opts))
+  (let ((to (lookup-language (cond ((memq #:e opts) 'scheme)
+                                   ((memq #:t opts) 'ghil)
+                                   ((memq #:c opts) 'glil)
+                                   (else 'objcode))))
+        (from (repl-language repl)))
+    (compile form #:from from #:to to #:opts opts #:env (current-module))))
+
+(define (repl-parse repl form)
+  (let ((parser (language-parser (repl-language repl))))
+    (if parser (parser form) form)))
 
 (define (repl-eval repl form)
   (let ((eval (language-evaluator (repl-language repl))))
-    (if eval
-       (eval form (current-module))
-       (vm-load (repl-vm repl) (repl-compile repl form)))))
+    (if (and eval
+             (or (null? (language-compilers (repl-language repl)))
+                 (assq-ref (repl-options repl) 'interp)))
+        (eval form (current-module))
+        (vm-load (repl-vm repl) (repl-compile repl form '())))))
 
 (define (repl-print repl val)
   (if (not (eq? val *unspecified*))
       (begin
-       ((language-printer (repl-language repl)) val)
+        ;; The result of an evaluation is representable in scheme, and
+        ;; should be printed with the generic printer, `write'. The
+        ;; language-printer is something else: it prints expressions of
+        ;; a given language, not the result of evaluation.
+       (write val)
        (newline))))
 
 (define (repl-option-ref repl key)