From a400a22ec68a05a859a9aa5aee7a447ac6fc4a55 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Fri, 13 Apr 2018 12:29:50 +0200
Subject: [PATCH] Move SCHINT to QUUX like RABBIT expects.

---
 Makefile                           |  2 +-
 build/scheme.tcl                   | 22 +++++++++++++---------
 src/{nschem => quux}/-read-.-this- |  0
 src/{nschem => quux}/scheme.(dump) |  6 +++---
 src/{nschem => quux}/scheme.(init) |  7 ++++---
 src/{nschem => quux}/schint.lsp    |  0
 src/{nschem => quux}/schmac.lsp    |  0
 src/{nschem => quux}/schuuo.lsp    |  0
 8 files changed, 21 insertions(+), 16 deletions(-)
 rename src/{nschem => quux}/-read-.-this- (100%)
 rename src/{nschem => quux}/scheme.(dump) (70%)
 rename src/{nschem => quux}/scheme.(init) (59%)
 rename src/{nschem => quux}/schint.lsp (100%)
 rename src/{nschem => quux}/schmac.lsp (100%)
 rename src/{nschem => quux}/schuuo.lsp (100%)

diff --git a/Makefile b/Makefile
index 71353f7d..4ac9963a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ SRC = system syseng sysen1 sysen2 sysen3 sysnet kshack dragon channa	\
       inquir acount gz sys decsys ecc alan sail kcc kcc_sy c games archy dcp \
       spcwar rwg libmax rat z emaxim rz maxtul aljabr cffk das ell ellen \
       jim jm jpg macrak maxdoc maxsrc mrg munfas paulw reh rlb rlb% share \
-      tensor transl wgd zz graphs lmlib pratt nschem scheme gsb ejs
+      tensor transl wgd zz graphs lmlib pratt quux scheme gsb ejs
 DOC = info _info_ sysdoc sysnet syshst kshack _teco_ emacs emacs1 c kcc chprog
 BIN = sys2 emacs _teco_ lisp liblsp alan inquir sail comlap c decsys moon graphs
 
diff --git a/build/scheme.tcl b/build/scheme.tcl
index d38e49a0..4c555598 100644
--- a/build/scheme.tcl
+++ b/build/scheme.tcl
@@ -9,6 +9,19 @@ respond "*" {(load "scheme; nschsy fasl")}
 respond "\n" "(schemedump)"
 respond "==>" "(quit)"
 
+# New Scheme interpreter
+respond "*" "complr\013"
+respond "_" "quux;_schint lsp\r"
+respond "_" "quux;_schmac lsp\r"
+respond "_" "quux;_schuuo lsp\r"
+respond "_" "\032"
+type ":kill\r"
+
+respond "*" ":link quux;scheme interp, schint fasl\r"
+respond "*" ":link quux;scheme macros, schmac fasl\r"
+respond "*" ":link quux;scheme uuohan, schuuo fasl\r"
+respond "*" ":lisp scheme (dump)\r"
+
 # Rabbit Scheme compiler
 respond "*" ":scheme;scheme\r"
 respond "==>" {(schload "scheme; rabbit")}
@@ -24,12 +37,3 @@ respond "==>" {(schload "scheme; rabbit fasl")}
 respond "==>" "(dumpit)"
 respond "Dump anyway" " "
 respond "TS RABBIT" "\r"
-
-# New Scheme interpreter
-respond "*" "complr\013"
-respond "_" "nschem;scheme interp_schint lsp\r"
-respond "_" "nschem;scheme macros_schmac lsp\r"
-respond "_" "nschem;scheme uuohan_schuuo lsp\r"
-respond "_" "\032"
-type ":kill\r"
-respond "*" ":lisp scheme (dump)\r"
diff --git a/src/nschem/-read-.-this- b/src/quux/-read-.-this-
similarity index 100%
rename from src/nschem/-read-.-this-
rename to src/quux/-read-.-this-
diff --git a/src/nschem/scheme.(dump) b/src/quux/scheme.(dump)
similarity index 70%
rename from src/nschem/scheme.(dump)
rename to src/quux/scheme.(dump)
index c5b381d0..b050322f 100644
--- a/src/nschem/scheme.(dump)
+++ b/src/quux/scheme.(dump)
@@ -1,9 +1,9 @@
 (comment)
 (progn
   (close (prog1 infile (inpush -1)))
-  (load "nschem; scheme interp")
-  (load "nschem; scheme macros")
-  (load "nschem; scheme uuohan")
+  (load "quux; scheme interp")
+  (load "quux; scheme macros")
+  (load "quux; scheme uuohan")
   (sstatus toplevel '(toplevel))
   (sstatus feature noldmsg)
   (gctwa)
diff --git a/src/nschem/scheme.(init) b/src/quux/scheme.(init)
similarity index 59%
rename from src/nschem/scheme.(init)
rename to src/quux/scheme.(init)
index aca9bdbd..881115bb 100755
--- a/src/nschem/scheme.(init)
+++ b/src/quux/scheme.(init)
@@ -1,12 +1,13 @@
 ;; This was quux;scheme (init)
 ;; I moved it to nschem;   -maeda 5/26/89
+;; I moved it back to quux;   -Lars Brinkhoff 2018-04-13
 
 (comment list 60000. symbols 4000.)
 
 (progn (setq pure 1)
-       (fasload scheme interp dsk nschem)
-	(fasload scheme macros dsk nschem)
-	(fasload scheme uuohan dsk nschem)
+       (fasload scheme interp dsk quux)
+	(fasload scheme macros dsk quux)
+	(fasload scheme uuohan dsk quux)
        (setq alarmclock nil)
        (setq *displace-save-sw* nil)
 
diff --git a/src/nschem/schint.lsp b/src/quux/schint.lsp
similarity index 100%
rename from src/nschem/schint.lsp
rename to src/quux/schint.lsp
diff --git a/src/nschem/schmac.lsp b/src/quux/schmac.lsp
similarity index 100%
rename from src/nschem/schmac.lsp
rename to src/quux/schmac.lsp
diff --git a/src/nschem/schuuo.lsp b/src/quux/schuuo.lsp
similarity index 100%
rename from src/nschem/schuuo.lsp
rename to src/quux/schuuo.lsp