Changeset 12205


Ignore:
Timestamp:
10/17/09 21:08:35 (12 years ago)
Author:
ehuelsmann
Message:

Fix hard crashes in BEYOND-ANSI tests.

Note: Don't cheer too hard; there are 158 tests failing (out of 527).

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
2 edited

Legend:

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

    r12124 r12205  
    4848        if (args.cdr() != NIL)
    4949          return error(new WrongNumberOfArgumentsException(this));
    50         return ((Cons)args).car;
     50        return args.car();
    5151      }
    5252    };
  • trunk/abcl/src/org/armedbear/lisp/StandardObject.java

    r11754 r12205  
    253253    Debug.assertTrue(layout != null);
    254254    int index = layout.getSlotIndex(slotName);
    255     Debug.assertTrue(index >= 0);
     255    //### FIXME: should call SLOT-MISSING (clhs)
     256    if (index < 0)
     257      return error(new LispError("Missing slot " + slotName.writeToString()));
    256258    return slots[index];
    257259  }
     
    269271    Debug.assertTrue(layout != null);
    270272    int index = layout.getSlotIndex(slotName);
    271     Debug.assertTrue(index >= 0);
     273    //### FIXME: should call SLOT-MISSING (clhs)
     274    if (index < 0)
     275      error(new LispError("Missing slot " + slotName.writeToString()));
    272276    slots[index] = newValue;
    273277  }
Note: See TracChangeset for help on using the changeset viewer.