Changeset 11292

Timestamp:

08/31/08 00:52:09 (14 years ago)

Author:

ehuelsmann

Message:

Add 'package.lisp' to hold package functions which signal continuable errors as required per the spec.

Resolves MAKE-PACKAGE.ERROR.x from the ansi-tests.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• PackageFunctions.java (modified) (1 diff)
• boot.lisp (modified) (2 diffs)
• compile-system.lisp (modified) (1 diff)
• package.lisp (added)

trunk/j/src/org/armedbear/lisp/PackageFunctions.java

@@ -78 +78 @@
     };
 
-    // ### import
-    // import symbols &optional package => t
-    private static final Primitive IMPORT =
-        new Primitive("import", "symbols &optional package")
+    // ### %import
+    // %import symbols &optional package => t
+    private static final Primitive _IMPORT =
+        new Primitive("%import", PACKAGE_SYS, false)
     {
         public LispObject execute(LispObject[] args) throws ConditionThrowable

trunk/j/src/org/armedbear/lisp/boot.lisp

@@ -130 +130 @@
 (load-system-file "macros")
 
+;; Redefined in package.lisp
 (defun make-package (package-name &key nicknames use)
   (%make-package package-name nicknames use))
@@ -293 +294 @@
 (load-system-file "pprint")
 (load-system-file "defsetf")
+(load-system-file "package")
+
 
 (defun preload-package (pkg)

trunk/j/src/org/armedbear/lisp/compile-system.lisp

@@ -191 +191 @@
                                      "parse-lambda-list.lisp"
                                      "pathnames.lisp"
+                                     ;;"package.lisp"
                                      ;;"print-object.lisp"
                                      "print-unreadable-object.lisp"