Consolidate all Lisp files into scheme-* with .scm extension

.gitignore

@@ -1,2 +1,3 @@
 /build-*/
-/flisp.boot.bak
+/scheme-core/flisp.boot.bak
+/scheme-core/flisp.boot.new

scheme-core/mkboot0.scm

@@ -4,7 +4,7 @@
 (if (not (bound? 'set-top-level-value!)) (set! set-top-level-value! set))
 (if (not (bound? 'eof-object?)) (set! eof-object? (lambda (x) #f)))
 
-;(load "compiler.lsp")
+;(load "compiler.scm")
 
 (define (compile-file inf)
   (let ((in  (file inf :read)))

scheme-core/mkboot1.scm

@@ -1,5 +1,5 @@
 ; -*- scheme -*-
 
-(load "system.lsp")
+(load "system.scm")
-(load "compiler.lsp")
+(load "compiler.scm")
 (make-system-image "flisp.boot")

scheme-lib/psyntax-expanded.scm

@@ -1,7 +1,7 @@
 ;;; psyntax.pp
-;;; automatically generated from psyntax.ss
+;;; automatically generated from psyntax.scm
 ;;; Mon Feb 26 23:22:05 EST 2007
-;;; see copyright notice in psyntax.ss
+;;; see copyright notice in psyntax.scm
 
 ((lambda ()
    (letrec ((noexpand62 '"noexpand")

scheme-lib/psyntax.scm

@@ -296,9 +296,9 @@
 ;;; should remove the association between the given symbol and key.
 
 ;;; When porting to a new Scheme implementation, you should define the
-;;; procedures listed above, load the expanded version of psyntax.ss
+;;; procedures listed above, load the expanded version of psyntax.scm
 ;;; (psyntax.pp, which should be available whereever you found
-;;; psyntax.ss), and register sc-expand as the current expander (how
+;;; psyntax.scm), and register sc-expand as the current expander (how
 ;;; you do this depends upon your implementation of Scheme).  You may
 ;;; change the hooks and constructors defined toward the beginning of
 ;;; the code below, but to avoid bootstrapping problems, do so only

scheme-tests/ast/rpasses.scm

@@ -1,6 +1,6 @@
 ; -*- scheme -*-
-(load "match.lsp")
+(load "match-lsp.scm")
-(load "asttools.lsp")
+(load "asttools.scm")
 
 (define missing-arg-tag '*r-missing*)
 

scheme-tests/perf.scm

@@ -1,7 +1,7 @@
-(load "test.lsp")
+(load "test.scm")
 
 (princ "colorgraph: ")
-(load "tcolor.lsp")
+(load "tcolor.scm")
 
 (princ "fib(34): ")
 (assert (equal? (time (fib 34)) 5702887))
@@ -30,8 +30,8 @@
 
 (path.cwd "ast")
 (princ "p-lambda: ")
-(load "rpasses.lsp")
+(load "rpasses.scm")
-(define *input* (load "datetimeR.lsp"))
+(define *input* (load "datetimeR.scm"))
 (time (set! *output* (compile-ish *input*)))
-(assert (equal? *output* (load "rpasses-out.lsp")))
+(assert (equal? *output* (load "rpasses-out.scm")))
 (path.cwd "..")

scheme-tests/tcolor.scm

@@ -1,7 +1,7 @@
 ; -*- scheme -*-
 ; color for performance
 
-(load "color.lsp")
+(load "color.scm")
 
 ; 100x color 5 queens
 (define Q (generate-5x5-pairs))

scheme-tests/torus.scm

@@ -38,7 +38,7 @@
     l))
 
 (time (begin (print (torus 100 100)) ()))
-;(time (dotimes (i 1) (load "100x100.lsp")))
+;(time (dotimes (i 1) (load "100x100.scm")))
 ; with ltable
 ; printing time: 0.415sec
 ; reading time: 0.165sec

scheme-tests/unittest.scm

@@ -212,7 +212,7 @@
 (define (fib n) (if (< n 2) n (+ (fib (- n 1)) (fib (- n 2)))))
 (assert (equal? (fib 20) 6765))
 
-(load "color.lsp")
+(load "color.scm")
 (assert (equal? (color-pairs (generate-5x5-pairs) '(a b c d e))
 		'((23 . a) (9 . a) (22 . b) (17 . d) (14 . d) (8 . b) (21 . e)
 		  (19 . b) (16 . c) (13 . c) (11 . b) (7 . e) (24 . c) (20 . d)

scripts/build.sh

@@ -38,19 +38,19 @@ $CC $LFLAGS -o flisp -lm \
     builtins.o equalhash.o flisp.o flmain.o iostream.o string.o table.o \
     bitvector-ops.o bitvector.o dirpath.o dump.o hashing.o htable.o \
     int2str.o ios.o lltinit.o ptrhash.o random.o socket.o timefuncs.o utf8.o
-ln -s ../flisp.boot flisp.boot
+ln -s ../scheme-core/flisp.boot flisp.boot
 { set +x; } 2>/dev/null
-cd ..
+cd ../scheme-core
 echo "Entering directory '$PWD'"
 echo "Creating stage 0 boot file..."
 set -x
-"$builddir"/flisp mkboot0.lsp system.lsp compiler.lsp >flisp.boot.new
+../"$builddir"/flisp mkboot0.scm system.scm compiler.scm >flisp.boot.new
 mv flisp.boot.new flisp.boot
 { set +x; } 2>/dev/null
 echo "Creating stage 1 boot file..."
 set -x
-"$builddir"/flisp mkboot1.lsp
+../"$builddir"/flisp mkboot1.scm
 { set +x; } 2>/dev/null
-cd tests
+cd ../scheme-tests
 echo "Entering directory '$PWD'"
-../"$builddir"/flisp unittest.lsp
+../"$builddir"/flisp unittest.scm