Changeset 14018

Timestamp:

07/29/12 11:32:09 (9 years ago)

Author:

ehuelsmann

Message:

Fix #206 while moving the definition of the
condition classes to lisp.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• CompilerError.java (deleted)
• CompilerUnsupportedFeatureError.java (deleted)
• InternalCompilerError.java (deleted)
• StandardClass.java (modified) (3 diffs)
• Symbol.java (modified) (1 diff)
• compiler-error.lisp (modified) (1 diff)
• make_condition.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/StandardClass.java

@@ -598 +598 @@
     addStandardClass(Symbol.UNDEFINED_FUNCTION, list(CELL_ERROR));
 
-  public static final StandardClass COMPILER_ERROR =
-    addStandardClass(Symbol.COMPILER_ERROR, list(CONDITION));
-    
-  public static final StandardClass INTERNAL_COMPILER_ERROR =
-    addStandardClass(Symbol.INTERNAL_COMPILER_ERROR, list(CONDITION));
-
-  public static final StandardClass COMPILER_UNSUPPORTED_FEATURE_ERROR =
-    addStandardClass(Symbol.COMPILER_UNSUPPORTED_FEATURE_ERROR,
-                     list(CONDITION));
-
   public static final StandardClass JAVA_EXCEPTION =
     addStandardClass(Symbol.JAVA_EXCEPTION, list(ERROR));
@@ -650 +640 @@
                                list(Symbol.CELL_ERROR_NAME))));
     CLASS.setCPL(CLASS, SPECIALIZER, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
-    COMPILER_ERROR.setCPL(COMPILER_ERROR, CONDITION, STANDARD_OBJECT,
-                          BuiltInClass.CLASS_T);
-    INTERNAL_COMPILER_ERROR.setCPL(INTERNAL_COMPILER_ERROR, CONDITION, STANDARD_OBJECT,
-                                   BuiltInClass.CLASS_T);
-    COMPILER_UNSUPPORTED_FEATURE_ERROR.setCPL(COMPILER_UNSUPPORTED_FEATURE_ERROR,
-                                              CONDITION, STANDARD_OBJECT,
-                                              BuiltInClass.CLASS_T);
     CONDITION.setCPL(CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T);
     CONDITION.setDirectSlotDefinitions(
@@ -812 +795 @@
     ARITHMETIC_ERROR.finalizeClass();
     CELL_ERROR.finalizeClass();
-    COMPILER_ERROR.finalizeClass();
-    INTERNAL_COMPILER_ERROR.finalizeClass();
-    COMPILER_UNSUPPORTED_FEATURE_ERROR.finalizeClass();
     CONDITION.finalizeClass();
     CONTROL_ERROR.finalizeClass();

trunk/abcl/src/org/armedbear/lisp/Symbol.java

@@ -2926 +2926 @@
   public static final Symbol NIL_VECTOR =
     PACKAGE_EXT.addExternalSymbol("NIL-VECTOR");
-  public static final Symbol COMPILER_ERROR =
-    PACKAGE_EXT.addExternalSymbol("COMPILER-ERROR");
-  public static final Symbol INTERNAL_COMPILER_ERROR =
-    PACKAGE_EXT.addExternalSymbol("INTERNAL-COMPILER-ERROR");
-  public static final Symbol COMPILER_UNSUPPORTED_FEATURE_ERROR =
-    PACKAGE_EXT.addExternalSymbol("COMPILER-UNSUPPORTED-FEATURE-ERROR");
   public static final Symbol MAILBOX =
     PACKAGE_EXT.addExternalSymbol("MAILBOX");

trunk/abcl/src/org/armedbear/lisp/compiler-error.lisp

@@ -41 +41 @@
 (defvar *compiler-error-context* nil)
 
+(define-condition compiler-error (error))
+(define-condition internal-compiler-error (compiler-error))
+(define-condition compiler-unsupported-feature-error (compiler-error))
+
 (defun compiler-style-warn (format-control &rest format-arguments)
   (warn 'style-warning

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

@@ -120 +120 @@
             return new Warning(initArgs);
 
-        if (symbol == Symbol.COMPILER_ERROR)
-            return new CompilerError(initArgs);
-        if (symbol == Symbol.INTERNAL_COMPILER_ERROR)
-            return new InternalCompilerError(initArgs);
-        if (symbol == Symbol.COMPILER_UNSUPPORTED_FEATURE_ERROR)
-            return new CompilerUnsupportedFeatureError(initArgs);
-
         return NIL;
     }