Changeset 13714
- Timestamp:
- 01/04/12 13:44:29 (12 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/StandardClass.java
r13713 r13714 388 388 public static final StandardClass METAOBJECT = 389 389 addStandardClass(Symbol.METAOBJECT, list(STANDARD_OBJECT)); 390 public static final StandardClass SPECIALIZER = 391 addStandardClass(Symbol.SPECIALIZER, list(METAOBJECT)); 390 392 391 393 public static final StandardClass SLOT_DEFINITION = … … 423 425 424 426 public static final StandardClass CLASS = 425 addStandardClass(Symbol.CLASS, list(S TANDARD_OBJECT));427 addStandardClass(Symbol.CLASS, list(SPECIALIZER)); 426 428 427 429 public static final StandardClass BUILT_IN_CLASS = … … 579 581 new SlotDefinition(Symbol.OPERANDS, 580 582 list(PACKAGE_CL.intern("ARITHMETIC-ERROR-OPERANDS"))))); 581 BUILT_IN_CLASS.setCPL(BUILT_IN_CLASS, CLASS, S TANDARD_OBJECT,583 BUILT_IN_CLASS.setCPL(BUILT_IN_CLASS, CLASS, SPECIALIZER, METAOBJECT, STANDARD_OBJECT, 582 584 BuiltInClass.CLASS_T); 583 585 CELL_ERROR.setCPL(CELL_ERROR, ERROR, SERIOUS_CONDITION, CONDITION, … … 586 588 list(new SlotDefinition(Symbol.NAME, 587 589 list(Symbol.CELL_ERROR_NAME)))); 588 CLASS.setCPL(CLASS, S TANDARD_OBJECT, BuiltInClass.CLASS_T);590 CLASS.setCPL(CLASS, SPECIALIZER, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T); 589 591 COMPILER_ERROR.setCPL(COMPILER_ERROR, CONDITION, STANDARD_OBJECT, 590 592 BuiltInClass.CLASS_T); … … 633 635 STANDARD_OBJECT, BuiltInClass.CLASS_T); 634 636 FORWARD_REFERENCED_CLASS.setCPL(FORWARD_REFERENCED_CLASS, CLASS, 635 BuiltInClass.CLASS_T);637 SPECIALIZER, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T); 636 638 GENERIC_FUNCTION.setCPL(GENERIC_FUNCTION, METAOBJECT, STANDARD_OBJECT, 637 639 BuiltInClass.FUNCTION, … … 642 644 list(new SlotDefinition(Symbol.CAUSE, list(Symbol.JAVA_EXCEPTION_CAUSE)))); 643 645 METAOBJECT.setCPL(METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T); 646 SPECIALIZER.setCPL(SPECIALIZER, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T); 644 647 METHOD.setCPL(METHOD, METAOBJECT, STANDARD_OBJECT, BuiltInClass.CLASS_T); 645 648 PACKAGE_ERROR.setCPL(PACKAGE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION, … … 675 678 SIMPLE_WARNING.setCPL(SIMPLE_WARNING, SIMPLE_CONDITION, WARNING, 676 679 CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T); 677 STANDARD_CLASS.setCPL(STANDARD_CLASS, CLASS, 680 STANDARD_CLASS.setCPL(STANDARD_CLASS, CLASS, SPECIALIZER, METAOBJECT, 678 681 STANDARD_OBJECT, BuiltInClass.CLASS_T); 679 682 STANDARD_OBJECT.setCPL(STANDARD_OBJECT, BuiltInClass.CLASS_T); … … 685 688 list(new SlotDefinition(Symbol.STREAM, 686 689 list(PACKAGE_CL.intern("STREAM-ERROR-STREAM"))))); 687 STRUCTURE_CLASS.setCPL(STRUCTURE_CLASS, CLASS, S TANDARD_OBJECT,688 BuiltInClass.CLASS_T);690 STRUCTURE_CLASS.setCPL(STRUCTURE_CLASS, CLASS, SPECIALIZER, METAOBJECT, 691 STANDARD_OBJECT, BuiltInClass.CLASS_T); 689 692 STYLE_WARNING.setCPL(STYLE_WARNING, WARNING, CONDITION, STANDARD_OBJECT, 690 693 BuiltInClass.CLASS_T); … … 730 733 JAVA_EXCEPTION.finalizeClass(); 731 734 METAOBJECT.finalizeClass(); 735 SPECIALIZER.finalizeClass(); 732 736 PACKAGE_ERROR.finalizeClass(); 733 737 PARSE_ERROR.finalizeClass(); -
trunk/abcl/src/org/armedbear/lisp/Symbol.java
r13713 r13714 2970 2970 public static final Symbol METAOBJECT = 2971 2971 PACKAGE_MOP.addExternalSymbol("METAOBJECT"); 2972 public static final Symbol SPECIALIZER = 2973 PACKAGE_MOP.addExternalSymbol("SPECIALIZER"); 2972 2974 public static final Symbol STANDARD_READER_METHOD = 2973 2975 PACKAGE_MOP.addExternalSymbol("STANDARD-READER-METHOD");
Note: See TracChangeset
for help on using the changeset viewer.