From 1189054f7f23b886407a1be8263f4ab41edaa999 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 14 Sep 2007 19:42:36 +0000
Subject: 	* vmlisp.lisp.pamphlet: Don't define package VMLISP.  Remove 
 export declarations.  Import "boot-pkg". 	* sys-macros.lisp (EQUABLE):
 Remove definition. 	* sys-constants.boot ($true): Define as twice quoted
 T. 	* hash.lisp.pamphlet: Push into package BOOT, VMLISP. 	*
 ggreater.lisp: Likewise. 	* nlib.lisp.pamphlet: Likewise. 	*
 obey.lisp: Likewise. 	* construc.lisp.pamphlet: Remove reference to VMLISP
 package. 	* daase.lisp.pamphlet: Likewise. 	* debug.lisp.pamphlet:
 Likewise. 	* util.lisp.pamphlet: Likewise. 	* cformat.boot: Remove
 hack for GCL limitation. 	* scan.boot: Likewise. 	* incl.boot: Likewise.
 	* parsing.lisp: Likewise. 	* bootlex.lisp: Remove reference to
 VMLISP package. 	* union.lisp: Likewise. 	* boot-pkg.lisp:
 Remove hack for GCL limitation.  Don't import 	"vmlisp" anymore. 	*
 bookvol5.pamphlet (vmlisp::$current-directory): Remove. 	*
 patches.lisp.pamphlet: Likewise. 	* astr.boot: Import "vmlisp" instead
 of "boot-pkg". 	* Makefile.pamphlet (boot-pkg.$(FASLEXT)): Don't
 depend on 	vmlisp.$(FASLEXT). 	(vmlisp.$(FASLEXT)): Depend on
 boot=pkg.$(FASLEXT).

---
 src/interp/construc.lisp.pamphlet | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/src/interp/construc.lisp.pamphlet b/src/interp/construc.lisp.pamphlet
index 51ebf1c6..947429e7 100644
--- a/src/interp/construc.lisp.pamphlet
+++ b/src/interp/construc.lisp.pamphlet
@@ -204,10 +204,10 @@
  (rdefiostream (list (cons 'file p) '(mode . input)) nil fn))
 
 
-(in-package "VMLISP")
+(in-package "BOOT")
 
 ; from nlib.lisp
-(defun vmlisp::get-index-table-from-stream (stream &optional abbrev)
+(defun get-index-table-from-stream (stream &optional abbrev)
  (let (pos)
   (file-position stream 0)
   (setq pos (read stream))
@@ -221,18 +221,18 @@
      (read stream))
    ('else pos))))
 
-(defun vmlisp::loadvol (&rest filearg)
+(defun loadvol (&rest filearg)
   (cond ((typep (car filearg) 'libstream)
 	 (load (concat (libstream-dirname (car filearg)) "/code")))
 	(t 
           (setq filearg (make-input-filename (boot::mergelib filearg) 'LISPLIB))
-	  (if (vmlisp::library-file filearg)
+	  (if (library-file filearg)
 	      (load (concat filearg "/code"))
 	    (load filearg)))))
 
 ; from nlib.lisp
 ;; (RDEFIOSTREAM ((MODE . IO) (FILE fn ft dir))) IO is I,O,INPUT,OUTPUT
-(defun vmlisp::rdefiostream
+(defun rdefiostream
               (options &optional (missing-file-error-flag t) abbrev)
   (let ((mode (cdr (assoc 'mode options)))
 	(file (assoc 'file options))
@@ -241,14 +241,14 @@
 	(indextable nil))
         (cond ((equal (elt (string mode) 0) #\I)
 	       (setq fullname (make-input-filename (cdr file) 'LISPLIB))
-	       (setq stream (vmlisp::get-input-index-stream fullname))
+	       (setq stream (get-input-index-stream fullname))
                (if (null stream)
 		   (if missing-file-error-flag
 		       (ERROR (format nil "Library ~s doesn't exist"
 			      (make-filename (cdr file) 'LISPLIB)))
 		     NIL)
                (make-libstream :mode 'input  :dirname fullname
-                   :indextable (vmlisp::get-index-table-from-stream stream abbrev)
+                   :indextable (get-index-table-from-stream stream abbrev)
                    :indexstream stream)))
               ((equal (elt (string mode) 0) #\O)
 	       (setq fullname (make-full-namestring (cdr file) 'LISPLIB))
-- 
cgit v1.2.3