[armedbear-cvs] r14018 - trunk/abcl/src/org/armedbear/lisp

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Sun Jul 29 04:32:09 2012
New Revision: 14018

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

Deleted:
   trunk/abcl/src/org/armedbear/lisp/CompilerError.java
   trunk/abcl/src/org/armedbear/lisp/CompilerUnsupportedFeatureError.java
   trunk/abcl/src/org/armedbear/lisp/InternalCompilerError.java
Modified:
   trunk/abcl/src/org/armedbear/lisp/StandardClass.java
   trunk/abcl/src/org/armedbear/lisp/Symbol.java
   trunk/abcl/src/org/armedbear/lisp/compiler-error.lisp
   trunk/abcl/src/org/armedbear/lisp/make_condition.java

Modified: trunk/abcl/src/org/armedbear/lisp/StandardClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardClass.java	Sat Jul 28 13:44:37 2012	(r14017)
+++ trunk/abcl/src/org/armedbear/lisp/StandardClass.java	Sun Jul 29 04:32:09 2012	(r14018)
@@ -597,16 +597,6 @@
   public static final StandardClass UNDEFINED_FUNCTION =
     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));
 
@@ -649,13 +639,6 @@
       list(new SlotDefinition(Symbol.NAME,
                                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(
       list(new SlotDefinition(Symbol.FORMAT_CONTROL,
@@ -811,9 +794,6 @@
     GENERIC_FUNCTION.finalizeClass();
     ARITHMETIC_ERROR.finalizeClass();
     CELL_ERROR.finalizeClass();
-    COMPILER_ERROR.finalizeClass();
-    INTERNAL_COMPILER_ERROR.finalizeClass();
-    COMPILER_UNSUPPORTED_FEATURE_ERROR.finalizeClass();
     CONDITION.finalizeClass();
     CONTROL_ERROR.finalizeClass();
     DIVISION_BY_ZERO.finalizeClass();

Modified: trunk/abcl/src/org/armedbear/lisp/Symbol.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Symbol.java	Sat Jul 28 13:44:37 2012	(r14017)
+++ trunk/abcl/src/org/armedbear/lisp/Symbol.java	Sun Jul 29 04:32:09 2012	(r14018)
@@ -2925,12 +2925,6 @@
     PACKAGE_EXT.addExternalSymbol("MEMQL");
   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");
   public static final Symbol MUTEX =

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-error.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-error.lisp	Sat Jul 28 13:44:37 2012	(r14017)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-error.lisp	Sun Jul 29 04:32:09 2012	(r14018)
@@ -40,6 +40,10 @@
 
 (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
         :format-control format-control

Modified: trunk/abcl/src/org/armedbear/lisp/make_condition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/make_condition.java	Sat Jul 28 13:44:37 2012	(r14017)
+++ trunk/abcl/src/org/armedbear/lisp/make_condition.java	Sun Jul 29 04:32:09 2012	(r14018)
@@ -119,13 +119,6 @@
         if (symbol == Symbol.WARNING)
             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;
     }