From 85858b85b1fcf9f115ab3286f6e3c9cbf06cbb3d Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 19 Aug 2007 20:47:19 +0000
Subject: 	* boot-pkg.lisp: New.

	* Makefile.pamphlet (${DEPSYS}): Depend on it
	(parsing.$(FASLEXT)): Likewise.
	(bookvol5.$(FASLEXT)): Likewise.
	(nocompil.$(FASLEXT)): Likewise.
	(bootfuns.$(FASLEXT)): Likewise.
	(boot-pkg.$(FASLEXT)): New rule.
	(boot-pkg.lisp): New rule; work around GCL+VPATH voodoo.
	(VPATH): Clear.
	* Makefile.in: Regenerate.

	* bootfuns.lisp.pamphlet: Don't define package "BOOT" here.
	Import "boot-pkg".
	(|printLoadMessages|): Move to setvart.boot.pamphlet.
	Move special functions to boot-pkg.lisp.
	Move get-current-directory to daase.lisp.pamphlet.

	* setvart.boot.pamphlet (printLoadMessages): Move from
	bootfuns.lisp.pamphlet. Write as Boot code.

	* daase.lisp.pamphlet (get-current-directory): Move from
        bootfuns.lisp.pamphlet
---
 src/interp/parsing.lisp.pamphlet | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/interp/parsing.lisp.pamphlet')

diff --git a/src/interp/parsing.lisp.pamphlet b/src/interp/parsing.lisp.pamphlet
index ff27ac67..7301b8fe 100644
--- a/src/interp/parsing.lisp.pamphlet
+++ b/src/interp/parsing.lisp.pamphlet
@@ -90,12 +90,18 @@
 ;       5. Routines for inspecting and resetting total I/O system state
 ;
 ;       METALEX.LISP:  Meta file handling, auxiliary parsing actions and tokenizing
-;       METAMETA.LISP: Meta parsing
 ;
 ;       BOOTLEX.LISP:  Boot file handling, auxiliary parsing actions and tokenizing
 ;       NEWMETA.LISP:  Boot parsing
 
-(import-module "bootfuns")
+;; This is a horrible hack to work around a horrible bug in GCL
+;; as reported here:
+;;    http://lists.gnu.org/archive/html/gcl-devel/2007-08/msg00004.html
+;; 
+#+(and :gcl (not :common-lisp)) (in-package "VMLISP")
+#+(and :gcl (not :common-lisp)) (in-package "AxiomCore")
+
+(import-module "boot-pkg")
 (in-package "BOOT")
 
 ; 0. Current I/O Stream definition
-- 
cgit v1.2.3