diff options
| author | IOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at> | 2016-01-25 11:25:59 +0100 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at> | 2016-01-25 11:25:59 +0100 |
| commit | 110d59c341b8c50c04f30d90e85e9b8f6f329a0e (patch) | |
| tree | 174afbe2ded41ae03923b93a0c4e6975e3163ad5 /s7-slib-init.scm | |
| parent | e5328e59987b90c4e98959510b810510e384650d (diff) | |
Imported Upstream version 16.1
Diffstat (limited to 's7-slib-init.scm')
| -rw-r--r-- | s7-slib-init.scm | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/s7-slib-init.scm b/s7-slib-init.scm index b69b429..c89f2e9 100644 --- a/s7-slib-init.scm +++ b/s7-slib-init.scm @@ -90,7 +90,7 @@ (else (slib:warn "require.scm" 'unknown 'software-type (software-type)) "/")))) - (lambda (chr) (and (memv chr suffi) #t)))) + (lambda (chr) (memv chr suffi)))) ;@ (define (pathname->vicinity pathname) (let loop ((i (- (string-length pathname) 1))) @@ -285,7 +285,7 @@ `(set! *defmacros* (cons (cons ',name (lambda ,parms ,@body)) *defmacros*)))))) ;@ -(define (defmacro? m) (and (assq m *defmacros*) #t)) +(define (defmacro? m) (assq m *defmacros*)) ;@ (define (macroexpand-1 e) (if (pair? e) @@ -316,7 +316,7 @@ (define (defmacro:eval x) (base:eval (defmacro:expand* x))) (define (defmacro:expand* x) - (slib:require 'defmacroexpand) (apply defmacro:expand* x '())) + (slib:require 'defmacroexpand) (apply defmacro:expand* x ())) ;@ (define (defmacro:load <pathname>) (slib:eval-load <pathname> defmacro:eval)) @@ -330,11 +330,8 @@ (newline cep)))) ;;@ define an error procedure for the library -(define slib:error - (let ((error error)) - (lambda args - (if (provided? 'trace) (print-call-stack (current-error-port))) - (apply error args)))) +(define slib:error error) + ;@ (define (make-exchanger obj) (lambda (rep) (let ((old obj)) (set! obj rep) old))) @@ -384,7 +381,7 @@ ;;@ Define SLIB:EXIT to be the implementation procedure to exit or ;;; return if exiting not supported. -(define slib:exit quit) +(define slib:exit exit) ;;@ Here for backward compatability (define scheme-file-suffix @@ -414,3 +411,20 @@ ;;(define syncase:load slib:load-source) (slib:load (in-vicinity (library-vicinity) "require")) + + +;;; -------------------------------------------------------------------------------- +;;; for wttree.scm + +(set! *#readers* + (cons (cons #\F (lambda (str) + (not (string=? str "")))) + *#readers*)) + +;;; for r4syn.scm + +(set! *#readers* + (cons (cons #\T (lambda (str) + (string=? str ""))) + *#readers*)) + |