compile #+ and #- - gcl.git - GNU Common Lisp

diff --git a/gcl/lsp/gcl_autoload.lsp b/gcl/lsp/gcl_autoload.lsp
index 8c604b09b..a604ac106 100755
--- a/gcl/lsp/gcl_autoload.lsp
+++ b/gcl/lsp/gcl_autoload.lsp

@@ -26,46 +26,6 @@

;(defvar *features*)

-(defun eval-feature (x)

- (cond ((atom x)

- (member x *features*

- :test #'(lambda (a b)

- (cond ((symbolp a)

- (and (symbolp b)

- (string-equal (symbol-name a)

- (symbol-name b))))

- (t (eql a b))))))

- ((eq (car x) 'and)

- (dolist (x (cdr x) t) (unless (eval-feature x) (return nil))))

- ((eq (car x) 'or)

- (dolist (x (cdr x) nil) (when (eval-feature x) (return t))))

- ((eq (car x) 'not)

- (not (eval-feature (cadr x))))

- (t (error "~S is not a feature expression." x))))

-

-;;; Revised by Marc Rinfret.

-(defun sharp-+-reader (stream subchar arg)

- (if (eval-feature (let ((*read-suppress* nil) (*read-base* 10.))

- (read stream t nil t)))

- (values (read stream t nil t))

- (let ((*read-suppress* t)) (read stream t nil t) (values))))

-

-(set-dispatch-macro-character #\# #\+ 'sharp-+-reader)

-(set-dispatch-macro-character #\# #\+ 'sharp-+-reader

- (si::standard-readtable))

-

-(defun sharp---reader (stream subchar arg)

- (if (eval-feature (let ((*read-suppress* nil) (*read-base* 10.))

- (read stream t nil t)))

- (let ((*read-suppress* t)) (read stream t nil t) (values))

- (values (read stream t nil t))))

-

-(set-dispatch-macro-character #\# #\- 'sharp---reader)

-(set-dispatch-macro-character #\# #\- 'sharp---reader

- (si::standard-readtable))

-

-

-

(defun lisp-implementation-type () "GNU Common Lisp (GCL)")

(defun machine-type () #+sun "SUN"

diff --git a/gcl/lsp/gcl_module.lsp b/gcl/lsp/gcl_module.lsp
index 58c461a8a..63d122a93 100755
--- a/gcl/lsp/gcl_module.lsp
+++ b/gcl/lsp/gcl_module.lsp

@@ -82,3 +82,42 @@

nil)))))

+(defun eval-feature (x)

+ (cond ((atom x)

+ (member x *features*

+ :test #'(lambda (a b)

+ (cond ((symbolp a)

+ (and (symbolp b)

+ (string-equal (symbol-name a)

+ (symbol-name b))))

+ (t (eql a b))))))

+ ((eq (car x) 'and)

+ (dolist (x (cdr x) t) (unless (eval-feature x) (return nil))))

+ ((eq (car x) 'or)

+ (dolist (x (cdr x) nil) (when (eval-feature x) (return t))))

+ ((eq (car x) 'not)

+ (not (eval-feature (cadr x))))

+ (t (error "~S is not a feature expression." x))))

+

+(defun sharp-+-reader (stream subchar arg)

+ (declare (ignore subchar arg))

+ (if (eval-feature (let ((*read-suppress* nil) (*read-base* 10.))

+ (read stream t nil t)))

+ (values (read stream t nil t))

+ (let ((*read-suppress* t)) (read stream t nil t) (values))))

+

+(set-dispatch-macro-character #\# #\+ 'sharp-+-reader)

+(set-dispatch-macro-character #\# #\+ 'sharp-+-reader

+ (si::standard-readtable))

+

+(defun sharp---reader (stream subchar arg)

+ (declare (ignore subchar arg))

+ (if (eval-feature (let ((*read-suppress* nil) (*read-base* 10.))

+ (read stream t nil t)))

+ (let ((*read-suppress* t)) (read stream t nil t) (values))

+ (values (read stream t nil t))))

+

+(set-dispatch-macro-character #\# #\- 'sharp---reader)

+(set-dispatch-macro-character #\# #\- 'sharp---reader

+ (si::standard-readtable))

+