* removed uses of (scheme) in libtoplevel and makefile
This commit is contained in:
		
							parent
							
								
									7173bcc61b
								
							
						
					
					
						commit
						3764fcbdad
					
				
							
								
								
									
										
											BIN
										
									
								
								src/ikarus.boot
								
								
								
								
							
							
						
						
									
										
											BIN
										
									
								
								src/ikarus.boot
								
								
								
								
							
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
 | 
			
		||||
(library (ikarus greeting)
 | 
			
		||||
  (export print-greeting)
 | 
			
		||||
  (import (scheme))
 | 
			
		||||
  (import (ikarus))
 | 
			
		||||
  (define (print-greeting)
 | 
			
		||||
    (define-syntax compile-time-string
 | 
			
		||||
      (lambda (x) (date-string)))
 | 
			
		||||
| 
						 | 
				
			
			@ -17,7 +17,7 @@
 | 
			
		|||
 | 
			
		||||
(library (ikarus interaction)
 | 
			
		||||
  (export)
 | 
			
		||||
  (import (scheme) (ikarus greeting))
 | 
			
		||||
  (import (ikarus) (ikarus greeting))
 | 
			
		||||
  (let-values ([(files script args)
 | 
			
		||||
                (let f ([args (command-line-arguments)])
 | 
			
		||||
                  (cond
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										209
									
								
								src/makefile.ss
								
								
								
								
							
							
						
						
									
										209
									
								
								src/makefile.ss
								
								
								
								
							| 
						 | 
				
			
			@ -2,7 +2,7 @@
 | 
			
		|||
 | 
			
		||||
(library (ikarus makefile)
 | 
			
		||||
  (export)
 | 
			
		||||
  (import (scheme))
 | 
			
		||||
  (import (ikarus))
 | 
			
		||||
  
 | 
			
		||||
  (define scheme-library-files
 | 
			
		||||
    ;;; Listed in the order in which they're loaded.
 | 
			
		||||
| 
						 | 
				
			
			@ -96,6 +96,7 @@
 | 
			
		|||
 | 
			
		||||
  (define library-legend
 | 
			
		||||
    '([s   (ikarus system)]
 | 
			
		||||
      [u   (ikarus system unsafe)]
 | 
			
		||||
      [i   (ikarus)]
 | 
			
		||||
      [r   (r6rs)]))
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -190,12 +191,6 @@
 | 
			
		|||
      [memq                             s i]
 | 
			
		||||
      [memv                             s i]
 | 
			
		||||
      [member                           s i]
 | 
			
		||||
      [$car                             s  ]
 | 
			
		||||
      [$cdr                             s  ]
 | 
			
		||||
      [$set-car!                        s  ]
 | 
			
		||||
      [$set-cdr!                        s  ]
 | 
			
		||||
      [$memq                            s  ]
 | 
			
		||||
      [$memv                            s  ]
 | 
			
		||||
      [bwp-object?                      s i]
 | 
			
		||||
      [weak-cons                        s i]
 | 
			
		||||
      [weak-pair?                       s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -208,14 +203,6 @@
 | 
			
		|||
      [integer->char                    s i]
 | 
			
		||||
      [char->integer                    s i]
 | 
			
		||||
      [char-whitespace?                 s i]
 | 
			
		||||
      [$char?                           s  ]
 | 
			
		||||
      [$char=                           s  ]
 | 
			
		||||
      [$char<                           s  ]
 | 
			
		||||
      [$char>                           s  ]
 | 
			
		||||
      [$char<=                          s  ]
 | 
			
		||||
      [$char>=                          s  ]
 | 
			
		||||
      [$char->fixnum                    s  ]
 | 
			
		||||
      [$fixnum->char                    s  ]
 | 
			
		||||
      [string?                          s i]
 | 
			
		||||
      [string                           s i]
 | 
			
		||||
      [make-string                      s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -229,10 +216,6 @@
 | 
			
		|||
      [list->string                     s i]
 | 
			
		||||
      [uuid                             s i]
 | 
			
		||||
      [date-string                      s i]
 | 
			
		||||
      [$make-string                     s i]
 | 
			
		||||
      [$string-ref                      s  ]
 | 
			
		||||
      [$string-set!                     s  ]
 | 
			
		||||
      [$string-length                   s  ]
 | 
			
		||||
      [vector                           s i]
 | 
			
		||||
      [make-vector                      s i]
 | 
			
		||||
      [vector-ref                       s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -241,10 +224,6 @@
 | 
			
		|||
      [vector-length                    s i]
 | 
			
		||||
      [list->vector                     s i]
 | 
			
		||||
      [vector->list                     s i]
 | 
			
		||||
      [$make-vector                     s  ]
 | 
			
		||||
      [$vector-length                   s  ]
 | 
			
		||||
      [$vector-ref                      s  ]
 | 
			
		||||
      [$vector-set!                     s  ]
 | 
			
		||||
      [for-each                         s i]
 | 
			
		||||
      [map                              s i]
 | 
			
		||||
      [andmap                           s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -271,25 +250,6 @@
 | 
			
		|||
      [fxlogor                          s i]
 | 
			
		||||
      [fxlognot                         s i]
 | 
			
		||||
      [fixnum->string                   s i]
 | 
			
		||||
      [$fxzero?                         s  ]
 | 
			
		||||
      [$fxadd1                          s  ]
 | 
			
		||||
      [$fxsub1                          s  ]
 | 
			
		||||
      [$fx>=                            s  ]
 | 
			
		||||
      [$fx<=                            s  ]
 | 
			
		||||
      [$fx>                             s  ]
 | 
			
		||||
      [$fx<                             s  ]
 | 
			
		||||
      [$fx=                             s  ]
 | 
			
		||||
      [$fxsll                           s  ]
 | 
			
		||||
      [$fxsra                           s  ]
 | 
			
		||||
      [$fxquotient                      s  ]
 | 
			
		||||
      [$fxmodulo                        s  ]
 | 
			
		||||
      [$fxlogxor                        s  ]
 | 
			
		||||
      [$fxlogor                         s  ]
 | 
			
		||||
      [$fxlognot                        s  ]
 | 
			
		||||
      [$fxlogand                        s  ]
 | 
			
		||||
      [$fx+                             s  ]
 | 
			
		||||
      [$fx*                             s  ]
 | 
			
		||||
      [$fx-                             s  ]
 | 
			
		||||
      [string->flonum                   s i]
 | 
			
		||||
      [-                                s i]
 | 
			
		||||
      [=                                s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -321,39 +281,13 @@
 | 
			
		|||
      [string->symbol                   s i]
 | 
			
		||||
      [symbol->string                   s i]
 | 
			
		||||
      [gensym->unique-string            s i]
 | 
			
		||||
      [$make-symbol                     s  ]
 | 
			
		||||
      [$symbol-unique-string            s  ]
 | 
			
		||||
      [$symbol-value                    s  ]
 | 
			
		||||
      [$symbol-string                   s  ]
 | 
			
		||||
      [$symbol-plist                    s  ]
 | 
			
		||||
      [$set-symbol-value!               s  ]
 | 
			
		||||
      [$set-symbol-string!              s  ]
 | 
			
		||||
      [$set-symbol-unique-string!       s  ]
 | 
			
		||||
      [$set-symbol-plist!               s  ]
 | 
			
		||||
      [top-level-bound?                 s  ]
 | 
			
		||||
      [top-level-value                  s  ]
 | 
			
		||||
      [set-top-level-value!             s  ]
 | 
			
		||||
      [make-guardian                    s i]
 | 
			
		||||
      [$make-port/input                 s  ]
 | 
			
		||||
      [$make-port/output                s  ]
 | 
			
		||||
      [$make-port/both                  s  ]
 | 
			
		||||
      [$port-handler                    s  ]
 | 
			
		||||
      [$port-input-buffer               s  ]
 | 
			
		||||
      [$port-input-index                s  ]
 | 
			
		||||
      [$port-input-size                 s  ]
 | 
			
		||||
      [$port-output-buffer              s  ]
 | 
			
		||||
      [$port-output-index               s  ]
 | 
			
		||||
      [$port-output-size                s  ]
 | 
			
		||||
      [$set-port-input-index!           s  ]
 | 
			
		||||
      [$set-port-input-size!            s  ]
 | 
			
		||||
      [$set-port-output-index!          s  ]
 | 
			
		||||
      [$set-port-output-size!           s  ]
 | 
			
		||||
      [make-input-port                  s i]
 | 
			
		||||
      [make-output-port                 s i]
 | 
			
		||||
      [make-input/output-port           s i]
 | 
			
		||||
      [$make-input-port                 s  ]
 | 
			
		||||
      [$make-output-port                s  ]
 | 
			
		||||
      [$make-input/output-port          s  ]
 | 
			
		||||
      [port-output-index                s i]
 | 
			
		||||
      [port-output-size                 s i]
 | 
			
		||||
      [port-output-buffer               s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -392,10 +326,6 @@
 | 
			
		|||
      [standard-error-port              s i]
 | 
			
		||||
      [flush-output-port                s i]
 | 
			
		||||
      [reset-input-port!                s i]
 | 
			
		||||
      [$flush-output-port               s  ]
 | 
			
		||||
      [$reset-input-port!               s  ]
 | 
			
		||||
      [$close-input-port                s  ]
 | 
			
		||||
      [$close-output-port               s  ]
 | 
			
		||||
      [display                          s i]
 | 
			
		||||
      [write                            s i]
 | 
			
		||||
      [write-char                       s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -412,10 +342,6 @@
 | 
			
		|||
      [print-gensym                     s i]
 | 
			
		||||
      [gensym-count                     s i]
 | 
			
		||||
      [gensym-prefix                    s i]
 | 
			
		||||
      [$write-char                      s  ]
 | 
			
		||||
      [$read-char                       s  ]
 | 
			
		||||
      [$peek-char                       s  ]
 | 
			
		||||
      [$unread-char                     s  ]
 | 
			
		||||
      [make-hash-table                  s i]
 | 
			
		||||
      [hash-table?                      s i]
 | 
			
		||||
      [get-hash-table                   s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -457,26 +383,11 @@
 | 
			
		|||
      [record-ref                       s i]
 | 
			
		||||
      [record-field-accessor            s i]
 | 
			
		||||
      [record-field-mutator             s i]
 | 
			
		||||
      [$record-set!                     s  ]
 | 
			
		||||
      [$record-ref                      s  ]
 | 
			
		||||
      [$record-rtd                      s  ]
 | 
			
		||||
      [$record                          s  ]
 | 
			
		||||
      [$make-record                     s  ]
 | 
			
		||||
      [$record?                         s  ]
 | 
			
		||||
      [$record/rtd?                     s  ]
 | 
			
		||||
      [identifier?                      s i]
 | 
			
		||||
      [syntax-error                     s i]
 | 
			
		||||
      [generate-temporaries             s i]
 | 
			
		||||
      [free-identifier=?                s i]
 | 
			
		||||
      [boot-library-expand              s i]
 | 
			
		||||
      [$closure-code                    s  ]
 | 
			
		||||
      [$code?                           s  ]
 | 
			
		||||
      [$code->closure                   s  ]
 | 
			
		||||
      [$code-reloc-vector               s  ]
 | 
			
		||||
      [$code-freevars                   s  ]
 | 
			
		||||
      [$code-size                       s  ]
 | 
			
		||||
      [$code-ref                        s  ]
 | 
			
		||||
      [$code-set!                       s  ]
 | 
			
		||||
      [code?                            s i]
 | 
			
		||||
      [make-code                        s i]
 | 
			
		||||
      [code-reloc-vector                s i]
 | 
			
		||||
| 
						 | 
				
			
			@ -485,6 +396,107 @@
 | 
			
		|||
      [code-freevars                    s i]
 | 
			
		||||
      [code-ref                         s i]
 | 
			
		||||
      [code-set!                        s i]
 | 
			
		||||
      [immediate?                       s i]
 | 
			
		||||
      [pointer-value                    s i]
 | 
			
		||||
      [installed-libraries              s i]
 | 
			
		||||
      [library-subst/env                s i]
 | 
			
		||||
      [find-library-by-name             s i]
 | 
			
		||||
      [imported-label->binding          s i]
 | 
			
		||||
      [imported-loc->library            s i]
 | 
			
		||||
      [library-spec                     s i]
 | 
			
		||||
      [current-library-collection       s i]
 | 
			
		||||
      [invoke-library                   s i]
 | 
			
		||||
 | 
			
		||||
      [$car                             u  ]
 | 
			
		||||
      [$cdr                             u  ]
 | 
			
		||||
      [$set-car!                        u  ]
 | 
			
		||||
      [$set-cdr!                        u  ]
 | 
			
		||||
      [$memq                            u  ]
 | 
			
		||||
      [$memv                            u  ]
 | 
			
		||||
      [$char?                           s  ]
 | 
			
		||||
      [$char=                           s  ]
 | 
			
		||||
      [$char<                           s  ]
 | 
			
		||||
      [$char>                           s  ]
 | 
			
		||||
      [$char<=                          s  ]
 | 
			
		||||
      [$char>=                          s  ]
 | 
			
		||||
      [$char->fixnum                    s  ]
 | 
			
		||||
      [$fixnum->char                    s  ]
 | 
			
		||||
      [$make-string                     s i]
 | 
			
		||||
      [$string-ref                      s  ]
 | 
			
		||||
      [$string-set!                     s  ]
 | 
			
		||||
      [$string-length                   s  ]
 | 
			
		||||
      [$make-vector                     s  ]
 | 
			
		||||
      [$vector-length                   s  ]
 | 
			
		||||
      [$vector-ref                      s  ]
 | 
			
		||||
      [$vector-set!                     s  ]
 | 
			
		||||
      [$fxzero?                         s  ]
 | 
			
		||||
      [$fxadd1                          s  ]
 | 
			
		||||
      [$fxsub1                          s  ]
 | 
			
		||||
      [$fx>=                            s  ]
 | 
			
		||||
      [$fx<=                            s  ]
 | 
			
		||||
      [$fx>                             s  ]
 | 
			
		||||
      [$fx<                             s  ]
 | 
			
		||||
      [$fx=                             s  ]
 | 
			
		||||
      [$fxsll                           s  ]
 | 
			
		||||
      [$fxsra                           s  ]
 | 
			
		||||
      [$fxquotient                      s  ]
 | 
			
		||||
      [$fxmodulo                        s  ]
 | 
			
		||||
      [$fxlogxor                        s  ]
 | 
			
		||||
      [$fxlogor                         s  ]
 | 
			
		||||
      [$fxlognot                        s  ]
 | 
			
		||||
      [$fxlogand                        s  ]
 | 
			
		||||
      [$fx+                             s  ]
 | 
			
		||||
      [$fx*                             s  ]
 | 
			
		||||
      [$fx-                             s  ]
 | 
			
		||||
      [$make-symbol                     s  ]
 | 
			
		||||
      [$symbol-unique-string            s  ]
 | 
			
		||||
      [$symbol-value                    s  ]
 | 
			
		||||
      [$symbol-string                   s  ]
 | 
			
		||||
      [$symbol-plist                    s  ]
 | 
			
		||||
      [$set-symbol-value!               s  ]
 | 
			
		||||
      [$set-symbol-string!              s  ]
 | 
			
		||||
      [$set-symbol-unique-string!       s  ]
 | 
			
		||||
      [$set-symbol-plist!               s  ]
 | 
			
		||||
      [$record-set!                     s  ]
 | 
			
		||||
      [$record-ref                      s  ]
 | 
			
		||||
      [$record-rtd                      s  ]
 | 
			
		||||
      [$record                          s  ]
 | 
			
		||||
      [$make-record                     s  ]
 | 
			
		||||
      [$record?                         s  ]
 | 
			
		||||
      [$record/rtd?                     s  ]
 | 
			
		||||
      [$make-port/input                 s  ]
 | 
			
		||||
      [$make-port/output                s  ]
 | 
			
		||||
      [$make-port/both                  s  ]
 | 
			
		||||
      [$port-handler                    s  ]
 | 
			
		||||
      [$port-input-buffer               s  ]
 | 
			
		||||
      [$port-input-index                s  ]
 | 
			
		||||
      [$port-input-size                 s  ]
 | 
			
		||||
      [$port-output-buffer              s  ]
 | 
			
		||||
      [$port-output-index               s  ]
 | 
			
		||||
      [$port-output-size                s  ]
 | 
			
		||||
      [$set-port-input-index!           s  ]
 | 
			
		||||
      [$set-port-input-size!            s  ]
 | 
			
		||||
      [$set-port-output-index!          s  ]
 | 
			
		||||
      [$set-port-output-size!           s  ]
 | 
			
		||||
;      [$make-input-port                 s  ]
 | 
			
		||||
;      [$make-output-port                s  ]
 | 
			
		||||
;      [$make-input/output-port          s  ]
 | 
			
		||||
      [$flush-output-port               s  ]
 | 
			
		||||
      [$reset-input-port!               s  ]
 | 
			
		||||
      [$close-input-port                s  ]
 | 
			
		||||
      [$close-output-port               s  ]
 | 
			
		||||
      [$write-char                      s  ]
 | 
			
		||||
      [$read-char                       s  ]
 | 
			
		||||
      [$peek-char                       s  ]
 | 
			
		||||
      [$unread-char                     s  ]
 | 
			
		||||
      [$closure-code                    s  ]
 | 
			
		||||
      [$code?                           s  ]
 | 
			
		||||
      [$code->closure                   s  ]
 | 
			
		||||
      [$code-reloc-vector               s  ]
 | 
			
		||||
      [$code-freevars                   s  ]
 | 
			
		||||
      [$code-size                       s  ]
 | 
			
		||||
      [$code-ref                        s  ]
 | 
			
		||||
      [$code-set!                       s  ]
 | 
			
		||||
      [$make-tcbucket                   s  ]
 | 
			
		||||
      [$tcbucket-key                    s  ]
 | 
			
		||||
      [$tcbucket-val                    s  ]
 | 
			
		||||
| 
						 | 
				
			
			@ -492,8 +504,6 @@
 | 
			
		|||
      [$set-tcbucket-val!               s  ]
 | 
			
		||||
      [$set-tcbucket-next!              s  ]
 | 
			
		||||
      [$set-tcbucket-tconc!             s  ]
 | 
			
		||||
      [immediate?                       s i]
 | 
			
		||||
      [pointer-value                    s i]
 | 
			
		||||
      [$forward-ptr?                    s  ]
 | 
			
		||||
      [$unbound-object?                 s  ]
 | 
			
		||||
      [$make-call-with-values-procedure s  ]
 | 
			
		||||
| 
						 | 
				
			
			@ -507,14 +517,6 @@
 | 
			
		|||
      [$frame->continuation             s  ]
 | 
			
		||||
      [$current-frame                   s  ]
 | 
			
		||||
      [$seal-frame-and-call             s  ]
 | 
			
		||||
      [installed-libraries              s i]
 | 
			
		||||
      [library-subst/env                s i]
 | 
			
		||||
      [find-library-by-name             s i]
 | 
			
		||||
      [imported-label->binding          s i]
 | 
			
		||||
      [imported-loc->library            s i]
 | 
			
		||||
      [library-spec                     s i]
 | 
			
		||||
      [current-library-collection       s i]
 | 
			
		||||
      [invoke-library                   s i]
 | 
			
		||||
      [$apply-nonprocedure-error-handler s]
 | 
			
		||||
      [$incorrect-args-error-handler     s]
 | 
			
		||||
      [$multiple-values-error            s]
 | 
			
		||||
| 
						 | 
				
			
			@ -537,6 +539,11 @@
 | 
			
		|||
      [do-stack-overflow      s]
 | 
			
		||||
      [syntax-dispatch        s]
 | 
			
		||||
      [base-rtd               s i]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
      ))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue