* Make readline run-time options accessible.

guile-readline/ChangeLog

@@ -1,3 +1,15 @@
+2001-01-26  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	This patch fixes a problem reported by Martin Grabmueller about
+	the impossibility to access readline's run-time options.
+
+	* readline.scm:  Added a comment about guile's behaviour if one of
+	the ports used by readline are closed.
+
+	(readline-options readline-enable readline-disable,
+	readline-set!):  These are now defined here instead of in
+	boot-9.scm.
+
 2001-01-25  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* readline.scm (set-readline-input-port!,

guile-readline/readline.scm

@@ -21,11 +21,15 @@
 ;;;; Extensions based upon code by
 ;;;; Andrew Archibald <aarchiba@undergrad.math.uwaterloo.ca>.
 
+
+
 (define-module (ice-9 readline)
   :use-module (ice-9 session)
   :use-module (ice-9 regex)
   :no-backtrace)
 
+
+
 ;;; Dynamically link the glue code for accessing the readline library,
 ;;; but only when it isn't already present.
 
@@ -39,9 +43,30 @@
 	       '()
 	       '()))
 
+
+
+;;; Run-time options
+
+(export
+ readline-options
+ readline-enable
+ readline-disable)
+(export-syntax
+ readline-set!)
+
+(define-option-interface
+  (readline-options-interface
+   (readline-options readline-enable readline-disable)
+   (readline-set!)))
+
+
+
 ;;; MDJ 980513 <djurfeldt@nada.kth.se>:
 ;;; There should probably be low-level support instead of this code.
 
+;;; Dirk:FIXME:: If the-readline-port, input-port or output-port are closed,
+;;; guile will enter an endless loop or crash.
+
 (define prompt "")
 (define prompt2 "")
 (define input-port (current-input-port))

ice-9/ChangeLog

@@ -1,3 +1,14 @@
+2001-01-26  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	This patch fixes a problem reported by Martin Grabmueller about
+	the impossibility to access readline's run-time options.
+
+	* boot-9.scm (define-option-interface):  New macro.  Allows to
+	conveniently define a group of option interface functions.
+
+	(readline-options readline-enable readline-disable,
+	readline-set!):  Moved to guile-readline/readline.scm.
+
 2001-01-24  Gary Houston  <ghouston@arglist.com>
 
 	* boot-9.scm: don't import (ice-9 rdelim) here.  it's done

ice-9/boot-9.scm

@@ -2015,31 +2015,8 @@
 
 ;;; {Run-time options}
 
-((let* ((names '((eval-options-interface
+(define define-option-interface
-		  (eval-options eval-enable eval-disable)
+  (let* ((option-name car)
-		  (eval-set!))
-		 
-		 (debug-options-interface
-		  (debug-options debug-enable debug-disable)
-		  (debug-set!))
-	       
-		 (evaluator-traps-interface
-		  (traps trap-enable trap-disable)
-		  (trap-set!))
-		
-		 (read-options-interface
-		  (read-options read-enable read-disable)
-		  (read-set!))
-		
-		 (print-options-interface
-		  (print-options print-enable print-disable)
-		  (print-set!))
-
-		 (readline-options-interface
-		  (readline-options readline-enable readline-disable)
-		  (readline-set!))
-		 ))
-	(option-name car)
 	 (option-value cadr)
 	 (option-documentation caddr)
 
@@ -2055,7 +2032,7 @@
 			 (display (option-documentation option))
 			 (newline)))
 
-	;; Below follows the macros defining the run-time option interfaces.
+	 ;; Below follow the macros defining the run-time option interfaces.
 
 	 (make-options (lambda (interface)
 			 `(lambda args
@@ -2085,27 +2062,49 @@
 			 (begin (,interface (append (,interface)
 						    (list '(,'unquote name)
 							  (,'unquote exp))))
-			       (,interface))))))
+				(,interface)))))))
-	)
     (procedure->macro
      (lambda (exp env)
        (cons 'begin
-	     (apply append
+	     (let* ((option-group (cadr exp))
-		    (map (lambda (group)
+		    (interface (car option-group)))
-			   (let ((interface (car group)))
 	       (append (map (lambda (name constructor)
 			      `(define ,name
 				 ,(constructor interface)))
-					  (cadr group)
+			    (cadr option-group)
 			    (list make-options
 				  make-enable
 				  make-disable))
 		       (map (lambda (name constructor)
 			      `(defmacro ,name
 				 ,@(constructor interface)))
-					  (caddr group)
+			    (caddr option-group)
-					  (list make-set!)))))
+			    (list make-set!)))))))))
-			 names)))))))
+
+(define-option-interface
+  (eval-options-interface
+   (eval-options eval-enable eval-disable)
+   (eval-set!)))
+
+(define-option-interface
+  (debug-options-interface
+   (debug-options debug-enable debug-disable)
+   (debug-set!)))
+
+(define-option-interface
+  (evaluator-traps-interface
+   (traps trap-enable trap-disable)
+   (trap-set!)))
+
+(define-option-interface
+  (read-options-interface
+   (read-options read-enable read-disable)
+   (read-set!)))
+
+(define-option-interface
+  (print-options-interface
+   (print-options print-enable print-disable)
+   (print-set!)))