Changeset 4595

Timestamp:

11/02/03 00:23:29 (19 years ago)

Author:

piso

Message:

MAKE-CONDITION => SYS::%MAKE-CONDITION

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Autoload.java (modified) (3 diffs)
• make_condition.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: Autoload.java,v 1.95 2003-10-25 21:44:27 piso Exp $
+ * $Id: Autoload.java,v 1.96 2003-11-02 00:23:29 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -236 +236 @@
         autoload("logtest", "logtest");
         autoload("logxor", "logxor");
-        autoload("make-condition", "make_condition");
         autoload("make-string-input-stream", "StringInputStream");
         autoload("make-string-output-stream", "StringOutputStream");
@@ -267 +266 @@
         autoload(PACKAGE_SYS, "%defpackage", "PackageFunctions");
         autoload(PACKAGE_SYS, "%make-array", "make_array");
+        autoload(PACKAGE_SYS, "%make-condition", "make_condition");
         autoload(PACKAGE_SYS, "%make-hash-table", "HashTable");
         autoload(PACKAGE_SYS, "%make-pathname", "Pathname");

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: make_condition.java,v 1.6 2003-09-22 17:26:12 piso Exp $
+ * $Id: make_condition.java,v 1.7 2003-11-02 00:22:08 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.lisp;
 
-// ### make-condition
-public final class make_condition extends Primitive
+public final class make_condition extends Primitive2
 {
-    private make_condition(String name)
+    private make_condition()
     {
-        super(name);
+        super("%make-condition", PACKAGE_SYS, false);
     }
 
-    // make-condition type &rest slot-initializations => condition
-    public LispObject execute(LispObject[] args) throws ConditionThrowable
+    // ### %make-condition
+    // %make-condition type slot-initializations => condition
+    public LispObject execute(LispObject type, LispObject initArgs)
+        throws ConditionThrowable
     {
-        if (args.length < 1)
-            throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
-        LispObject type = args[0];
-        LispObject initArgs = NIL;
-        for (int i = args.length; i-- > 1;)
-            initArgs = new Cons(args[i], initArgs);
         if (type == Symbol.CONDITION)
             return new Condition(initArgs);
@@ -60 +55 @@
             return new UndefinedFunction(initArgs);
 
-//         if (type instanceof Symbol) {
-//             LispClass cls = findClass(type);
-//             if (cls instanceof StandardClass) {
-//                 return ((StandardClass)cls).makeInstance(initArgs);
-//             }
-//         }
-
-        throw new ConditionThrowable(new LispError("MAKE-CONDITION: unsupported type " + type));
+        return NIL;
     }
 
-    private static final make_condition MAKE_CONDITION =
-        new make_condition("make-condition");
+    private static final make_condition MAKE_CONDITION = new make_condition();
 }