CMUCL commit: intl-branch src (code/lispinit.lisp code/load.lisp compiler/main.lisp)

[Raymond Toy]

    Date: Sunday, February 7, 2010 @ 21:53:00
  Author: rtoy
    Path: /project/cmucl/cvsroot/src
     Tag: intl-branch

Modified: code/lispinit.lisp code/load.lisp compiler/main.lisp

code/lispinit.lisp:
o Set intl::*default-domain* to NIL.

code/load.lisp:
o Bind intl::*default-domain* so loading a file will reset the domain
  appropriately. 

compiler/main.lisp:
o Bind intl::*default-domain* so compiling a file will reset the
  domain appropriately.


--------------------+
 code/lispinit.lisp |    5 ++++-
 code/load.lisp     |    5 +++--
 compiler/main.lisp |    8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)


Index: src/code/lispinit.lisp
diff -u src/code/lispinit.lisp:1.79 src/code/lispinit.lisp:1.79.12.1
--- src/code/lispinit.lisp:1.79	Thu Jun 11 12:03:58 2009
+++ src/code/lispinit.lisp	Sun Feb  7 21:52:59 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/lispinit.lisp,v 1.79 2009-06-11 16:03:58 rtoy Rel $")
+  "$Header: /project/cmucl/cvsroot/src/code/lispinit.lisp,v 1.79.12.1 2010-02-08 02:52:59 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -405,6 +405,9 @@
   (setf (alien:extern-alien "internal_errors_enabled" boolean) t)
 
   (set-floating-point-modes :traps '(:overflow :invalid :divide-by-zero))
+
+  (setq intl::*default-domain* nil)
+  
   ;; This is necessary because some of the initial top level forms might
   ;; have changed the compilation policy in strange ways.
   (print-and-call c::proclaim-init)
Index: src/code/load.lisp
diff -u src/code/load.lisp:1.93 src/code/load.lisp:1.93.12.1
--- src/code/load.lisp:1.93	Thu Jun 11 12:03:58 2009
+++ src/code/load.lisp	Sun Feb  7 21:52:59 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/load.lisp,v 1.93 2009-06-11 16:03:58 rtoy Rel $")
+  "$Header: /project/cmucl/cvsroot/src/code/load.lisp,v 1.93.12.1 2010-02-08 02:52:59 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -546,7 +546,8 @@
       (let ((*package* *package*)
 	    (*readtable* *readtable*)
             (*enable-package-locked-errors* *enable-package-locked-errors*)
-	    (*load-depth* (1+ *load-depth*)))
+	    (*load-depth* (1+ *load-depth*))
+	    (intl::*default-domain* intl::*default-domain*))
 	(values
 	 (with-simple-restart (continue "Return NIL from load of ~S." filename)
 	   (if (streamp filename)
Index: src/compiler/main.lisp
diff -u src/compiler/main.lisp:1.148 src/compiler/main.lisp:1.148.2.1
--- src/compiler/main.lisp:1.148	Fri Jan 22 01:17:13 2010
+++ src/compiler/main.lisp	Sun Feb  7 21:53:00 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/compiler/main.lisp,v 1.148 2010-01-22 06:17:13 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/compiler/main.lisp,v 1.148.2.1 2010-02-08 02:53:00 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1677,7 +1677,8 @@
         If true, then may compile to interpreted byte code."
   (declare (type (member :lisp) language))
   (let ((info (make-stream-source-info stream language))
-	(*backend* *native-backend*))
+	(*backend* *native-backend*)
+	(intl::*default-domain* intl::*default-domain*))
     (unwind-protect
 	(let* ((*compile-object* (make-core-object))
 	       (won (sub-compile-file info source-info)))
@@ -1967,7 +1968,8 @@
 	     (*last-message-count* 0)
 	     (*compile-object* (make-core-object))
 	     (*gensym-counter* 0)
-	     (*current-function-names* (list name)))
+	     (*current-function-names* (list name))
+	     (intl::*default-domain* intl::*default-domain*))
 	(with-debug-counters
 	  (clear-stuff)
 	  (find-source-paths form 0)