aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/interp/ChangeLog8
-rw-r--r--src/interp/Makefile.in2
-rw-r--r--src/interp/Makefile.pamphlet2
-rw-r--r--src/interp/cstream.boot.pamphlet2
-rw-r--r--src/interp/macros.lisp.pamphlet10
-rw-r--r--src/interp/sys-macros.lisp13
6 files changed, 27 insertions, 10 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 2246e539..6a564d6d 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,13 @@
2007-09-12 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * Makefile.pamphlet (cstream.$(FASLEXT)): New rule.
+ * cstream.boot.pamphlet: Import sys-macros.
+ * sys-macros.lisp (|shoeConsole|): Move from macros.lisp.pamphlet.
+ (|shoeInputFile|): Likewise.
+ (|shoeread-line|): Likewise.
+
+2007-09-12 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* dq.boot: New.
* dq.boot.pamphlet: Move content to dq.boot.pamphlet. Remove.
* vmlisp.lisp.pamphlet (BPINAME): Define for SBCL.
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in
index 0664b77a..d8f00284 100644
--- a/src/interp/Makefile.in
+++ b/src/interp/Makefile.in
@@ -477,6 +477,8 @@ database.date:
$(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
$(INSTALL) $< $@
+cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index a698508a..fe3e5fc6 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -1972,6 +1972,8 @@ distclean-local: clean-local
$(AUTO)/%.$(FASLEXT): %.$(FASLEXT)
$(INSTALL) $< $@
+cstream.$(FASLEXT): cstream.clisp sys-macros.$(FASLEXT)
+ $(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
dq.$(FASLEXT): dq.boot boot-pkg.$(FASLEXT)
$(BOOTSYS) -- --compile --output=$@ --load-directory=. $<
diff --git a/src/interp/cstream.boot.pamphlet b/src/interp/cstream.boot.pamphlet
index c9d80c10..46be9728 100644
--- a/src/interp/cstream.boot.pamphlet
+++ b/src/interp/cstream.boot.pamphlet
@@ -60,6 +60,8 @@ explains the strange parsing technique).
<<*>>=
<<license>>
+import '"sys-macros"
+
)package "BOOT"
--% Stream Utilities
diff --git a/src/interp/macros.lisp.pamphlet b/src/interp/macros.lisp.pamphlet
index e1a67392..131c80b8 100644
--- a/src/interp/macros.lisp.pamphlet
+++ b/src/interp/macros.lisp.pamphlet
@@ -1007,16 +1007,6 @@ terminals and empty or at-end files. In Common Lisp, we must assume record size
((equal n 3) (remhash key ht))
('t (hput ht key n)) ) nil))
-
-(defmacro |shoeConsole| (line)
- `(write-line ,line *terminal-io*))
-
-(defmacro |shoeInputFile| (filespec)
- `(open ,filespec :direction :input :if-does-not-exist nil))
-
-(defmacro |shoeread-line| (st)
- `(read-line ,st nil nil))
-
;;
;; -*- Record Structures -*-
;;
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp
index 01795fd3..d198e8f0 100644
--- a/src/interp/sys-macros.lisp
+++ b/src/interp/sys-macros.lisp
@@ -1209,3 +1209,16 @@
(if (STATEP ,g)
(throw 'YIELD (list 'pair ,L) ,g)))))
+;;
+;; -*- Input/Output -*-
+;;
+
+(defmacro |shoeConsole| (line)
+ `(write-line ,line *terminal-io*))
+
+(defmacro |shoeInputFile| (filespec)
+ `(open ,filespec :direction :input :if-does-not-exist nil))
+
+(defmacro |shoeread-line| (st)
+ `(read-line ,st nil nil))
+