Changeset 14018


Ignore:
Timestamp:
07/29/12 11:32:09 (8 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:
3 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/StandardClass.java

    r14007 r14018  
    598598    addStandardClass(Symbol.UNDEFINED_FUNCTION, list(CELL_ERROR));
    599599
    600   public static final StandardClass COMPILER_ERROR =
    601     addStandardClass(Symbol.COMPILER_ERROR, list(CONDITION));
    602    
    603   public static final StandardClass INTERNAL_COMPILER_ERROR =
    604     addStandardClass(Symbol.INTERNAL_COMPILER_ERROR, list(CONDITION));
    605 
    606   public static final StandardClass COMPILER_UNSUPPORTED_FEATURE_ERROR =
    607     addStandardClass(Symbol.COMPILER_UNSUPPORTED_FEATURE_ERROR,
    608                      list(CONDITION));
    609 
    610600  public static final StandardClass JAVA_EXCEPTION =
    611601    addStandardClass(Symbol.JAVA_EXCEPTION, list(ERROR));
     
    650640                               list(Symbol.CELL_ERROR_NAME))));
    651641    CLASS.setCPL(CLASS, SPECIALIZER, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T);
    652     COMPILER_ERROR.setCPL(COMPILER_ERROR, CONDITION, STANDARD_OBJECT,
    653                           BuiltInClass.CLASS_T);
    654     INTERNAL_COMPILER_ERROR.setCPL(INTERNAL_COMPILER_ERROR, CONDITION, STANDARD_OBJECT,
    655                                    BuiltInClass.CLASS_T);
    656     COMPILER_UNSUPPORTED_FEATURE_ERROR.setCPL(COMPILER_UNSUPPORTED_FEATURE_ERROR,
    657                                               CONDITION, STANDARD_OBJECT,
    658                                               BuiltInClass.CLASS_T);
    659642    CONDITION.setCPL(CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T);
    660643    CONDITION.setDirectSlotDefinitions(
     
    812795    ARITHMETIC_ERROR.finalizeClass();
    813796    CELL_ERROR.finalizeClass();
    814     COMPILER_ERROR.finalizeClass();
    815     INTERNAL_COMPILER_ERROR.finalizeClass();
    816     COMPILER_UNSUPPORTED_FEATURE_ERROR.finalizeClass();
    817797    CONDITION.finalizeClass();
    818798    CONTROL_ERROR.finalizeClass();
  • trunk/abcl/src/org/armedbear/lisp/Symbol.java

    r14007 r14018  
    29262926  public static final Symbol NIL_VECTOR =
    29272927    PACKAGE_EXT.addExternalSymbol("NIL-VECTOR");
    2928   public static final Symbol COMPILER_ERROR =
    2929     PACKAGE_EXT.addExternalSymbol("COMPILER-ERROR");
    2930   public static final Symbol INTERNAL_COMPILER_ERROR =
    2931     PACKAGE_EXT.addExternalSymbol("INTERNAL-COMPILER-ERROR");
    2932   public static final Symbol COMPILER_UNSUPPORTED_FEATURE_ERROR =
    2933     PACKAGE_EXT.addExternalSymbol("COMPILER-UNSUPPORTED-FEATURE-ERROR");
    29342928  public static final Symbol MAILBOX =
    29352929    PACKAGE_EXT.addExternalSymbol("MAILBOX");
  • trunk/abcl/src/org/armedbear/lisp/compiler-error.lisp

    r12622 r14018  
    4141(defvar *compiler-error-context* nil)
    4242
     43(define-condition compiler-error (error))
     44(define-condition internal-compiler-error (compiler-error))
     45(define-condition compiler-unsupported-feature-error (compiler-error))
     46
    4347(defun compiler-style-warn (format-control &rest format-arguments)
    4448  (warn 'style-warning
  • trunk/abcl/src/org/armedbear/lisp/make_condition.java

    r12620 r14018  
    120120            return new Warning(initArgs);
    121121
    122         if (symbol == Symbol.COMPILER_ERROR)
    123             return new CompilerError(initArgs);
    124         if (symbol == Symbol.INTERNAL_COMPILER_ERROR)
    125             return new InternalCompilerError(initArgs);
    126         if (symbol == Symbol.COMPILER_UNSUPPORTED_FEATURE_ERROR)
    127             return new CompilerUnsupportedFeatureError(initArgs);
    128 
    129122        return NIL;
    130123    }
Note: See TracChangeset for help on using the changeset viewer.