Author: bernhard Date: Sun Jun 17 08:33:35 2007 New Revision: 19066 Modified: trunk/languages/lisp/lisp/bootstrap.l trunk/languages/lisp/lisp/core.l trunk/languages/lisp/lisp/objects.l
Log: [languages/lisp] Reenable a few lines of bootstrapping code. Modified: trunk/languages/lisp/lisp/bootstrap.l ============================================================================== --- trunk/languages/lisp/lisp/bootstrap.l (original) +++ trunk/languages/lisp/lisp/bootstrap.l Sun Jun 17 08:33:35 2007 @@ -86,21 +86,21 @@ ;; ; (apply fn (list form env)))) ;; ;; Create the KEYWORD package. -;; (sys:%make-package "KEYWORD") -;; -;; (sys:load "lisp/objects.l") -;; (sys:load "lisp/core.l") -;; (sys:load "lisp/logic.l") -;; (sys:load "lisp/pred.l") -;; (sys:load "lisp/list.l") -;; (sys:load "lisp/math.l") -;; +(sys:%make-package "KEYWORD") + +(sys:load "lisp/objects.l") +(sys:load "lisp/core.l") +(sys:load "lisp/logic.l") +(sys:load "lisp/pred.l") +(sys:load "lisp/list.l") +(sys:load "lisp/math.l") + ;; Create and alias the COMMON-LISP-USER package. -;; (sys:%make-package "COMMON-LISP-USER") -;; (sys:%alias-package (sys:%find-package "COMMON-LISP-USER") "CL-USER") -;; -;; (cl:setq *package* (sys:%find-package "CL-USER")) -;; (sys:%use-package (sys:%find-package "CL-USER") -;; (sys:%find-package "COMMON-LISP")) -;; -;; ; (in-package "COMMON-LISP-USER") +(sys:%make-package "COMMON-LISP-USER") +(sys:%alias-package (sys:%find-package "COMMON-LISP-USER") "CL-USER") + +;; (cl:setq *package* (sys:%find-package "CL-USER")) +(sys:%use-package (sys:%find-package "CL-USER") + (sys:%find-package "COMMON-LISP")) + +; (in-package "COMMON-LISP-USER") Modified: trunk/languages/lisp/lisp/core.l ============================================================================== --- trunk/languages/lisp/lisp/core.l (original) +++ trunk/languages/lisp/lisp/core.l Sun Jun 17 08:33:35 2007 @@ -1,6 +1,6 @@ -; (setq cl:*package* (sys:%find-package "COMMON-LISP")) -; -; ;; Define a temporary, primitive version of the defun macro. +(setq cl:*package* (sys:%find-package "COMMON-LISP")) + +;; Define a temporary, primitive version of the defun macro. ; (sys:set-symbol-function 'defun ; (sys:%make-macro ; #'(lambda (form env) @@ -16,6 +16,3 @@ ; ; (defun in-package (pkg) ; (setq *package* (sys:%find-package pkg))) -; -; -; Modified: trunk/languages/lisp/lisp/objects.l ============================================================================== --- trunk/languages/lisp/lisp/objects.l (original) +++ trunk/languages/lisp/lisp/objects.l Sun Jun 17 08:33:35 2007 @@ -1,4 +1,4 @@ -; (cl:setq cl:*package* (sys:%find-package "SYSTEM")) +(cl:setq cl:*package* (sys:%find-package "SYSTEM")) ; ; ;; Set up some of the accessors for the LispSymbol class attributes. ; (%set-object-attribute 'set-symbol-function
