[armedbear-cvs] r12254 - trunk/abcl/src/org/armedbear/lisp
Erik Huelsmann
ehuelsmann at common-lisp.net
Fri Nov 6 20:07:59 UTC 2009
Author: ehuelsmann
Date: Fri Nov 6 15:07:54 2009
New Revision: 12254
Log:
Remove 'throws ConditionThrowable' method annotations:
it's an unchecked exception now, so no need to declare it thrown.
Modified:
trunk/abcl/src/org/armedbear/lisp/AbstractArray.java
trunk/abcl/src/org/armedbear/lisp/AbstractBitVector.java
trunk/abcl/src/org/armedbear/lisp/AbstractString.java
trunk/abcl/src/org/armedbear/lisp/AbstractVector.java
trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java
trunk/abcl/src/org/armedbear/lisp/Autoload.java
trunk/abcl/src/org/armedbear/lisp/AutoloadMacro.java
trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte16.java
trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte32.java
trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte8.java
trunk/abcl/src/org/armedbear/lisp/Bignum.java
trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java
trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java
trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java
trunk/abcl/src/org/armedbear/lisp/CapitalizeFirstStream.java
trunk/abcl/src/org/armedbear/lisp/CapitalizeStream.java
trunk/abcl/src/org/armedbear/lisp/CaseFrobStream.java
trunk/abcl/src/org/armedbear/lisp/CellError.java
trunk/abcl/src/org/armedbear/lisp/CharacterFunctions.java
trunk/abcl/src/org/armedbear/lisp/Closure.java
trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java
trunk/abcl/src/org/armedbear/lisp/CompilerError.java
trunk/abcl/src/org/armedbear/lisp/CompilerUnsupportedFeatureError.java
trunk/abcl/src/org/armedbear/lisp/Complex.java
trunk/abcl/src/org/armedbear/lisp/ComplexArray.java
trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte32.java
trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java
trunk/abcl/src/org/armedbear/lisp/ComplexBitVector.java
trunk/abcl/src/org/armedbear/lisp/ComplexString.java
trunk/abcl/src/org/armedbear/lisp/ComplexVector.java
trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte32.java
trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte8.java
trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java
trunk/abcl/src/org/armedbear/lisp/Condition.java
trunk/abcl/src/org/armedbear/lisp/ConditionThrowable.java
trunk/abcl/src/org/armedbear/lisp/Cons.java
trunk/abcl/src/org/armedbear/lisp/ControlError.java
trunk/abcl/src/org/armedbear/lisp/DispatchMacroFunction.java
trunk/abcl/src/org/armedbear/lisp/DivisionByZero.java
trunk/abcl/src/org/armedbear/lisp/Do.java
trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java
trunk/abcl/src/org/armedbear/lisp/DowncaseStream.java
trunk/abcl/src/org/armedbear/lisp/EchoStream.java
trunk/abcl/src/org/armedbear/lisp/EndOfFile.java
trunk/abcl/src/org/armedbear/lisp/Environment.java
trunk/abcl/src/org/armedbear/lisp/EqualHashTable.java
trunk/abcl/src/org/armedbear/lisp/EqualpHashTable.java
trunk/abcl/src/org/armedbear/lisp/Extensions.java
trunk/abcl/src/org/armedbear/lisp/FaslReader.java
trunk/abcl/src/org/armedbear/lisp/FileError.java
trunk/abcl/src/org/armedbear/lisp/FileStream.java
trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java
trunk/abcl/src/org/armedbear/lisp/Fixnum.java
trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java
trunk/abcl/src/org/armedbear/lisp/FloatingPointInexact.java
trunk/abcl/src/org/armedbear/lisp/FloatingPointInvalidOperation.java
trunk/abcl/src/org/armedbear/lisp/FloatingPointOverflow.java
trunk/abcl/src/org/armedbear/lisp/FloatingPointUnderflow.java
trunk/abcl/src/org/armedbear/lisp/ForwardReferencedClass.java
trunk/abcl/src/org/armedbear/lisp/Function.java
trunk/abcl/src/org/armedbear/lisp/GenericFunction.java
trunk/abcl/src/org/armedbear/lisp/Go.java
trunk/abcl/src/org/armedbear/lisp/HashTable.java
trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.java
trunk/abcl/src/org/armedbear/lisp/IllegalMonitorState.java
trunk/abcl/src/org/armedbear/lisp/Interpreter.java
trunk/abcl/src/org/armedbear/lisp/JHandler.java
trunk/abcl/src/org/armedbear/lisp/JProxy.java
trunk/abcl/src/org/armedbear/lisp/Java.java
trunk/abcl/src/org/armedbear/lisp/JavaClass.java
trunk/abcl/src/org/armedbear/lisp/JavaException.java
trunk/abcl/src/org/armedbear/lisp/JavaObject.java
trunk/abcl/src/org/armedbear/lisp/JavaStackFrame.java
trunk/abcl/src/org/armedbear/lisp/Layout.java
trunk/abcl/src/org/armedbear/lisp/Lisp.java
trunk/abcl/src/org/armedbear/lisp/LispCharacter.java
trunk/abcl/src/org/armedbear/lisp/LispClass.java
trunk/abcl/src/org/armedbear/lisp/LispError.java
trunk/abcl/src/org/armedbear/lisp/LispObject.java
trunk/abcl/src/org/armedbear/lisp/LispReader.java
trunk/abcl/src/org/armedbear/lisp/LispStackFrame.java
trunk/abcl/src/org/armedbear/lisp/LispThread.java
trunk/abcl/src/org/armedbear/lisp/Load.java
trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java
trunk/abcl/src/org/armedbear/lisp/MacroObject.java
trunk/abcl/src/org/armedbear/lisp/MathFunctions.java
trunk/abcl/src/org/armedbear/lisp/Nil.java
trunk/abcl/src/org/armedbear/lisp/NilVector.java
trunk/abcl/src/org/armedbear/lisp/Operator.java
trunk/abcl/src/org/armedbear/lisp/Package.java
trunk/abcl/src/org/armedbear/lisp/PackageError.java
trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java
trunk/abcl/src/org/armedbear/lisp/Packages.java
trunk/abcl/src/org/armedbear/lisp/ParseError.java
trunk/abcl/src/org/armedbear/lisp/Pathname.java
trunk/abcl/src/org/armedbear/lisp/Primitive.java
trunk/abcl/src/org/armedbear/lisp/Primitives.java
trunk/abcl/src/org/armedbear/lisp/PrintNotReadable.java
trunk/abcl/src/org/armedbear/lisp/Profiler.java
trunk/abcl/src/org/armedbear/lisp/ProgramError.java
trunk/abcl/src/org/armedbear/lisp/RandomState.java
trunk/abcl/src/org/armedbear/lisp/Ratio.java
trunk/abcl/src/org/armedbear/lisp/ReaderError.java
trunk/abcl/src/org/armedbear/lisp/ReaderMacroFunction.java
trunk/abcl/src/org/armedbear/lisp/Readtable.java
trunk/abcl/src/org/armedbear/lisp/Return.java
trunk/abcl/src/org/armedbear/lisp/RuntimeClass.java
trunk/abcl/src/org/armedbear/lisp/SeriousCondition.java
trunk/abcl/src/org/armedbear/lisp/ShellCommand.java
trunk/abcl/src/org/armedbear/lisp/SimpleArray_T.java
trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java
trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java
trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte8.java
trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java
trunk/abcl/src/org/armedbear/lisp/SimpleCondition.java
trunk/abcl/src/org/armedbear/lisp/SimpleError.java
trunk/abcl/src/org/armedbear/lisp/SimpleString.java
trunk/abcl/src/org/armedbear/lisp/SimpleTypeError.java
trunk/abcl/src/org/armedbear/lisp/SimpleVector.java
trunk/abcl/src/org/armedbear/lisp/SimpleWarning.java
trunk/abcl/src/org/armedbear/lisp/SingleFloat.java
trunk/abcl/src/org/armedbear/lisp/SlimeInputStream.java
trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java
trunk/abcl/src/org/armedbear/lisp/SlotClass.java
trunk/abcl/src/org/armedbear/lisp/SlotDefinition.java
trunk/abcl/src/org/armedbear/lisp/SocketStream.java
trunk/abcl/src/org/armedbear/lisp/SpecialBinding.java
trunk/abcl/src/org/armedbear/lisp/SpecialOperator.java
trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java
trunk/abcl/src/org/armedbear/lisp/StackFrame.java
trunk/abcl/src/org/armedbear/lisp/StandardClass.java
trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java
trunk/abcl/src/org/armedbear/lisp/StandardMethod.java
trunk/abcl/src/org/armedbear/lisp/StandardObject.java
trunk/abcl/src/org/armedbear/lisp/StandardObjectFunctions.java
trunk/abcl/src/org/armedbear/lisp/StandardReaderMethod.java
trunk/abcl/src/org/armedbear/lisp/StorageCondition.java
trunk/abcl/src/org/armedbear/lisp/Stream.java
trunk/abcl/src/org/armedbear/lisp/StreamError.java
trunk/abcl/src/org/armedbear/lisp/StringFunctions.java
trunk/abcl/src/org/armedbear/lisp/StringInputStream.java
trunk/abcl/src/org/armedbear/lisp/StringOutputStream.java
trunk/abcl/src/org/armedbear/lisp/StructureClass.java
trunk/abcl/src/org/armedbear/lisp/StructureObject.java
trunk/abcl/src/org/armedbear/lisp/StyleWarning.java
trunk/abcl/src/org/armedbear/lisp/Symbol.java
trunk/abcl/src/org/armedbear/lisp/SynonymStream.java
trunk/abcl/src/org/armedbear/lisp/ThreadDestroyed.java
trunk/abcl/src/org/armedbear/lisp/Throw.java
trunk/abcl/src/org/armedbear/lisp/Time.java
trunk/abcl/src/org/armedbear/lisp/TwoWayStream.java
trunk/abcl/src/org/armedbear/lisp/TypeError.java
trunk/abcl/src/org/armedbear/lisp/UnboundSlot.java
trunk/abcl/src/org/armedbear/lisp/UnboundVariable.java
trunk/abcl/src/org/armedbear/lisp/UndefinedFunction.java
trunk/abcl/src/org/armedbear/lisp/UpcaseStream.java
trunk/abcl/src/org/armedbear/lisp/Utilities.java
trunk/abcl/src/org/armedbear/lisp/Warning.java
trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java
trunk/abcl/src/org/armedbear/lisp/ZeroRankArray.java
trunk/abcl/src/org/armedbear/lisp/adjust_array.java
trunk/abcl/src/org/armedbear/lisp/arglist.java
trunk/abcl/src/org/armedbear/lisp/ash.java
trunk/abcl/src/org/armedbear/lisp/assq.java
trunk/abcl/src/org/armedbear/lisp/assql.java
trunk/abcl/src/org/armedbear/lisp/ceiling.java
trunk/abcl/src/org/armedbear/lisp/cell_error_name.java
trunk/abcl/src/org/armedbear/lisp/copy_list.java
trunk/abcl/src/org/armedbear/lisp/create_new_file.java
trunk/abcl/src/org/armedbear/lisp/cxr.java
trunk/abcl/src/org/armedbear/lisp/delete_file.java
trunk/abcl/src/org/armedbear/lisp/disassemble_class_bytes.java
trunk/abcl/src/org/armedbear/lisp/dolist.java
trunk/abcl/src/org/armedbear/lisp/dotimes.java
trunk/abcl/src/org/armedbear/lisp/file_author.java
trunk/abcl/src/org/armedbear/lisp/file_error_pathname.java
trunk/abcl/src/org/armedbear/lisp/file_length.java
trunk/abcl/src/org/armedbear/lisp/file_string_length.java
trunk/abcl/src/org/armedbear/lisp/file_write_date.java
trunk/abcl/src/org/armedbear/lisp/float_sign.java
trunk/abcl/src/org/armedbear/lisp/floor.java
trunk/abcl/src/org/armedbear/lisp/ftruncate.java
trunk/abcl/src/org/armedbear/lisp/function_info.java
trunk/abcl/src/org/armedbear/lisp/get_properties.java
trunk/abcl/src/org/armedbear/lisp/input_stream_p.java
trunk/abcl/src/org/armedbear/lisp/interactive_stream_p.java
trunk/abcl/src/org/armedbear/lisp/jclass_name.java
trunk/abcl/src/org/armedbear/lisp/jclass_of.java
trunk/abcl/src/org/armedbear/lisp/jmethod_return_type.java
trunk/abcl/src/org/armedbear/lisp/last.java
trunk/abcl/src/org/armedbear/lisp/listen.java
trunk/abcl/src/org/armedbear/lisp/logand.java
trunk/abcl/src/org/armedbear/lisp/logandc1.java
trunk/abcl/src/org/armedbear/lisp/logandc2.java
trunk/abcl/src/org/armedbear/lisp/logbitp.java
trunk/abcl/src/org/armedbear/lisp/logcount.java
trunk/abcl/src/org/armedbear/lisp/logeqv.java
trunk/abcl/src/org/armedbear/lisp/logior.java
trunk/abcl/src/org/armedbear/lisp/lognand.java
trunk/abcl/src/org/armedbear/lisp/lognor.java
trunk/abcl/src/org/armedbear/lisp/lognot.java
trunk/abcl/src/org/armedbear/lisp/logorc1.java
trunk/abcl/src/org/armedbear/lisp/logorc2.java
trunk/abcl/src/org/armedbear/lisp/logtest.java
trunk/abcl/src/org/armedbear/lisp/logxor.java
trunk/abcl/src/org/armedbear/lisp/machine_type.java
trunk/abcl/src/org/armedbear/lisp/machine_version.java
trunk/abcl/src/org/armedbear/lisp/make_array.java
trunk/abcl/src/org/armedbear/lisp/make_condition.java
trunk/abcl/src/org/armedbear/lisp/make_server_socket.java
trunk/abcl/src/org/armedbear/lisp/make_socket.java
trunk/abcl/src/org/armedbear/lisp/mod.java
trunk/abcl/src/org/armedbear/lisp/open_stream_p.java
trunk/abcl/src/org/armedbear/lisp/output_stream_p.java
trunk/abcl/src/org/armedbear/lisp/package_error_package.java
trunk/abcl/src/org/armedbear/lisp/peek_char.java
trunk/abcl/src/org/armedbear/lisp/probe_file.java
trunk/abcl/src/org/armedbear/lisp/rem.java
trunk/abcl/src/org/armedbear/lisp/room.java
trunk/abcl/src/org/armedbear/lisp/server_socket_close.java
trunk/abcl/src/org/armedbear/lisp/simple_list_remove_duplicates.java
trunk/abcl/src/org/armedbear/lisp/socket_accept.java
trunk/abcl/src/org/armedbear/lisp/socket_close.java
trunk/abcl/src/org/armedbear/lisp/socket_stream.java
trunk/abcl/src/org/armedbear/lisp/software_type.java
trunk/abcl/src/org/armedbear/lisp/software_version.java
trunk/abcl/src/org/armedbear/lisp/stream_element_type.java
trunk/abcl/src/org/armedbear/lisp/stream_external_format.java
trunk/abcl/src/org/armedbear/lisp/truncate.java
trunk/abcl/src/org/armedbear/lisp/unbound_slot_instance.java
trunk/abcl/src/org/armedbear/lisp/zip.java
Modified: trunk/abcl/src/org/armedbear/lisp/AbstractArray.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/AbstractArray.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/AbstractArray.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public abstract class AbstractArray extends LispObject
{
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.ARRAY)
return T;
@@ -46,7 +46,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (obj instanceof AbstractArray) {
AbstractArray a = (AbstractArray) obj;
@@ -70,7 +70,7 @@
return false;
}
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
return LispThread.currentThread().setValues(NIL, Fixnum.ZERO);
}
@@ -80,18 +80,18 @@
return false;
}
- public int getFillPointer() throws ConditionThrowable
+ public int getFillPointer()
{
noFillPointer();
return -1; // Not reached.
}
- public void setFillPointer(LispObject fillPointer) throws ConditionThrowable
+ public void setFillPointer(LispObject fillPointer)
{
setFillPointer(fillPointer.intValue());
}
- public void setFillPointer(int fillPointer) throws ConditionThrowable
+ public void setFillPointer(int fillPointer)
{
noFillPointer();
}
@@ -105,7 +105,7 @@
public abstract LispObject getDimensions();
- public abstract int getDimension(int n) throws ConditionThrowable;
+ public abstract int getDimension(int n);
public abstract LispObject getElementType();
@@ -113,7 +113,7 @@
@Override
public abstract void aset(int index, LispObject newValue)
- throws ConditionThrowable;
+ ;
// FIXME Detect overflow!
protected static final int computeTotalSize(int[] dimensions)
@@ -125,7 +125,7 @@
}
public int getRowMajorIndex(LispObject[] subscripts)
- throws ConditionThrowable
+
{
int[] subs = new int[subscripts.length];
for (int i = 0; i < subscripts.length; i++) {
@@ -138,7 +138,7 @@
return getRowMajorIndex(subs);
}
- public int getRowMajorIndex(int[] subscripts) throws ConditionThrowable
+ public int getRowMajorIndex(int[] subscripts)
{
final int rank = getRank();
if (rank != subscripts.length) {
@@ -165,20 +165,20 @@
return sum;
}
- public LispObject get(int[] subscripts) throws ConditionThrowable
+ public LispObject get(int[] subscripts)
{
return AREF(getRowMajorIndex(subscripts));
}
public void set(int[] subscripts, LispObject newValue)
- throws ConditionThrowable
+
{
aset(getRowMajorIndex(subscripts), newValue);
}
- public abstract void fill(LispObject obj) throws ConditionThrowable;
+ public abstract void fill(LispObject obj);
- public String writeToString(int[] dimv) throws ConditionThrowable
+ public String writeToString(int[] dimv)
{
StringBuilder sb = new StringBuilder();
LispThread thread = LispThread.currentThread();
@@ -229,7 +229,7 @@
// Helper for writeToString().
private void appendContents(int[] dimensions, int index, StringBuilder sb,
LispThread thread)
- throws ConditionThrowable
+
{
if (dimensions.length == 0) {
if (Symbol.PRINT_CIRCLE.symbolValue(thread) != NIL) {
@@ -318,12 +318,10 @@
* @param initialElement @c null if none
* @param initialContents @c null if none
* @return @c this or a new array
- * @throws org.armedbear.lisp.ConditionThrowable
*/
public abstract AbstractArray adjustArray(int[] dims,
LispObject initialElement,
- LispObject initialContents)
- throws ConditionThrowable;
+ LispObject initialContents);
/**
*
@@ -331,10 +329,8 @@
* @param displacedTo
* @param displacement
* @return
- * @throws org.armedbear.lisp.ConditionThrowable
*/
public abstract AbstractArray adjustArray(int[] dims,
AbstractArray displacedTo,
- int displacement)
- throws ConditionThrowable;
+ int displacement);
}
Modified: trunk/abcl/src/org/armedbear/lisp/AbstractBitVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/AbstractBitVector.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/AbstractBitVector.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
protected long[] bits;
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.BIT_VECTOR)
return T;
@@ -71,7 +71,7 @@
}
@Override
- public boolean equal(LispObject obj) throws ConditionThrowable
+ public boolean equal(LispObject obj)
{
if (this == obj)
return true;
@@ -89,7 +89,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (this == obj)
return true;
@@ -111,7 +111,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
if (obj instanceof Fixnum) {
switch (((Fixnum)obj).value) {
@@ -140,7 +140,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
SimpleBitVector v = new SimpleBitVector(end - start);
int i = start, j = 0;
@@ -177,7 +177,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
final int length = length();
@@ -198,13 +198,13 @@
// Ignores fill pointer.
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
return AREF(Fixnum.getValue(index));
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
int length = length();
SimpleBitVector result = new SimpleBitVector(length);
@@ -218,9 +218,9 @@
return result;
}
- protected abstract int getBit(int index) throws ConditionThrowable;
+ protected abstract int getBit(int index);
- protected abstract void setBit(int index) throws ConditionThrowable;
+ protected abstract void setBit(int index);
- protected abstract void clearBit(int index) throws ConditionThrowable;
+ protected abstract void clearBit(int index);
}
Modified: trunk/abcl/src/org/armedbear/lisp/AbstractString.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/AbstractString.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/AbstractString.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public abstract class AbstractString extends AbstractVector
{
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type instanceof Symbol) {
if (type == Symbol.STRING)
@@ -81,14 +81,14 @@
return this;
}
- public abstract void fill(char c) throws ConditionThrowable;
+ public abstract void fill(char c);
- public abstract char charAt(int index) throws ConditionThrowable;
+ public abstract char charAt(int index);
- public abstract void setCharAt(int index, char c) throws ConditionThrowable;
+ public abstract void setCharAt(int index, char c);
public final String writeToString(int beginIndex, int endIndex)
- throws ConditionThrowable
+
{
if (beginIndex < 0)
beginIndex = 0;
@@ -114,7 +114,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return writeToString(0, length());
}
Modified: trunk/abcl/src/org/armedbear/lisp/AbstractVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/AbstractVector.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/AbstractVector.java Fri Nov 6 15:07:54 2009
@@ -35,7 +35,7 @@
public abstract class AbstractVector extends AbstractArray
{
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.VECTOR)
return T;
@@ -61,7 +61,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (obj instanceof AbstractVector)
{
@@ -89,7 +89,7 @@
}
@Override
- public final int getDimension(int n) throws ConditionThrowable
+ public final int getDimension(int n)
{
if (n != 0)
{
@@ -108,9 +108,9 @@
public abstract int capacity();
- public abstract LispObject subseq(int start, int end) throws ConditionThrowable;
+ public abstract LispObject subseq(int start, int end);
- public LispObject deleteEq(LispObject item) throws ConditionThrowable
+ public LispObject deleteEq(LispObject item)
{
final int limit = length();
int i = 0;
@@ -127,7 +127,7 @@
return this;
}
- public LispObject deleteEql(LispObject item) throws ConditionThrowable
+ public LispObject deleteEql(LispObject item)
{
final int limit = length();
int i = 0;
@@ -144,16 +144,16 @@
return this;
}
- public abstract void shrink(int n) throws ConditionThrowable;
+ public abstract void shrink(int n);
- public int checkIndex(int index) throws ConditionThrowable
+ public int checkIndex(int index)
{
if (index < 0 || index >= capacity())
badIndex(index, capacity());
return index;
}
- protected void badIndex(int index, int limit) throws ConditionThrowable
+ protected void badIndex(int index, int limit)
{
FastStringBuffer sb = new FastStringBuffer("Invalid array index ");
sb.append(index);
@@ -173,12 +173,12 @@
}
- public void setFillPointer(int n) throws ConditionThrowable
+ public void setFillPointer(int n)
{
noFillPointer();
}
- public void setFillPointer(LispObject obj) throws ConditionThrowable
+ public void setFillPointer(LispObject obj)
{
noFillPointer();
}
@@ -189,10 +189,10 @@
}
@Override
- public abstract LispObject reverse() throws ConditionThrowable;
+ public abstract LispObject reverse();
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
int i = 0;
int j = length() - 1;
@@ -208,7 +208,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL)
@@ -300,24 +300,24 @@
public abstract AbstractArray adjustArray(int size,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable;
+ ;
public abstract AbstractArray adjustArray(int size,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable;
+ ;
public AbstractArray adjustArray(int[] dims,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable {
+ {
return adjustArray(dims[0], initialElement, initialContents);
}
public AbstractArray adjustArray(int[] dims,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable {
+ {
return adjustArray(dims[0], displacedTo, displacement);
}
}
Modified: trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java Fri Nov 6 15:07:54 2009
@@ -35,19 +35,19 @@
public class ArithmeticError extends LispError
{
- protected ArithmeticError(LispClass cls) throws ConditionThrowable
+ protected ArithmeticError(LispClass cls)
{
super(cls);
}
- public ArithmeticError(LispObject initArgs) throws ConditionThrowable
+ public ArithmeticError(LispObject initArgs)
{
super(StandardClass.ARITHMETIC_ERROR);
initialize(initArgs);
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
LispObject operation = NIL;
@@ -67,7 +67,7 @@
setOperands(operands);
}
- public ArithmeticError(String message) throws ConditionThrowable
+ public ArithmeticError(String message)
{
super(StandardClass.ARITHMETIC_ERROR);
setFormatControl(message);
@@ -89,7 +89,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.ARITHMETIC_ERROR)
return T;
@@ -98,24 +98,24 @@
return super.typep(type);
}
- private final LispObject getOperation() throws ConditionThrowable
+ private final LispObject getOperation()
{
return getInstanceSlotValue(Symbol.OPERATION);
}
private final void setOperation(LispObject operation)
- throws ConditionThrowable
+
{
setInstanceSlotValue(Symbol.OPERATION, operation);
}
- private final LispObject getOperands() throws ConditionThrowable
+ private final LispObject getOperands()
{
return getInstanceSlotValue(Symbol.OPERANDS);
}
private final void setOperands(LispObject operands)
- throws ConditionThrowable
+
{
setInstanceSlotValue(Symbol.OPERANDS, operands);
}
@@ -125,7 +125,7 @@
new Primitive("arithmetic-error-operation", "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof ArithmeticError) {
return ((ArithmeticError)arg).getOperation();
@@ -140,7 +140,7 @@
new Primitive("arithmetic-error-operands", "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof ArithmeticError) {
return ((ArithmeticError)arg).getOperands();
Modified: trunk/abcl/src/org/armedbear/lisp/Autoload.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Autoload.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Autoload.java Fri Nov 6 15:07:54 2009
@@ -99,7 +99,7 @@
"org.armedbear.lisp.".concat(className)));
}
- public void load() throws ConditionThrowable
+ public void load()
{
if (className != null) {
final LispThread thread = LispThread.currentThread();
@@ -156,14 +156,14 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
load();
return symbol.execute();
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
load();
return symbol.execute(arg);
@@ -171,7 +171,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
load();
return symbol.execute(first, second);
@@ -180,7 +180,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
load();
return symbol.execute(first, second, third);
@@ -189,7 +189,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
load();
return symbol.execute(first, second, third, fourth);
@@ -199,7 +199,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
load();
return symbol.execute(first, second, third, fourth, fifth);
@@ -209,7 +209,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
load();
return symbol.execute(first, second, third, fourth, fifth, sixth);
@@ -220,7 +220,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
load();
return symbol.execute(first, second, third, fourth, fifth, sixth,
@@ -232,7 +232,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
load();
return symbol.execute(first, second, third, fourth, fifth, sixth,
@@ -240,14 +240,14 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
load();
return symbol.execute(args);
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
StringBuffer sb = new StringBuffer("#<AUTOLOAD ");
sb.append(symbol.writeToString());
@@ -270,7 +270,7 @@
new Primitive("autoload", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject first) throws ConditionThrowable
+ public LispObject execute(LispObject first)
{
if (first instanceof Symbol) {
Symbol symbol = (Symbol) first;
@@ -288,7 +288,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final String fileName = second.getStringValue();
if (first instanceof Symbol) {
@@ -313,7 +313,7 @@
new Primitive("resolve", PACKAGE_EXT, true, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Symbol symbol = checkSymbol(arg);
LispObject fun = symbol.getSymbolFunction();
@@ -331,7 +331,7 @@
new Primitive("autoloadp", PACKAGE_EXT, true, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Symbol) {
if (arg.getSymbolFunction() instanceof Autoload)
Modified: trunk/abcl/src/org/armedbear/lisp/AutoloadMacro.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/AutoloadMacro.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/AutoloadMacro.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
}
private static void installAutoloadMacro(Symbol symbol, String fileName)
- throws ConditionThrowable
+
{
AutoloadMacro am = new AutoloadMacro(symbol, fileName);
if (symbol.getSymbolFunction() instanceof SpecialOperator)
@@ -56,13 +56,13 @@
}
@Override
- public void load() throws ConditionThrowable
+ public void load()
{
Load.loadSystemFile(getFileName(), true);
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
StringBuffer sb = new StringBuffer("#<AUTOLOAD-MACRO ");
sb.append(getSymbol().writeToString());
@@ -77,7 +77,7 @@
new Primitive("autoload-macro", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject first) throws ConditionThrowable
+ public LispObject execute(LispObject first)
{
if (first instanceof Symbol) {
Symbol symbol = (Symbol) first;
@@ -95,7 +95,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final String fileName = second.getStringValue();
if (first instanceof Symbol) {
Modified: trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte16.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte16.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte16.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
}
private BasicVector_UnsignedByte16(LispObject[] array)
- throws ConditionThrowable
+
{
capacity = array.length;
elements = new int[capacity];
@@ -69,7 +69,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_ARRAY)
return T;
@@ -115,7 +115,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
try {
return Fixnum.getInstance(elements[index]);
@@ -128,7 +128,7 @@
// Ignores fill pointer.
@Override
- public int aref(int index) throws ConditionThrowable
+ public int aref(int index)
{
try {
return elements[index];
@@ -142,7 +142,7 @@
// Ignores fill pointer.
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try {
return Fixnum.getInstance(elements[index]);
@@ -155,7 +155,7 @@
// Ignores fill pointer.
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
try {
return Fixnum.getInstance(elements[Fixnum.getValue(index)]);
@@ -167,7 +167,7 @@
}
@Override
- public void aset(int index, int n) throws ConditionThrowable
+ public void aset(int index, int n)
{
try {
elements[index] = n;
@@ -178,7 +178,7 @@
}
@Override
- public void aset(int index, LispObject obj) throws ConditionThrowable
+ public void aset(int index, LispObject obj)
{
if (obj instanceof Fixnum) {
try {
@@ -194,7 +194,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
BasicVector_UnsignedByte16 v = new BasicVector_UnsignedByte16(end - start);
int i = start, j = 0;
@@ -209,7 +209,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
int n = Fixnum.getValue(obj);
for (int i = capacity; i-- > 0;)
@@ -217,7 +217,7 @@
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (n < capacity) {
int[] newArray = new int[n];
@@ -232,7 +232,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
BasicVector_UnsignedByte16 result = new BasicVector_UnsignedByte16(capacity);
int i, j;
@@ -242,7 +242,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
int i = 0;
int j = capacity - 1;
@@ -260,7 +260,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null) {
LispObject[] newElements = new LispObject[newCapacity];
Modified: trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte32.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte32.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte32.java Fri Nov 6 15:07:54 2009
@@ -48,7 +48,7 @@
}
public BasicVector_UnsignedByte32(LispObject[] array)
- throws ConditionThrowable
+
{
capacity = array.length;
elements = new long[capacity];
@@ -70,7 +70,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_ARRAY)
return T;
@@ -116,7 +116,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
try
{
@@ -130,7 +130,7 @@
}
@Override
- public int aref(int index) throws ConditionThrowable
+ public int aref(int index)
{
try
{
@@ -144,7 +144,7 @@
}
@Override
- public long aref_long(int index) throws ConditionThrowable
+ public long aref_long(int index)
{
try
{
@@ -158,7 +158,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try
{
@@ -172,7 +172,7 @@
}
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
final int idx = Fixnum.getValue(index);
try
@@ -187,7 +187,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
try
{
@@ -200,7 +200,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
BasicVector_UnsignedByte32 v = new BasicVector_UnsignedByte32(end - start);
int i = start, j = 0;
@@ -218,14 +218,14 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
for (int i = capacity; i-- > 0;)
elements[i] = obj.longValue();
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (n < capacity)
{
@@ -241,7 +241,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
BasicVector_UnsignedByte32 result = new BasicVector_UnsignedByte32(capacity);
int i, j;
@@ -251,7 +251,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
int i = 0;
int j = capacity - 1;
@@ -270,7 +270,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
{
Modified: trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte8.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte8.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte8.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
}
public BasicVector_UnsignedByte8(LispObject[] array)
- throws ConditionThrowable
+
{
capacity = array.length;
elements = new byte[capacity];
@@ -68,7 +68,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_ARRAY)
return T;
@@ -114,7 +114,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
try
{
@@ -128,7 +128,7 @@
}
@Override
- public int aref(int index) throws ConditionThrowable
+ public int aref(int index)
{
try
{
@@ -143,7 +143,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try
{
@@ -157,7 +157,7 @@
}
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
int idx = Fixnum.getValue(index);
try
@@ -172,7 +172,7 @@
}
@Override
- public void aset(int index, int n) throws ConditionThrowable
+ public void aset(int index, int n)
{
try
{
@@ -185,7 +185,7 @@
}
@Override
- public void aset(int index, LispObject value) throws ConditionThrowable
+ public void aset(int index, LispObject value)
{
try
{
@@ -198,7 +198,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
BasicVector_UnsignedByte8 v = new BasicVector_UnsignedByte8(end - start);
int i = start, j = 0;
@@ -215,7 +215,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
byte b = coerceLispObjectToJavaByte(obj);
for (int i = capacity; i-- > 0;)
@@ -223,7 +223,7 @@
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (n < capacity)
{
@@ -239,7 +239,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
BasicVector_UnsignedByte8 result = new BasicVector_UnsignedByte8(capacity);
int i, j;
@@ -249,7 +249,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
int i = 0;
int j = capacity - 1;
@@ -268,7 +268,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
{
Modified: trunk/abcl/src/org/armedbear/lisp/Bignum.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Bignum.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Bignum.java Fri Nov 6 15:07:54 2009
@@ -112,7 +112,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type instanceof Symbol)
{
@@ -221,7 +221,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (obj instanceof Bignum)
return value.equals(((Bignum)obj).value);
@@ -253,13 +253,13 @@
}
@Override
- public boolean evenp() throws ConditionThrowable
+ public boolean evenp()
{
return !value.testBit(0);
}
@Override
- public boolean oddp() throws ConditionThrowable
+ public boolean oddp()
{
return value.testBit(0);
}
@@ -295,7 +295,7 @@
}
@Override
- public float floatValue() throws ConditionThrowable
+ public float floatValue()
{
float f = value.floatValue();
if (Float.isInfinite(f))
@@ -305,7 +305,7 @@
}
@Override
- public double doubleValue() throws ConditionThrowable
+ public double doubleValue()
{
double d = value.doubleValue();
if (Double.isInfinite(d))
@@ -314,7 +314,7 @@
return d;
}
- public static BigInteger getValue(LispObject obj) throws ConditionThrowable
+ public static BigInteger getValue(LispObject obj)
{
if (obj instanceof Bignum)
@@ -339,13 +339,13 @@
}
@Override
- public LispObject add(int n) throws ConditionThrowable
+ public LispObject add(int n)
{
return number(value.add(BigInteger.valueOf(n)));
}
@Override
- public LispObject add(LispObject obj) throws ConditionThrowable
+ public LispObject add(LispObject obj)
{
if (obj instanceof Fixnum)
return number(value.add(Fixnum.getBigInteger(obj)));
@@ -371,7 +371,7 @@
}
@Override
- public LispObject subtract(LispObject obj) throws ConditionThrowable
+ public LispObject subtract(LispObject obj)
{
if (obj instanceof Fixnum)
return number(value.subtract(Fixnum.getBigInteger(obj)));
@@ -398,7 +398,7 @@
}
@Override
- public LispObject multiplyBy(int n) throws ConditionThrowable
+ public LispObject multiplyBy(int n)
{
if (n == 0)
return Fixnum.ZERO;
@@ -408,7 +408,7 @@
}
@Override
- public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
+ public LispObject multiplyBy(LispObject obj)
{
if (obj instanceof Fixnum)
{
@@ -440,7 +440,7 @@
}
@Override
- public LispObject divideBy(LispObject obj) throws ConditionThrowable
+ public LispObject divideBy(LispObject obj)
{
if (obj instanceof Fixnum)
return number(value, Fixnum.getBigInteger(obj));
@@ -469,7 +469,7 @@
}
@Override
- public boolean isEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isEqualTo(LispObject obj)
{
if (obj instanceof Bignum)
return value.equals(((Bignum)obj).value);
@@ -485,7 +485,7 @@
}
@Override
- public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isNotEqualTo(LispObject obj)
{
if (obj instanceof Bignum)
return !value.equals(((Bignum)obj).value);
@@ -501,7 +501,7 @@
}
@Override
- public boolean isLessThan(LispObject obj) throws ConditionThrowable
+ public boolean isLessThan(LispObject obj)
{
if (obj instanceof Fixnum)
return value.compareTo(Fixnum.getBigInteger(obj)) < 0;
@@ -522,7 +522,7 @@
}
@Override
- public boolean isGreaterThan(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThan(LispObject obj)
{
if (obj instanceof Fixnum)
return value.compareTo(Fixnum.getBigInteger(obj)) > 0;
@@ -543,7 +543,7 @@
}
@Override
- public boolean isLessThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isLessThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value.compareTo(Fixnum.getBigInteger(obj)) <= 0;
@@ -564,7 +564,7 @@
}
@Override
- public boolean isGreaterThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value.compareTo(Fixnum.getBigInteger(obj)) >= 0;
@@ -585,7 +585,7 @@
}
@Override
- public LispObject truncate(LispObject obj) throws ConditionThrowable
+ public LispObject truncate(LispObject obj)
{
final LispThread thread = LispThread.currentThread();
LispObject value1, value2;
@@ -647,7 +647,7 @@
}
@Override
- public LispObject ash(LispObject obj) throws ConditionThrowable
+ public LispObject ash(LispObject obj)
{
BigInteger n = value;
if (obj instanceof Fixnum)
@@ -680,7 +680,7 @@
}
@Override
- public LispObject LOGAND(int n) throws ConditionThrowable
+ public LispObject LOGAND(int n)
{
if (n >= 0)
return Fixnum.getInstance(value.intValue() & n);
@@ -689,7 +689,7 @@
}
@Override
- public LispObject LOGAND(LispObject obj) throws ConditionThrowable
+ public LispObject LOGAND(LispObject obj)
{
if (obj instanceof Fixnum)
{
@@ -709,13 +709,13 @@
}
@Override
- public LispObject LOGIOR(int n) throws ConditionThrowable
+ public LispObject LOGIOR(int n)
{
return number(value.or(BigInteger.valueOf(n)));
}
@Override
- public LispObject LOGIOR(LispObject obj) throws ConditionThrowable
+ public LispObject LOGIOR(LispObject obj)
{
if (obj instanceof Fixnum)
{
@@ -732,13 +732,13 @@
}
@Override
- public LispObject LOGXOR(int n) throws ConditionThrowable
+ public LispObject LOGXOR(int n)
{
return number(value.xor(BigInteger.valueOf(n)));
}
@Override
- public LispObject LOGXOR(LispObject obj) throws ConditionThrowable
+ public LispObject LOGXOR(LispObject obj)
{
final BigInteger n;
if (obj instanceof Fixnum)
@@ -765,7 +765,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
final int base = Fixnum.getValue(Symbol.PRINT_BASE.symbolValue(thread));
Modified: trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java Fri Nov 6 15:07:54 2009
@@ -37,7 +37,7 @@
{
private final Stream[] streams;
- private BroadcastStream(Stream[] streams) throws ConditionThrowable
+ private BroadcastStream(Stream[] streams)
{
this.streams = streams;
isOutputStream = true;
@@ -72,7 +72,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.BROADCAST_STREAM)
return T;
@@ -82,7 +82,7 @@
}
@Override
- public LispObject listen() throws ConditionThrowable
+ public LispObject listen()
{
notSupported();
// Not reached.
@@ -90,7 +90,7 @@
}
@Override
- public LispObject fileLength() throws ConditionThrowable
+ public LispObject fileLength()
{
if (streams.length > 0)
return streams[streams.length - 1].fileLength();
@@ -99,7 +99,7 @@
}
@Override
- public LispObject fileStringLength(LispObject arg) throws ConditionThrowable
+ public LispObject fileStringLength(LispObject arg)
{
if (streams.length > 0)
return streams[streams.length - 1].fileStringLength(arg);
@@ -109,7 +109,7 @@
// Returns -1 at end of file.
@Override
- protected int _readChar() throws ConditionThrowable
+ protected int _readChar()
{
notSupported();
// Not reached.
@@ -117,13 +117,13 @@
}
@Override
- protected void _unreadChar(int n) throws ConditionThrowable
+ protected void _unreadChar(int n)
{
notSupported();
}
@Override
- protected boolean _charReady() throws ConditionThrowable
+ protected boolean _charReady()
{
notSupported();
// Not reached.
@@ -131,7 +131,7 @@
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
for (int i = 0; i < streams.length; i++)
streams[i]._writeChar(c);
@@ -139,21 +139,21 @@
@Override
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
for (int i = 0; i < streams.length; i++)
streams[i]._writeChars(chars, start, end);
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
for (int i = 0; i < streams.length; i++)
streams[i]._writeString(s);
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
for (int i = 0; i < streams.length; i++)
streams[i]._writeLine(s);
@@ -161,7 +161,7 @@
// Reads an 8-bit byte.
@Override
- public int _readByte() throws ConditionThrowable
+ public int _readByte()
{
notSupported();
// Not reached.
@@ -170,27 +170,27 @@
// Writes an 8-bit byte.
@Override
- public void _writeByte(int n) throws ConditionThrowable
+ public void _writeByte(int n)
{
for (int i = 0; i < streams.length; i++)
streams[i]._writeByte(n);
}
@Override
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
for (int i = 0; i < streams.length; i++)
streams[i]._finishOutput();
}
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
notSupported();
}
@Override
- protected long _getFilePosition() throws ConditionThrowable
+ protected long _getFilePosition()
{
if (streams.length == 0)
return 0;
@@ -199,18 +199,18 @@
}
@Override
- protected boolean _setFilePosition(LispObject arg) throws ConditionThrowable
+ protected boolean _setFilePosition(LispObject arg)
{
return false;
}
@Override
- public void _close() throws ConditionThrowable
+ public void _close()
{
setOpen(false);
}
- private void notSupported() throws ConditionThrowable
+ private void notSupported()
{
error(new TypeError("Operation is not supported for streams of type BROADCAST-STREAM."));
}
@@ -226,12 +226,12 @@
new Primitive("make-broadcast-stream", "&rest streams")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return new BroadcastStream(new Stream[0]);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
Stream[] streams = new Stream[args.length];
for (int i = 0; i < args.length; i++) {
@@ -255,7 +255,7 @@
new Primitive("broadcast-stream-streams", "broadcast-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof BroadcastStream) {
BroadcastStream stream = (BroadcastStream) arg;
Modified: trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.BUILT_IN_CLASS)
return T;
@@ -63,13 +63,13 @@
}
@Override
- public LispObject getDescription() throws ConditionThrowable
+ public LispObject getDescription()
{
return new SimpleString(writeToString());
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
FastStringBuffer sb = new FastStringBuffer("#<BUILT-IN-CLASS ");
sb.append(symbol.writeToString());
Modified: trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java Fri Nov 6 15:07:54 2009
@@ -61,20 +61,20 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
return super.typep(type); //TODO
}
@Override
- protected long _getFilePosition() throws ConditionThrowable
+ protected long _getFilePosition()
{
if (elementType == NIL)
return 0;
return byteArrayOutputStream.size();
}
- public byte[] getByteArray() throws ConditionThrowable
+ public byte[] getByteArray()
{
if (elementType == NIL) {
return new byte[0];
@@ -97,12 +97,12 @@
{
@Override
- public LispObject execute() throws ConditionThrowable {
+ public LispObject execute() {
return new ByteArrayOutputStream();
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new ByteArrayOutputStream(arg);
}
@@ -115,7 +115,7 @@
"byte-array-output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof ByteArrayOutputStream) {
return JavaObject.getInstance(((ByteArrayOutputStream)arg).getByteArray());
Modified: trunk/abcl/src/org/armedbear/lisp/CapitalizeFirstStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CapitalizeFirstStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CapitalizeFirstStream.java Fri Nov 6 15:07:54 2009
@@ -37,13 +37,13 @@
{
boolean virgin = true;
- public CapitalizeFirstStream(Stream target) throws ConditionThrowable
+ public CapitalizeFirstStream(Stream target)
{
super(target);
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
if (virgin) {
if (Character.isLetterOrDigit(c)) {
@@ -56,7 +56,7 @@
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
final int length = s.length();
for (int i = 0; i < length; i++)
@@ -64,7 +64,7 @@
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
_writeString(s);
_writeChar('\n');
Modified: trunk/abcl/src/org/armedbear/lisp/CapitalizeStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CapitalizeStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CapitalizeStream.java Fri Nov 6 15:07:54 2009
@@ -37,13 +37,13 @@
{
private boolean inWord;
- public CapitalizeStream(Stream target) throws ConditionThrowable
+ public CapitalizeStream(Stream target)
{
super(target);
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
if (inWord) {
if (Character.isUpperCase(c)) {
@@ -66,7 +66,7 @@
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
final int limit = s.length();
for (int i = 0; i < limit; i++)
@@ -74,7 +74,7 @@
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
target._writeString(s);
target._writeChar('\n');
Modified: trunk/abcl/src/org/armedbear/lisp/CaseFrobStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CaseFrobStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CaseFrobStream.java Fri Nov 6 15:07:54 2009
@@ -38,14 +38,14 @@
protected final Stream target;
protected CaseFrobStream(Stream target)
- throws ConditionThrowable
+
{
Debug.assertTrue(target.isCharacterOutputStream());
this.target = target;
}
@Override
- public LispObject getElementType() throws ConditionThrowable
+ public LispObject getElementType()
{
return target.getElementType();
}
@@ -63,7 +63,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.CASE_FROB_STREAM)
return T;
@@ -85,25 +85,25 @@
}
@Override
- public boolean isCharacterInputStream() throws ConditionThrowable
+ public boolean isCharacterInputStream()
{
return false;
}
@Override
- public boolean isBinaryInputStream() throws ConditionThrowable
+ public boolean isBinaryInputStream()
{
return false;
}
@Override
- public boolean isCharacterOutputStream() throws ConditionThrowable
+ public boolean isCharacterOutputStream()
{
return true;
}
@Override
- public boolean isBinaryOutputStream() throws ConditionThrowable
+ public boolean isBinaryOutputStream()
{
return false;
}
@@ -122,7 +122,7 @@
// Returns -1 at end of file.
@Override
- protected int _readChar() throws ConditionThrowable
+ protected int _readChar()
{
notSupported();
// Not reached.
@@ -130,13 +130,13 @@
}
@Override
- protected void _unreadChar(int n) throws ConditionThrowable
+ protected void _unreadChar(int n)
{
notSupported();
}
@Override
- protected boolean _charReady() throws ConditionThrowable
+ protected boolean _charReady()
{
notSupported();
// Not reached.
@@ -145,14 +145,14 @@
@Override
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
_writeString(new String(chars, start, end));
}
// Reads an 8-bit byte.
@Override
- public int _readByte() throws ConditionThrowable
+ public int _readByte()
{
notSupported();
// Not reached.
@@ -161,32 +161,32 @@
// Writes an 8-bit byte.
@Override
- public void _writeByte(int n) throws ConditionThrowable
+ public void _writeByte(int n)
{
notSupported();
}
@Override
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
target._finishOutput();
}
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
notSupported();
}
@Override
- public LispObject close(LispObject abort) throws ConditionThrowable
+ public LispObject close(LispObject abort)
{
setOpen(false);
return T;
}
@Override
- public LispObject listen() throws ConditionThrowable
+ public LispObject listen()
{
notSupported();
// Not reached.
@@ -194,13 +194,13 @@
}
@Override
- public LispObject terpri() throws ConditionThrowable
+ public LispObject terpri()
{
return target.terpri();
}
@Override
- public LispObject freshLine() throws ConditionThrowable
+ public LispObject freshLine()
{
return target.freshLine();
}
@@ -211,7 +211,7 @@
return unreadableString("CASE-FROB-STREAM");
}
- private void notSupported() throws ConditionThrowable
+ private void notSupported()
{
error(new TypeError("Operation is not supported for streams of type CASE-FROB-STREAM."));
}
@@ -222,7 +222,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Stream target = checkCharacterOutputStream(first);
if (second == Keyword.UPCASE)
Modified: trunk/abcl/src/org/armedbear/lisp/CellError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CellError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CellError.java Fri Nov 6 15:07:54 2009
@@ -35,19 +35,19 @@
public class CellError extends LispError
{
- protected CellError(LispClass cls) throws ConditionThrowable
+ protected CellError(LispClass cls)
{
super(cls);
}
- public CellError(LispObject initArgs) throws ConditionThrowable
+ public CellError(LispObject initArgs)
{
super(StandardClass.CELL_ERROR);
initialize(initArgs);
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
LispObject name = NIL;
@@ -63,12 +63,12 @@
setCellName(name);
}
- public final LispObject getCellName() throws ConditionThrowable
+ public final LispObject getCellName()
{
return getInstanceSlotValue(Symbol.NAME);
}
- protected final void setCellName(LispObject name) throws ConditionThrowable
+ protected final void setCellName(LispObject name)
{
setInstanceSlotValue(Symbol.NAME, name);
}
@@ -86,7 +86,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.CELL_ERROR)
return T;
@@ -96,7 +96,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (Symbol.PRINT_ESCAPE.symbolValue() == NIL)
return super.writeToString();
Modified: trunk/abcl/src/org/armedbear/lisp/CharacterFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CharacterFunctions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CharacterFunctions.java Fri Nov 6 15:07:54 2009
@@ -40,12 +40,12 @@
new Primitive("char=", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -53,12 +53,12 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return LispCharacter.getValue(first) == LispCharacter.getValue(second) ? T : NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
final char c0 = LispCharacter.getValue(array[0]);
@@ -75,12 +75,12 @@
new Primitive("char-equal", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -88,7 +88,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final char c1, c2;
c1 = LispCharacter.getValue(first);
@@ -102,7 +102,7 @@
return NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
final char c0 = LispCharacter.getValue(array[0]);
@@ -125,12 +125,12 @@
new Primitive("char-greaterp", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -138,14 +138,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
char c1 = LispCharacter.toUpperCase(LispCharacter.getValue(first));
char c2 = LispCharacter.toUpperCase(LispCharacter.getValue(second));
return c1 > c2 ? T : NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
char[] chars = new char[length];
@@ -164,12 +164,12 @@
new Primitive("char-not-greaterp", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -177,14 +177,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
char c1 = LispCharacter.toUpperCase(LispCharacter.getValue(first));
char c2 = LispCharacter.toUpperCase(LispCharacter.getValue(second));
return c1 <= c2 ? T : NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
char[] chars = new char[length];
@@ -203,12 +203,12 @@
new Primitive("char<", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -216,12 +216,12 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return LispCharacter.getValue(first) < LispCharacter.getValue(second) ? T : NIL;
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
final int length = args.length;
char[] chars = new char[length];
@@ -241,12 +241,12 @@
new Primitive("char<=", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -254,14 +254,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return LispCharacter.getValue(first) <= LispCharacter.getValue(second) ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (LispCharacter.getValue(first) > LispCharacter.getValue(second))
return NIL;
@@ -270,7 +270,7 @@
return T;
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
final int length = args.length;
char[] chars = new char[length];
@@ -290,12 +290,12 @@
new Primitive("char-lessp", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -303,14 +303,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
char c1 = LispCharacter.toUpperCase(LispCharacter.getValue(first));
char c2 = LispCharacter.toUpperCase(LispCharacter.getValue(second));
return c1 < c2 ? T : NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
char[] chars = new char[length];
@@ -329,12 +329,12 @@
new Primitive("char-not-lessp", "&rest characters")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return T;
@@ -342,14 +342,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
char c1 = LispCharacter.toUpperCase(LispCharacter.getValue(first));
char c2 = LispCharacter.toUpperCase(LispCharacter.getValue(second));
return c1 >= c2 ? T : NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
char[] chars = new char[length];
Modified: trunk/abcl/src/org/armedbear/lisp/Closure.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Closure.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Closure.java Fri Nov 6 15:07:54 2009
@@ -84,14 +84,14 @@
private boolean bindInitForms;
public Closure(LispObject lambdaExpression, Environment env)
- throws ConditionThrowable
+
{
this(null, lambdaExpression, env);
}
public Closure(final LispObject name, final LispObject lambdaExpression,
final Environment env)
- throws ConditionThrowable
+
{
super(name, lambdaExpression.cadr());
final LispObject lambdaList = lambdaExpression.cadr();
@@ -338,14 +338,14 @@
}
private static final void invalidParameter(LispObject obj)
- throws ConditionThrowable
+
{
error(new LispError(obj.writeToString() +
" may not be used as a variable in a lambda list."));
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.COMPILED_FUNCTION)
return NIL;
@@ -372,7 +372,7 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
if (arity == 0)
{
@@ -384,7 +384,7 @@
}
private final LispObject bindParametersAndExecute(LispObject... objects)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
@@ -412,7 +412,7 @@
private final void bindRequiredParameters(Environment ext,
LispThread thread,
LispObject[] objects)
- throws ConditionThrowable
+
{
// &whole and &environment before anything
if (envVar != null)
@@ -424,13 +424,13 @@
}
public final LispObject invokeArrayExecute(LispObject... objects)
- throws ConditionThrowable
+
{
return execute(objects);
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (minArgs == 1)
{
@@ -444,7 +444,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (minArgs == 2)
{
@@ -459,7 +459,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (minArgs == 3)
{
@@ -474,7 +474,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
if (minArgs == 4)
{
@@ -490,7 +490,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
if (minArgs == 5)
{
@@ -507,7 +507,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
if (minArgs == 6)
{
@@ -526,7 +526,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
if (minArgs == 7)
{
@@ -545,7 +545,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
if (minArgs == 8)
{
@@ -560,7 +560,7 @@
}
private final void declareFreeSpecials(Environment ext)
- throws ConditionThrowable
+
{
LispObject s = specials;
special:
@@ -578,7 +578,7 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
final LispThread thread = LispThread.currentThread();
SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
@@ -610,7 +610,7 @@
}
protected final LispObject[] processArgs(LispObject[] args, LispThread thread)
- throws ConditionThrowable
+
{
if (optionalParameters.length == 0 && keywordParameters.length == 0)
return fastProcessArgs(args);
@@ -871,7 +871,7 @@
// No optional or keyword parameters.
protected final LispObject[] fastProcessArgs(LispObject[] args)
- throws ConditionThrowable
+
{
final int argsLength = args.length;
if (arity >= 0)
@@ -949,7 +949,7 @@
private final void bindParameterDefaults(Parameter[] parameters,
Environment env,
LispThread thread)
- throws ConditionThrowable
+
{
for (Parameter parameter : parameters)
{
@@ -965,7 +965,7 @@
}
private final void bindAuxVars(Environment env, LispThread thread)
- throws ConditionThrowable
+
{
// Aux variable processing is analogous to LET* processing.
for (Parameter parameter : auxVars)
@@ -1002,7 +1002,7 @@
}
public Parameter(Symbol var, LispObject initForm, int type)
- throws ConditionThrowable
+
{
this.var = var;
this.initForm = initForm;
@@ -1015,7 +1015,7 @@
public Parameter(Symbol var, LispObject initForm, LispObject svar,
int type)
- throws ConditionThrowable
+
{
this.var = var;
this.initForm = initForm;
@@ -1028,7 +1028,7 @@
public Parameter(Symbol keyword, Symbol var, LispObject initForm,
LispObject svar)
- throws ConditionThrowable
+
{
this.var = var;
this.initForm = initForm;
@@ -1058,7 +1058,7 @@
}
private static final LispObject processInitForm(LispObject initForm)
- throws ConditionThrowable
+
{
if (initForm.constantp())
{
@@ -1080,7 +1080,7 @@
new Primitive("lambda-list-names", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Closure closure = new Closure(list(Symbol.LAMBDA, arg, NIL), new Environment());
return closure.getVariableList();
Modified: trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java Fri Nov 6 15:07:54 2009
@@ -40,7 +40,7 @@
public ClosureBinding[] ctx;
public CompiledClosure(LispObject lambdaList)
- throws ConditionThrowable
+
{
super(list(Symbol.LAMBDA, lambdaList), null);
}
@@ -62,21 +62,21 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.COMPILED_FUNCTION)
return T;
return super.typep(typeSpecifier);
}
- private final LispObject notImplemented() throws ConditionThrowable
+ private final LispObject notImplemented()
{
return error(new WrongNumberOfArgumentsException(this));
}
// Zero args.
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
LispObject[] args = new LispObject[0];
return execute(args);
@@ -84,7 +84,7 @@
// One arg.
public LispObject execute( LispObject first)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[1];
args[0] = first;
@@ -94,7 +94,7 @@
// Two args.
public LispObject execute( LispObject first,
LispObject second)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[2];
args[0] = first;
@@ -105,7 +105,7 @@
// Three args.
public LispObject execute( LispObject first,
LispObject second, LispObject third)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[3];
args[0] = first;
@@ -118,7 +118,7 @@
public LispObject execute( LispObject first,
LispObject second, LispObject third,
LispObject fourth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[4];
args[0] = first;
@@ -132,7 +132,7 @@
public LispObject execute( LispObject first,
LispObject second, LispObject third,
LispObject fourth, LispObject fifth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[5];
args[0] = first;
@@ -148,7 +148,7 @@
LispObject second, LispObject third,
LispObject fourth, LispObject fifth,
LispObject sixth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[6];
args[0] = first;
@@ -165,7 +165,7 @@
LispObject second, LispObject third,
LispObject fourth, LispObject fifth,
LispObject sixth, LispObject seventh)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[7];
args[0] = first;
@@ -184,7 +184,7 @@
LispObject fourth, LispObject fifth,
LispObject sixth, LispObject seventh,
LispObject eighth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[8];
args[0] = first;
@@ -200,7 +200,7 @@
// Arg array.
public LispObject execute(LispObject[] args)
- throws ConditionThrowable
+
{
return notImplemented();
}
@@ -210,7 +210,7 @@
new Primitive("load-compiled-function", PACKAGE_SYS, true, "source")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
String namestring = null;
if (arg instanceof Pathname)
@@ -236,7 +236,7 @@
new Primitive("varlist", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Closure)
return ((Closure)arg).getVariableList();
Modified: trunk/abcl/src/org/armedbear/lisp/CompilerError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CompilerError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CompilerError.java Fri Nov 6 15:07:54 2009
@@ -35,7 +35,7 @@
public class CompilerError extends Condition
{
- public CompilerError(LispObject initArgs) throws ConditionThrowable
+ public CompilerError(LispObject initArgs)
{
super(initArgs);
}
@@ -53,7 +53,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.COMPILER_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/CompilerUnsupportedFeatureError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CompilerUnsupportedFeatureError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/CompilerUnsupportedFeatureError.java Fri Nov 6 15:07:54 2009
@@ -35,7 +35,7 @@
public class CompilerUnsupportedFeatureError extends Condition
{
- public CompilerUnsupportedFeatureError(LispObject initArgs) throws ConditionThrowable
+ public CompilerUnsupportedFeatureError(LispObject initArgs)
{
super(initArgs);
}
@@ -53,7 +53,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.COMPILER_UNSUPPORTED_FEATURE_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/Complex.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Complex.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Complex.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
public static LispObject getInstance(LispObject realpart,
LispObject imagpart)
- throws ConditionThrowable
+
{
if (!realpart.realp())
return type_error(realpart, Symbol.REAL);
@@ -91,7 +91,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.COMPLEX)
return T;
@@ -136,7 +136,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (this == obj)
return true;
@@ -174,19 +174,19 @@
}
@Override
- public final LispObject incr() throws ConditionThrowable
+ public final LispObject incr()
{
return new Complex(realpart.add(Fixnum.ONE), imagpart);
}
@Override
- public final LispObject decr() throws ConditionThrowable
+ public final LispObject decr()
{
return new Complex(realpart.subtract(Fixnum.ONE), imagpart);
}
@Override
- public LispObject add(LispObject obj) throws ConditionThrowable
+ public LispObject add(LispObject obj)
{
if (obj instanceof Complex)
{
@@ -197,7 +197,7 @@
}
@Override
- public LispObject subtract(LispObject obj) throws ConditionThrowable
+ public LispObject subtract(LispObject obj)
{
if (obj instanceof Complex)
{
@@ -209,7 +209,7 @@
}
@Override
- public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
+ public LispObject multiplyBy(LispObject obj)
{
if (obj instanceof Complex)
{
@@ -231,7 +231,7 @@
}
@Override
- public LispObject divideBy(LispObject obj) throws ConditionThrowable
+ public LispObject divideBy(LispObject obj)
{
if (obj instanceof Complex)
{
@@ -252,7 +252,7 @@
}
@Override
- public boolean isEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isEqualTo(LispObject obj)
{
if (obj instanceof Complex)
{
@@ -295,13 +295,13 @@
}
@Override
- public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isNotEqualTo(LispObject obj)
{
return !isEqualTo(obj);
}
@Override
- public LispObject ABS() throws ConditionThrowable
+ public LispObject ABS()
{
if (realpart.zerop())
return imagpart.ABS();
@@ -314,7 +314,7 @@
}
@Override
- public boolean zerop() throws ConditionThrowable
+ public boolean zerop()
{
return realpart.zerop() && imagpart.zerop();
}
@@ -338,7 +338,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
FastStringBuffer sb = new FastStringBuffer("#C(");
sb.append(realpart.writeToString());
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexArray.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexArray.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexArray.java Fri Nov 6 15:07:54 2009
@@ -59,7 +59,7 @@
public ComplexArray(int[] dimv,
LispObject elementType,
LispObject initialContents)
- throws ConditionThrowable
+
{
this.dimv = dimv;
this.elementType = elementType;
@@ -85,7 +85,7 @@
private int setInitialContents(int axis, int[] dims, LispObject contents,
int index)
- throws ConditionThrowable
+
{
if (dims.length == 0) {
try {
@@ -153,7 +153,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
try {
return dimv[n];
@@ -177,7 +177,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null) {
@@ -191,7 +191,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (data != null) {
try {
@@ -205,7 +205,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (data != null) {
try {
@@ -219,7 +219,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
if (data != null) {
for (int i = data.length; i-- > 0;)
@@ -231,7 +231,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return writeToString(dimv);
}
@@ -240,7 +240,7 @@
public AbstractArray adjustArray(int[] dims,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable {
+ {
if (isAdjustable()) {
if (initialContents != null)
setInitialContents(0, dims, initialContents, 0);
@@ -273,7 +273,7 @@
public AbstractArray adjustArray(int[] dims,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable {
+ {
if (isAdjustable()) {
for (int i = 0; i < dims.length; i++)
dimv[i] = dims[i];
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte32.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte32.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte32.java Fri Nov 6 15:07:54 2009
@@ -56,7 +56,7 @@
}
public ComplexArray_UnsignedByte32(int[] dimv, LispObject initialContents)
- throws ConditionThrowable
+
{
this.dimv = dimv;
final int rank = dimv.length;
@@ -81,7 +81,7 @@
private int setInitialContents(int axis, int[] dims, LispObject contents,
int index)
- throws ConditionThrowable
+
{
if (dims.length == 0) {
try {
@@ -149,7 +149,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
try {
return dimv[n];
@@ -173,7 +173,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null) {
@@ -187,7 +187,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (data != null) {
try {
@@ -201,7 +201,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (data != null) {
try {
@@ -215,7 +215,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
if (data != null) {
for (int i = data.length; i-- > 0;)
@@ -227,7 +227,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return writeToString(dimv);
}
@@ -237,7 +237,7 @@
public AbstractArray adjustArray(int[] dims,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable {
+ {
if (isAdjustable()) {
if (initialContents != null)
setInitialContents(0, dims, initialContents, 0);
@@ -270,7 +270,7 @@
public AbstractArray adjustArray(int[] dims,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable {
+ {
if (isAdjustable()) {
for (int i = 0; i < dims.length; i++)
dimv[i] = dims[i];
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
}
public ComplexArray_UnsignedByte8(int[] dimv, LispObject initialContents)
- throws ConditionThrowable
+
{
this.dimv = dimv;
final int rank = dimv.length;
@@ -77,7 +77,7 @@
private int setInitialContents(int axis, int[] dims, LispObject contents,
int index)
- throws ConditionThrowable
+
{
if (dims.length == 0) {
try {
@@ -145,7 +145,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
try {
return dimv[n];
@@ -169,7 +169,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null) {
@@ -183,7 +183,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (data != null) {
try {
@@ -197,7 +197,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (data != null) {
try {
@@ -211,7 +211,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
if (data != null) {
byte b = coerceLispObjectToJavaByte(obj);
@@ -224,7 +224,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
error(new PrintNotReadable(list(Keyword.OBJECT, this)));
@@ -239,7 +239,7 @@
public AbstractArray adjustArray(int[] dims,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable {
+ {
if (isAdjustable()) {
if (initialContents != null)
setInitialContents(0, dims, initialContents, 0);
@@ -272,7 +272,7 @@
public AbstractArray adjustArray(int[] dims,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable {
+ {
if (isAdjustable()) {
for (int i = 0; i < dims.length; i++)
dimv[i] = dims[i];
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexBitVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexBitVector.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexBitVector.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
private AbstractArray array;
private int displacement;
- public ComplexBitVector(int capacity) throws ConditionThrowable
+ public ComplexBitVector(int capacity)
{
this.capacity = capacity;
int size = capacity >>> 6;
@@ -84,7 +84,7 @@
}
@Override
- public void setFillPointer(LispObject obj) throws ConditionThrowable
+ public void setFillPointer(LispObject obj)
{
if (obj == T)
fillPointer = capacity();
@@ -108,7 +108,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null) {
@@ -128,7 +128,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
if (index >= length())
badIndex(index, length());
@@ -136,7 +136,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (index < 0 || index >= capacity)
badIndex(index, capacity);
@@ -150,7 +150,7 @@
}
@Override
- protected int getBit(int index) throws ConditionThrowable
+ protected int getBit(int index)
{
if (bits != null) {
int offset = index >> 6;
@@ -160,7 +160,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (index < 0 || index >= capacity)
badIndex(index, capacity);
@@ -187,7 +187,7 @@
}
@Override
- protected void setBit(int index) throws ConditionThrowable
+ protected void setBit(int index)
{
if (bits != null) {
int offset = index >> 6;
@@ -197,7 +197,7 @@
}
@Override
- protected void clearBit(int index) throws ConditionThrowable
+ protected void clearBit(int index)
{
if (bits != null) {
int offset = index >> 6;
@@ -207,7 +207,7 @@
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (bits != null) {
if (n < capacity) {
@@ -236,7 +236,7 @@
// FIXME
@Override
- public void vectorPushExtend(LispObject element) throws ConditionThrowable
+ public void vectorPushExtend(LispObject element)
{
final int fp = getFillPointer();
if (fp < 0)
@@ -252,7 +252,7 @@
// FIXME
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element)
- throws ConditionThrowable
+
{
vectorPushExtend(element);
return Fixnum.getInstance(getFillPointer() - 1);
@@ -261,7 +261,7 @@
// FIXME
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element, LispObject extension)
- throws ConditionThrowable
+
{
int ext = Fixnum.getValue(extension);
final int fp = getFillPointer();
@@ -277,7 +277,7 @@
return Fixnum.getInstance(fp);
}
- private final void ensureCapacity(int minCapacity) throws ConditionThrowable
+ private final void ensureCapacity(int minCapacity)
{
if (bits != null) {
if (capacity < minCapacity) {
@@ -320,7 +320,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (bits == null) {
// Copy array.
@@ -380,7 +380,7 @@
@Override
public AbstractVector adjustArray(int size, AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
capacity = size;
array = displacedTo;
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexString.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexString.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexString.java Fri Nov 6 15:07:54 2009
@@ -92,7 +92,7 @@
}
@Override
- public void setFillPointer(LispObject obj) throws ConditionThrowable
+ public void setFillPointer(LispObject obj)
{
if (obj == T)
fillPointer = capacity();
@@ -127,7 +127,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null)
@@ -144,7 +144,7 @@
}
@Override
- public char[] chars() throws ConditionThrowable
+ public char[] chars()
{
if (chars != null)
return chars;
@@ -166,7 +166,7 @@
}
@Override
- public char[] getStringChars() throws ConditionThrowable
+ public char[] getStringChars()
{
if (fillPointer < 0)
return chars();
@@ -176,7 +176,7 @@
}
@Override
- public boolean equal(LispObject obj) throws ConditionThrowable
+ public boolean equal(LispObject obj)
{
if (this == obj)
return true;
@@ -196,7 +196,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (this == obj)
return true;
@@ -223,7 +223,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
SimpleString s = new SimpleString(end - start);
int i = start, j = 0;
@@ -233,20 +233,20 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
fill(LispCharacter.getValue(obj));
}
@Override
- public void fill(char c) throws ConditionThrowable
+ public void fill(char c)
{
for (int i = length(); i-- > 0;)
setCharAt(i, c);
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (chars != null)
{
@@ -290,7 +290,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
int length = length();
SimpleString result = new SimpleString(length);
@@ -301,7 +301,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
int i = 0;
int j = length() - 1;
@@ -317,7 +317,7 @@
}
@Override
- public String getStringValue() throws ConditionThrowable
+ public String getStringValue()
{
if (fillPointer >= 0)
return new String(chars(), 0, fillPointer);
@@ -326,13 +326,13 @@
}
@Override
- public Object javaInstance() throws ConditionThrowable
+ public Object javaInstance()
{
return new String(chars());
}
@Override
- public Object javaInstance(Class c) throws ConditionThrowable
+ public Object javaInstance(Class c)
{
return javaInstance();
}
@@ -350,7 +350,7 @@
}
@Override
- public char charAt(int index) throws ConditionThrowable
+ public char charAt(int index)
{
if (chars != null)
{
@@ -369,7 +369,7 @@
}
@Override
- public void setCharAt(int index, char c) throws ConditionThrowable
+ public void setCharAt(int index, char c)
{
if (chars != null)
{
@@ -387,7 +387,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
final int limit = length();
if (index < 0 || index >= limit)
@@ -397,34 +397,34 @@
// Ignores fill pointer.
@Override
- public LispObject CHAR(int index) throws ConditionThrowable
+ public LispObject CHAR(int index)
{
return LispCharacter.getInstance(charAt(index));
}
// Ignores fill pointer.
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
return LispCharacter.getInstance(charAt(index));
}
// Ignores fill pointer.
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
return LispCharacter.getInstance(charAt(Fixnum.getValue(index)));
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
setCharAt(index, LispCharacter.getValue(newValue));
}
@Override
public void vectorPushExtend(LispObject element)
- throws ConditionThrowable
+
{
if (fillPointer < 0)
noFillPointer();
@@ -444,7 +444,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element)
- throws ConditionThrowable
+
{
vectorPushExtend(element);
return Fixnum.getInstance(fillPointer - 1);
@@ -452,7 +452,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element, LispObject extension)
- throws ConditionThrowable
+
{
int ext = Fixnum.getValue(extension);
if (fillPointer < 0)
@@ -472,7 +472,7 @@
return Fixnum.getInstance(fillPointer++);
}
- public final void ensureCapacity(int minCapacity) throws ConditionThrowable
+ public final void ensureCapacity(int minCapacity)
{
if (chars != null)
{
@@ -574,7 +574,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
{
@@ -651,7 +651,7 @@
public AbstractVector adjustArray(int newCapacity,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
capacity = newCapacity;
array = displacedTo;
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexVector.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexVector.java Fri Nov 6 15:07:54 2009
@@ -95,7 +95,7 @@
}
@Override
- public void setFillPointer(LispObject obj) throws ConditionThrowable
+ public void setFillPointer(LispObject obj)
{
if (obj == T)
fillPointer = capacity();
@@ -125,7 +125,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null) {
@@ -163,7 +163,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
final int limit = length();
if (index < 0 || index >= limit)
@@ -173,7 +173,7 @@
// Ignores fill pointer.
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (elements != null) {
try {
@@ -194,13 +194,13 @@
// Ignores fill pointer.
// FIXME inline
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
return AREF(Fixnum.getValue(index));
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (elements != null) {
try {
@@ -219,7 +219,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
SimpleVector v = new SimpleVector(end - start);
int i = start, j = 0;
@@ -234,14 +234,14 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
for (int i = capacity; i-- > 0;)
elements[i] = obj;
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (elements != null) {
if (n < elements.length) {
@@ -258,7 +258,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
int length = length();
SimpleVector result = new SimpleVector(length);
@@ -269,7 +269,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
if (elements != null) {
int i = 0;
@@ -300,7 +300,7 @@
@Override
public void vectorPushExtend(LispObject element)
- throws ConditionThrowable
+
{
if (fillPointer < 0)
noFillPointer();
@@ -313,7 +313,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element)
- throws ConditionThrowable
+
{
vectorPushExtend(element);
return Fixnum.getInstance(fillPointer - 1);
@@ -321,7 +321,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element, LispObject extension)
- throws ConditionThrowable
+
{
int ext = Fixnum.getValue(extension);
if (fillPointer < 0)
@@ -335,7 +335,7 @@
return Fixnum.getInstance(fillPointer++);
}
- private final void ensureCapacity(int minCapacity) throws ConditionThrowable
+ private final void ensureCapacity(int minCapacity)
{
if (elements != null) {
if (capacity < minCapacity) {
@@ -368,7 +368,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null) {
// "If INITIAL-CONTENTS is supplied, it is treated as for MAKE-
@@ -416,7 +416,7 @@
public AbstractVector adjustArray(int newCapacity,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
capacity = newCapacity;
array = displacedTo;
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte32.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte32.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte32.java Fri Nov 6 15:07:54 2009
@@ -96,7 +96,7 @@
}
@Override
- public void setFillPointer(LispObject obj) throws ConditionThrowable
+ public void setFillPointer(LispObject obj)
{
if (obj == T)
fillPointer = capacity();
@@ -126,7 +126,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null) {
@@ -164,7 +164,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
final int limit = length();
if (index < 0 || index >= limit)
@@ -174,7 +174,7 @@
// Ignores fill pointer.
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (elements != null) {
try {
@@ -195,13 +195,13 @@
// Ignores fill pointer.
// FIXME inline
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
return AREF(Fixnum.getValue(index));
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (elements != null) {
try {
@@ -220,7 +220,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
SimpleVector v = new SimpleVector(end - start);
int i = start, j = 0;
@@ -235,14 +235,14 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
for (int i = capacity; i-- > 0;)
elements[i] = obj;
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (elements != null) {
if (n < elements.length) {
@@ -259,7 +259,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
int length = length();
SimpleVector result = new SimpleVector(length);
@@ -270,7 +270,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
if (elements != null) {
int i = 0;
@@ -301,7 +301,7 @@
@Override
public void vectorPushExtend(LispObject element)
- throws ConditionThrowable
+
{
if (fillPointer < 0)
noFillPointer();
@@ -315,7 +315,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element)
- throws ConditionThrowable
+
{
vectorPushExtend(element);
return Fixnum.getInstance(fillPointer - 1);
@@ -323,7 +323,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element, LispObject extension)
- throws ConditionThrowable
+
{
int ext = Fixnum.getValue(extension);
if (fillPointer < 0)
@@ -337,7 +337,7 @@
return Fixnum.getInstance(fillPointer++);
}
- private final void ensureCapacity(int minCapacity) throws ConditionThrowable
+ private final void ensureCapacity(int minCapacity)
{
if (elements != null) {
if (capacity < minCapacity) {
@@ -370,7 +370,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null) {
// "If INITIAL-CONTENTS is supplied, it is treated as for MAKE-
@@ -419,7 +419,7 @@
public AbstractVector adjustArray(int newCapacity,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
capacity = newCapacity;
array = displacedTo;
Modified: trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte8.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte8.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte8.java Fri Nov 6 15:07:54 2009
@@ -94,7 +94,7 @@
}
@Override
- public void setFillPointer(LispObject obj) throws ConditionThrowable
+ public void setFillPointer(LispObject obj)
{
if (obj == T)
fillPointer = capacity();
@@ -124,7 +124,7 @@
}
@Override
- public LispObject arrayDisplacement() throws ConditionThrowable
+ public LispObject arrayDisplacement()
{
LispObject value1, value2;
if (array != null) {
@@ -162,7 +162,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
final int limit = length();
if (index < 0 || index >= limit)
@@ -172,7 +172,7 @@
// Ignores fill pointer.
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (elements != null) {
try {
@@ -193,13 +193,13 @@
// Ignores fill pointer.
// FIXME inline
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
return AREF(Fixnum.getValue(index));
}
@Override
- public void aset(int index, int n) throws ConditionThrowable
+ public void aset(int index, int n)
{
if (elements != null) {
try {
@@ -218,7 +218,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (elements != null) {
try {
@@ -232,7 +232,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
SimpleVector v = new SimpleVector(end - start);
int i = start, j = 0;
@@ -247,7 +247,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
byte b = (byte) Fixnum.getValue(obj);
for (int i = capacity; i-- > 0;)
@@ -255,7 +255,7 @@
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (elements != null) {
if (n < elements.length) {
@@ -272,7 +272,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
int length = length();
BasicVector_UnsignedByte8 result = new BasicVector_UnsignedByte8(length);
@@ -283,7 +283,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
if (elements != null) {
int i = 0;
@@ -313,7 +313,7 @@
}
@Override
- public void vectorPushExtend(LispObject element) throws ConditionThrowable
+ public void vectorPushExtend(LispObject element)
{
if (fillPointer < 0)
noFillPointer();
@@ -327,7 +327,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element)
- throws ConditionThrowable
+
{
vectorPushExtend(element);
return Fixnum.getInstance(fillPointer - 1);
@@ -335,7 +335,7 @@
@Override
public LispObject VECTOR_PUSH_EXTEND(LispObject element, LispObject extension)
- throws ConditionThrowable
+
{
int ext = Fixnum.getValue(extension);
if (fillPointer < 0)
@@ -349,7 +349,7 @@
return Fixnum.getInstance(fillPointer++);
}
- private final void ensureCapacity(int minCapacity) throws ConditionThrowable
+ private final void ensureCapacity(int minCapacity)
{
if (elements != null) {
if (capacity < minCapacity) {
@@ -382,7 +382,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null) {
// "If INITIAL-CONTENTS is supplied, it is treated as for MAKE-
@@ -432,7 +432,7 @@
public AbstractVector adjustArray(int newCapacity,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
capacity = newCapacity;
array = displacedTo;
Modified: trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java Fri Nov 6 15:07:54 2009
@@ -37,14 +37,14 @@
{
private LispObject streams;
- private ConcatenatedStream(LispObject streams) throws ConditionThrowable
+ private ConcatenatedStream(LispObject streams)
{
this.streams = streams;
isInputStream = true;
}
@Override
- public boolean isCharacterInputStream() throws ConditionThrowable
+ public boolean isCharacterInputStream()
{
if (streams == NIL)
return true;
@@ -52,7 +52,7 @@
}
@Override
- public boolean isBinaryInputStream() throws ConditionThrowable
+ public boolean isBinaryInputStream()
{
if (streams == NIL)
return true;
@@ -60,13 +60,13 @@
}
@Override
- public boolean isCharacterOutputStream() throws ConditionThrowable
+ public boolean isCharacterOutputStream()
{
return false;
}
@Override
- public boolean isBinaryOutputStream() throws ConditionThrowable
+ public boolean isBinaryOutputStream()
{
return false;
}
@@ -84,7 +84,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.CONCATENATED_STREAM)
return T;
@@ -94,7 +94,7 @@
}
@Override
- public LispObject getElementType() throws ConditionThrowable
+ public LispObject getElementType()
{
if (streams == NIL)
return NIL;
@@ -103,7 +103,7 @@
@Override
public LispObject readCharNoHang(boolean eofError, LispObject eofValue)
- throws ConditionThrowable
+
{
if (streams == NIL) {
if (eofError)
@@ -122,7 +122,7 @@
}
@Override
- public LispObject listen() throws ConditionThrowable
+ public LispObject listen()
{
if (unreadChar >= 0)
return T;
@@ -139,7 +139,7 @@
// Returns -1 at end of file.
@Override
- protected int _readChar() throws ConditionThrowable, java.io.IOException
+ protected int _readChar() throws java.io.IOException
{
int n;
if (unreadChar >= 0) {
@@ -158,7 +158,7 @@
}
@Override
- protected void _unreadChar(int n) throws ConditionThrowable
+ protected void _unreadChar(int n)
{
if (unreadChar >= 0)
error(new StreamError(this, "UNREAD-CHAR was invoked twice consecutively without an intervening call to READ-CHAR."));
@@ -166,7 +166,7 @@
}
@Override
- protected boolean _charReady() throws ConditionThrowable, java.io.IOException
+ protected boolean _charReady() throws java.io.IOException
{
if (unreadChar >= 0)
return true;
@@ -186,33 +186,33 @@
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
outputStreamError();
}
@Override
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
outputStreamError();
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
outputStreamError();
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
outputStreamError();
}
// Reads an 8-bit byte.
@Override
- public int _readByte() throws ConditionThrowable
+ public int _readByte()
{
if (streams == NIL)
return -1;
@@ -226,24 +226,24 @@
// Writes an 8-bit byte.
@Override
- public void _writeByte(int n) throws ConditionThrowable
+ public void _writeByte(int n)
{
outputStreamError();
}
@Override
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
outputStreamError();
}
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
// FIXME
}
- private void outputStreamError() throws ConditionThrowable
+ private void outputStreamError()
{
error(new StreamError(this,
String.valueOf(this) + " is not an output stream."));
@@ -254,7 +254,7 @@
new Primitive("make-concatenated-stream", "&rest streams")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject streams = NIL;
for (int i = 0; i < args.length; i++) {
@@ -278,7 +278,7 @@
new Primitive("concatenated-stream-streams", "concatenated-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof ConcatenatedStream)
return ((ConcatenatedStream)arg).streams;
Modified: trunk/abcl/src/org/armedbear/lisp/Condition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Condition.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Condition.java Fri Nov 6 15:07:54 2009
@@ -37,14 +37,14 @@
{
protected String message;
- public Condition() throws ConditionThrowable
+ public Condition()
{
super(StandardClass.CONDITION);
Debug.assertTrue(slots.length == 2);
setFormatArguments(NIL);
}
- protected Condition(LispClass cls) throws ConditionThrowable
+ protected Condition(LispClass cls)
{
super(cls);
Debug.assertTrue(slots.length >= 2);
@@ -56,14 +56,14 @@
super(cls, length);
}
- public Condition(LispObject initArgs) throws ConditionThrowable
+ public Condition(LispObject initArgs)
{
super(StandardClass.CONDITION);
Debug.assertTrue(slots.length == 2);
initialize(initArgs);
}
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
LispObject control = null;
LispObject arguments = null;
@@ -107,34 +107,34 @@
}
}
- public final LispObject getFormatControl() throws ConditionThrowable
+ public final LispObject getFormatControl()
{
return getInstanceSlotValue(Symbol.FORMAT_CONTROL);
}
public final void setFormatControl(LispObject formatControl)
- throws ConditionThrowable
+
{
setInstanceSlotValue(Symbol.FORMAT_CONTROL, formatControl);
}
- public final void setFormatControl(String s) throws ConditionThrowable
+ public final void setFormatControl(String s)
{
setFormatControl(new SimpleString(s));
}
- public final LispObject getFormatArguments() throws ConditionThrowable
+ public final LispObject getFormatArguments()
{
return getInstanceSlotValue(Symbol.FORMAT_ARGUMENTS);
}
public final void setFormatArguments(LispObject formatArguments)
- throws ConditionThrowable
+
{
setInstanceSlotValue(Symbol.FORMAT_ARGUMENTS, formatArguments);
}
- public String getMessage() throws ConditionThrowable
+ public String getMessage()
{
return message;
}
@@ -158,7 +158,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.CONDITION)
return T;
@@ -167,7 +167,7 @@
return super.typep(type);
}
- public String getConditionReport() throws ConditionThrowable
+ public String getConditionReport()
{
String s = getMessage();
if (s != null)
@@ -185,7 +185,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
if (Symbol.PRINT_ESCAPE.symbolValue(thread) == NIL)
Modified: trunk/abcl/src/org/armedbear/lisp/ConditionThrowable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ConditionThrowable.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ConditionThrowable.java Fri Nov 6 15:07:54 2009
@@ -53,5 +53,5 @@
super(message);
}
- public abstract LispObject getCondition() throws ConditionThrowable;
+ public abstract LispObject getCondition();
}
Modified: trunk/abcl/src/org/armedbear/lisp/Cons.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Cons.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Cons.java Fri Nov 6 15:07:54 2009
@@ -72,7 +72,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier instanceof Symbol)
{
@@ -142,7 +142,7 @@
}
@Override
- public LispObject RPLACA(LispObject obj) throws ConditionThrowable
+ public LispObject RPLACA(LispObject obj)
{
car = obj;
return this;
@@ -155,32 +155,32 @@
}
@Override
- public LispObject RPLACD(LispObject obj) throws ConditionThrowable
+ public LispObject RPLACD(LispObject obj)
{
cdr = obj;
return this;
}
@Override
- public final LispObject cadr() throws ConditionThrowable
+ public final LispObject cadr()
{
return cdr.car();
}
@Override
- public final LispObject cddr() throws ConditionThrowable
+ public final LispObject cddr()
{
return cdr.cdr();
}
@Override
- public final LispObject caddr() throws ConditionThrowable
+ public final LispObject caddr()
{
return cdr.cadr();
}
@Override
- public LispObject nthcdr(int n) throws ConditionThrowable
+ public LispObject nthcdr(int n)
{
if (n < 0)
return type_error(Fixnum.getInstance(n),
@@ -230,7 +230,7 @@
}
@Override
- public final int psxhash() //throws ConditionThrowable
+ public final int psxhash()
{
return computeEqualpHash(this, 4);
}
@@ -253,7 +253,7 @@
}
@Override
- public final boolean equal(LispObject obj) throws ConditionThrowable
+ public final boolean equal(LispObject obj)
{
if (this == obj)
return true;
@@ -266,7 +266,7 @@
}
@Override
- public final boolean equalp(LispObject obj) throws ConditionThrowable
+ public final boolean equalp(LispObject obj)
{
if (this == obj)
return true;
@@ -279,7 +279,7 @@
}
@Override
- public final int length() throws ConditionThrowable
+ public final int length()
{
int length = 1;
LispObject obj = cdr;
@@ -294,7 +294,7 @@
}
@Override
- public LispObject NTH(int index) throws ConditionThrowable
+ public LispObject NTH(int index)
{
if (index < 0)
type_error(Fixnum.getInstance(index), Symbol.UNSIGNED_BYTE);
@@ -312,7 +312,7 @@
}
@Override
- public LispObject NTH(LispObject arg) throws ConditionThrowable
+ public LispObject NTH(LispObject arg)
{
int index;
if (arg instanceof Fixnum)
@@ -346,7 +346,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
if (index < 0)
type_error(Fixnum.getInstance(index), Symbol.UNSIGNED_BYTE);
@@ -383,7 +383,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
Cons cons = this;
LispObject result = new Cons(cons.car);
@@ -398,7 +398,7 @@
}
@Override
- public final LispObject nreverse() throws ConditionThrowable
+ public final LispObject nreverse()
{
if (cdr instanceof Cons)
{
@@ -456,7 +456,7 @@
}
@Override
- public final LispObject[] copyToArray() throws ConditionThrowable
+ public final LispObject[] copyToArray()
{
final int length = length();
LispObject[] array = new LispObject[length];
@@ -470,7 +470,7 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
if (car == Symbol.LAMBDA)
{
@@ -481,7 +481,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (car == Symbol.LAMBDA)
{
@@ -493,7 +493,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (car == Symbol.LAMBDA)
{
@@ -506,7 +506,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (car == Symbol.LAMBDA)
{
@@ -519,7 +519,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
if (car == Symbol.LAMBDA)
{
@@ -533,7 +533,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
if (car == Symbol.LAMBDA)
{
@@ -547,7 +547,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
if (car == Symbol.LAMBDA)
{
@@ -562,7 +562,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
if (car == Symbol.LAMBDA)
{
@@ -578,7 +578,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
if (car == Symbol.LAMBDA)
{
@@ -590,7 +590,7 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (car == Symbol.LAMBDA)
{
@@ -600,14 +600,14 @@
return signalExecutionError();
}
- private final LispObject signalExecutionError() throws ConditionThrowable
+ private final LispObject signalExecutionError()
{
return type_error(this, list(Symbol.OR, Symbol.FUNCTION,
Symbol.SYMBOL));
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
final LispObject printLength = Symbol.PRINT_LENGTH.symbolValue(thread);
Modified: trunk/abcl/src/org/armedbear/lisp/ControlError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ControlError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ControlError.java Fri Nov 6 15:07:54 2009
@@ -35,13 +35,13 @@
public final class ControlError extends LispError
{
- public ControlError(LispObject initArgs) throws ConditionThrowable
+ public ControlError(LispObject initArgs)
{
super(StandardClass.CONTROL_ERROR);
initialize(initArgs);
}
- public ControlError(String message) throws ConditionThrowable
+ public ControlError(String message)
{
super(StandardClass.CONTROL_ERROR);
setFormatControl(message);
@@ -61,7 +61,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.CONTROL_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/DispatchMacroFunction.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/DispatchMacroFunction.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/DispatchMacroFunction.java Fri Nov 6 15:07:54 2009
@@ -64,7 +64,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
Stream stream = inSynonymOf(first);
char c = LispCharacter.getValue(second);
@@ -77,5 +77,5 @@
}
public abstract LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable;
+ ;
}
Modified: trunk/abcl/src/org/armedbear/lisp/DivisionByZero.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/DivisionByZero.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/DivisionByZero.java Fri Nov 6 15:07:54 2009
@@ -35,13 +35,13 @@
public final class DivisionByZero extends ArithmeticError
{
- public DivisionByZero() throws ConditionThrowable
+ public DivisionByZero()
{
super(StandardClass.DIVISION_BY_ZERO);
setFormatControl("Arithmetic error DIVISION-BY-ZERO signalled.");
}
- public DivisionByZero(LispObject initArgs) throws ConditionThrowable
+ public DivisionByZero(LispObject initArgs)
{
super(StandardClass.DIVISION_BY_ZERO);
initialize(initArgs);
@@ -60,7 +60,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.DIVISION_BY_ZERO)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/Do.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Do.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Do.java Fri Nov 6 15:07:54 2009
@@ -41,7 +41,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
return _do(args, env, false);
}
@@ -53,7 +53,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
return _do(args, env, true);
}
@@ -61,7 +61,7 @@
private static final LispObject _do(LispObject args, Environment env,
boolean sequential)
- throws ConditionThrowable
+
{
LispObject varlist = args.car();
LispObject second = args.cadr();
Modified: trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java Fri Nov 6 15:07:54 2009
@@ -86,7 +86,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.FLOAT)
return T;
@@ -168,7 +168,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (obj instanceof SingleFloat)
return value == ((SingleFloat)obj).value;
@@ -223,7 +223,7 @@
return true;
}
- public static double getValue(LispObject obj) throws ConditionThrowable
+ public static double getValue(LispObject obj)
{
if (obj instanceof DoubleFloat)
return ((DoubleFloat)obj).value;
@@ -280,7 +280,7 @@
}
@Override
- public LispObject add(LispObject obj) throws ConditionThrowable
+ public LispObject add(LispObject obj)
{
if (obj instanceof Fixnum)
return new DoubleFloat(value + ((Fixnum)obj).value);
@@ -300,7 +300,7 @@
}
@Override
- public LispObject subtract(LispObject obj) throws ConditionThrowable
+ public LispObject subtract(LispObject obj)
{
if (obj instanceof Fixnum)
return new DoubleFloat(value - ((Fixnum)obj).value);
@@ -321,7 +321,7 @@
}
@Override
- public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
+ public LispObject multiplyBy(LispObject obj)
{
if (obj instanceof Fixnum)
return new DoubleFloat(value * ((Fixnum)obj).value);
@@ -342,7 +342,7 @@
}
@Override
- public LispObject divideBy(LispObject obj) throws ConditionThrowable
+ public LispObject divideBy(LispObject obj)
{
if (obj instanceof Fixnum)
return new DoubleFloat(value / ((Fixnum)obj).value);
@@ -368,7 +368,7 @@
}
@Override
- public boolean isEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value == ((Fixnum)obj).value;
@@ -388,13 +388,13 @@
}
@Override
- public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isNotEqualTo(LispObject obj)
{
return !isEqualTo(obj);
}
@Override
- public boolean isLessThan(LispObject obj) throws ConditionThrowable
+ public boolean isLessThan(LispObject obj)
{
if (obj instanceof Fixnum)
return value < ((Fixnum)obj).value;
@@ -412,7 +412,7 @@
}
@Override
- public boolean isGreaterThan(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThan(LispObject obj)
{
if (obj instanceof Fixnum)
return value > ((Fixnum)obj).value;
@@ -430,7 +430,7 @@
}
@Override
- public boolean isLessThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isLessThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value <= ((Fixnum)obj).value;
@@ -448,7 +448,7 @@
}
@Override
- public boolean isGreaterThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value >= ((Fixnum)obj).value;
@@ -466,7 +466,7 @@
}
@Override
- public LispObject truncate(LispObject obj) throws ConditionThrowable
+ public LispObject truncate(LispObject obj)
{
// "When rationals and floats are combined by a numerical function,
// the rational is first converted to a float of the same format."
@@ -579,7 +579,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (value == Double.POSITIVE_INFINITY) {
FastStringBuffer sb = new FastStringBuffer("#.");
@@ -614,7 +614,7 @@
return s1;
}
- public LispObject rational() throws ConditionThrowable
+ public LispObject rational()
{
final long bits = Double.doubleToRawLongBits(value);
int sign = ((bits >> 63) == 0) ? 1 : -1;
@@ -641,7 +641,7 @@
return number(numerator, denominator);
}
- public static DoubleFloat coerceToFloat(LispObject obj) throws ConditionThrowable
+ public static DoubleFloat coerceToFloat(LispObject obj)
{
if (obj instanceof DoubleFloat)
return (DoubleFloat) obj;
Modified: trunk/abcl/src/org/armedbear/lisp/DowncaseStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/DowncaseStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/DowncaseStream.java Fri Nov 6 15:07:54 2009
@@ -35,25 +35,25 @@
public final class DowncaseStream extends CaseFrobStream
{
- public DowncaseStream(Stream target) throws ConditionThrowable
+ public DowncaseStream(Stream target)
{
super(target);
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
target._writeChar(LispCharacter.toLowerCase(c));
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
target._writeString(s.toLowerCase());
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
target._writeLine(s.toLowerCase());
}
Modified: trunk/abcl/src/org/armedbear/lisp/EchoStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/EchoStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/EchoStream.java Fri Nov 6 15:07:54 2009
@@ -54,7 +54,7 @@
}
@Override
- public LispObject getElementType() throws ConditionThrowable
+ public LispObject getElementType()
{
LispObject itype = in.getElementType();
LispObject otype = out.getElementType();
@@ -86,7 +86,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.ECHO_STREAM)
return T;
@@ -108,32 +108,32 @@
}
@Override
- public boolean isCharacterInputStream() throws ConditionThrowable
+ public boolean isCharacterInputStream()
{
return in.isCharacterInputStream();
}
@Override
- public boolean isBinaryInputStream() throws ConditionThrowable
+ public boolean isBinaryInputStream()
{
return in.isBinaryInputStream();
}
@Override
- public boolean isCharacterOutputStream() throws ConditionThrowable
+ public boolean isCharacterOutputStream()
{
return out.isCharacterOutputStream();
}
@Override
- public boolean isBinaryOutputStream() throws ConditionThrowable
+ public boolean isBinaryOutputStream()
{
return out.isBinaryOutputStream();
}
// Returns -1 at end of file.
@Override
- protected int _readChar() throws ConditionThrowable, java.io.IOException
+ protected int _readChar() throws java.io.IOException
{
int n = in._readChar();
if (n >= 0) {
@@ -147,46 +147,46 @@
}
@Override
- protected void _unreadChar(int n) throws ConditionThrowable, java.io.IOException
+ protected void _unreadChar(int n) throws java.io.IOException
{
in._unreadChar(n);
unreadChar = n;
}
@Override
- protected boolean _charReady() throws ConditionThrowable, java.io.IOException
+ protected boolean _charReady() throws java.io.IOException
{
return in._charReady();
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
out._writeChar(c);
}
@Override
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
out._writeChars(chars, start, end);
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
out._writeString(s);
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
out._writeLine(s);
}
// Reads an 8-bit byte.
@Override
- public int _readByte() throws ConditionThrowable
+ public int _readByte()
{
int n = in._readByte();
if (n >= 0)
@@ -196,25 +196,25 @@
// Writes an 8-bit byte.
@Override
- public void _writeByte(int n) throws ConditionThrowable
+ public void _writeByte(int n)
{
out._writeByte(n);
}
@Override
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
out._finishOutput();
}
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
in._clearInput();
}
@Override
- public LispObject close(LispObject abort) throws ConditionThrowable
+ public LispObject close(LispObject abort)
{
// "The effect of CLOSE on a constructed stream is to close the
// argument stream only. There is no effect on the constituents of
@@ -224,13 +224,13 @@
}
@Override
- public LispObject listen() throws ConditionThrowable
+ public LispObject listen()
{
return in.listen();
}
@Override
- public LispObject freshLine() throws ConditionThrowable
+ public LispObject freshLine()
{
return out.freshLine();
}
@@ -248,7 +248,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (!(first instanceof Stream))
return type_error(first, Symbol.STREAM);
@@ -264,7 +264,7 @@
new Primitive("echo-stream-input-stream", "echo-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof EchoStream)
return ((EchoStream)arg).getInputStream();
@@ -278,7 +278,7 @@
new Primitive("echo-stream-output-stream", "echo-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof EchoStream)
return ((EchoStream)arg).getOutputStream();
Modified: trunk/abcl/src/org/armedbear/lisp/EndOfFile.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/EndOfFile.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/EndOfFile.java Fri Nov 6 15:07:54 2009
@@ -35,13 +35,13 @@
public final class EndOfFile extends StreamError
{
- public EndOfFile(Stream stream) throws ConditionThrowable
+ public EndOfFile(Stream stream)
{
super(StandardClass.END_OF_FILE);
setStream(stream);
}
- public EndOfFile(LispObject initArgs) throws ConditionThrowable
+ public EndOfFile(LispObject initArgs)
{
super(StandardClass.END_OF_FILE);
initialize(initArgs);
@@ -60,7 +60,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.END_OF_FILE)
return T;
@@ -70,7 +70,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return unreadableString(Symbol.END_OF_FILE);
}
Modified: trunk/abcl/src/org/armedbear/lisp/Environment.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Environment.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Environment.java Fri Nov 6 15:07:54 2009
@@ -75,7 +75,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.ENVIRONMENT)
return T;
@@ -140,7 +140,7 @@
}
public LispObject lookupFunction(LispObject name)
- throws ConditionThrowable
+
{
FunctionBinding binding = lastFunctionBinding;
if (name instanceof Symbol)
@@ -214,7 +214,7 @@
// Returns body with declarations removed.
public LispObject processDeclarations(LispObject body)
- throws ConditionThrowable
+
{
LispObject bodyAndDecls = parseBody(body, false);
LispObject specials = parseSpecials(bodyAndDecls.NTH(1));
@@ -243,7 +243,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return unreadableString(Symbol.ENVIRONMENT);
}
@@ -259,7 +259,7 @@
return new Environment();
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == NIL)
return new Environment();
@@ -275,7 +275,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
Environment env = checkEnvironment(first);
LispObject name = second;
@@ -293,7 +293,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
checkEnvironment(first).addFunctionBinding(second, third);
return first;
@@ -308,7 +308,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
checkEnvironment(first).bind(checkSymbol(second), third);
return first;
@@ -320,7 +320,7 @@
new Primitive("empty-environment-p", PACKAGE_SYS, true, "environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkEnvironment(arg).isEmpty() ? T : NIL;
}
@@ -331,7 +331,7 @@
new Primitive("environment-variables", PACKAGE_SYS, true, "environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Environment env = checkEnvironment(arg);
LispObject result = NIL;
@@ -347,7 +347,7 @@
new Primitive("environment-all-variables", PACKAGE_SYS, true, "environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Environment env = checkEnvironment(arg);
LispObject result = NIL;
@@ -366,7 +366,7 @@
new Primitive("environment-all-functions", PACKAGE_SYS, true, "environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Environment env = checkEnvironment(arg);
LispObject result = NIL;
Modified: trunk/abcl/src/org/armedbear/lisp/EqualHashTable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/EqualHashTable.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/EqualHashTable.java Fri Nov 6 15:07:54 2009
@@ -72,7 +72,7 @@
}
@Override
- public void put(LispObject key, LispObject value) throws ConditionThrowable
+ public void put(LispObject key, LispObject value)
{
int index = key.sxhash() & mask;
HashEntry e = buckets[index];
@@ -98,7 +98,7 @@
}
@Override
- public LispObject remove(LispObject key) throws ConditionThrowable
+ public LispObject remove(LispObject key)
{
final int index = key.sxhash() & mask;
HashEntry e = buckets[index];
Modified: trunk/abcl/src/org/armedbear/lisp/EqualpHashTable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/EqualpHashTable.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/EqualpHashTable.java Fri Nov 6 15:07:54 2009
@@ -70,7 +70,7 @@
}
@Override
- public void put(LispObject key, LispObject value) throws ConditionThrowable
+ public void put(LispObject key, LispObject value)
{
int index = key.psxhash() % buckets.length;
HashEntry e = buckets[index];
@@ -96,7 +96,7 @@
}
@Override
- public LispObject remove(LispObject key) throws ConditionThrowable
+ public LispObject remove(LispObject key)
{
final int index = key.psxhash() % buckets.length;
HashEntry e = buckets[index];
Modified: trunk/abcl/src/org/armedbear/lisp/Extensions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Extensions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Extensions.java Fri Nov 6 15:07:54 2009
@@ -49,7 +49,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() != 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -63,7 +63,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first != second ? T : NIL;
}
@@ -75,7 +75,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject list)
- throws ConditionThrowable
+
{
while (list instanceof Cons)
{
@@ -95,7 +95,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject list)
- throws ConditionThrowable
+
{
while (list instanceof Cons)
{
@@ -115,7 +115,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject list)
- throws ConditionThrowable
+
{
return memql(item, list) ? list : new Cons(item, list);
}
@@ -126,7 +126,7 @@
new Primitive("special-variable-p", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.isSpecialVariable() ? T : NIL;
}
@@ -137,7 +137,7 @@
new Primitive("source", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return get(arg, Symbol._SOURCE, NIL);
}
@@ -148,7 +148,7 @@
new Primitive("source-file-position", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
LispObject obj = get(arg, Symbol._SOURCE, NIL);
if (obj instanceof Cons)
@@ -162,7 +162,7 @@
new Primitive("source-pathname", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
LispObject obj = get(arg, Symbol._SOURCE, NIL);
if (obj instanceof Cons)
@@ -176,14 +176,14 @@
new Primitive("exit", PACKAGE_EXT, true, "&key status")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
exit(0);
return LispThread.currentThread().nothing();
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
int status = 0;
if (first == Keyword.STATUS)
@@ -201,14 +201,14 @@
new Primitive("quit", PACKAGE_EXT, true, "&key status")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
exit(0);
return LispThread.currentThread().nothing();
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
int status = 0;
if (first == Keyword.STATUS)
@@ -226,7 +226,7 @@
new Primitive("dump-java-stack", PACKAGE_EXT, true)
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
Thread.dumpStack();
return LispThread.currentThread().nothing();
@@ -238,7 +238,7 @@
new Primitive("make-temp-file", PACKAGE_EXT, true, "")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
try
{
@@ -259,7 +259,7 @@
new Primitive("interrupt-lisp", PACKAGE_EXT, true, "")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
setInterrupted(true);
return T;
@@ -271,7 +271,7 @@
new Primitive("getenv", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
AbstractString string;
if (arg instanceof AbstractString) {
Modified: trunk/abcl/src/org/armedbear/lisp/FaslReader.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FaslReader.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FaslReader.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
try
{
@@ -68,7 +68,7 @@
{
@Override
public LispObject execute(Stream stream, char terminator)
- throws ConditionThrowable
+
{
final Readtable rt = FaslReadtable.getInstance();
FastStringBuffer sb = new FastStringBuffer();
@@ -133,7 +133,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
return stream.readList(false, true);
}
@@ -146,7 +146,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
return error(new ReaderError("Unmatched right parenthesis.", stream));
}
@@ -159,7 +159,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
return new Cons(Symbol.QUOTE,
new Cons(stream.faslRead(true, NIL, true,
@@ -174,7 +174,7 @@
{
@Override
public LispObject execute(Stream stream, char c)
- throws ConditionThrowable
+
{
return stream.readDispatchChar(c, true);
}
@@ -187,7 +187,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject list = stream.readList(true, true);
@@ -214,7 +214,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored, int n)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final Readtable rt = FaslReadtable.getInstance();
@@ -285,7 +285,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (Symbol.READ_EVAL.symbolValue(thread) == NIL)
@@ -304,7 +304,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
LispThread thread = LispThread.currentThread();
Symbol symbol = (Symbol) stream.readSymbol(FaslReadtable.getInstance());
@@ -323,7 +323,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.faslReadArray(n);
}
@@ -336,7 +336,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.faslReadRadix(2);
}
@@ -349,7 +349,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.faslReadComplex();
}
@@ -362,7 +362,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.faslReadRadix(8);
}
@@ -375,7 +375,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.faslReadPathname();
}
@@ -388,7 +388,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.faslReadRadix(n);
}
@@ -401,7 +401,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readStructure();
}
@@ -414,7 +414,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.faslReadRadix(16);
}
@@ -427,7 +427,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return new Cons(Symbol.FUNCTION,
new Cons(stream.faslRead(true, NIL, true,
@@ -442,7 +442,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readCharacterLiteral(FaslReadtable.getInstance(),
LispThread.currentThread());
@@ -456,7 +456,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
stream.skipBalancedComment();
return null;
@@ -470,7 +470,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
FastStringBuffer sb =
new FastStringBuffer("Illegal # macro character: #\\");
Modified: trunk/abcl/src/org/armedbear/lisp/FileError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FileError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FileError.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class FileError extends LispError
{
// initArgs is either a normal initArgs list or a pathname.
- public FileError(LispObject initArgs) throws ConditionThrowable
+ public FileError(LispObject initArgs)
{
super(StandardClass.FILE_ERROR);
if (initArgs instanceof Cons)
@@ -46,7 +46,7 @@
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
LispObject pathname = NIL;
@@ -62,7 +62,7 @@
setPathname(pathname);
}
- public FileError(String message) throws ConditionThrowable
+ public FileError(String message)
{
super(StandardClass.FILE_ERROR);
setFormatControl(message);
@@ -70,7 +70,7 @@
}
public FileError(String message, LispObject pathname)
- throws ConditionThrowable
+
{
super(StandardClass.FILE_ERROR);
setFormatControl(message);
@@ -78,12 +78,12 @@
setPathname(pathname);
}
- public LispObject getPathname() throws ConditionThrowable
+ public LispObject getPathname()
{
return getInstanceSlotValue(Symbol.PATHNAME);
}
- private void setPathname(LispObject pathname) throws ConditionThrowable
+ private void setPathname(LispObject pathname)
{
setInstanceSlotValue(Symbol.PATHNAME, pathname);
}
@@ -101,7 +101,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.FILE_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/FileStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FileStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FileStream.java Fri Nov 6 15:07:54 2009
@@ -146,7 +146,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.FILE_STREAM)
return T;
@@ -161,7 +161,7 @@
}
@Override
- public LispObject fileLength() throws ConditionThrowable
+ public LispObject fileLength()
{
final long length;
if (isOpen()) {
@@ -189,7 +189,7 @@
}
@Override
- protected void _unreadChar(int n) throws ConditionThrowable
+ protected void _unreadChar(int n)
{
try {
racf.unreadChar((char)n);
@@ -200,13 +200,13 @@
}
@Override
- protected boolean _charReady() throws ConditionThrowable
+ protected boolean _charReady()
{
return true;
}
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
try {
if (isInputStream) {
@@ -221,7 +221,7 @@
}
@Override
- protected long _getFilePosition() throws ConditionThrowable
+ protected long _getFilePosition()
{
try {
long pos = racf.position();
@@ -235,7 +235,7 @@
}
@Override
- protected boolean _setFilePosition(LispObject arg) throws ConditionThrowable
+ protected boolean _setFilePosition(LispObject arg)
{
try {
long pos;
@@ -256,7 +256,7 @@
}
@Override
- public void _close() throws ConditionThrowable
+ public void _close()
{
try {
racf.close();
@@ -268,7 +268,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return unreadableString(Symbol.FILE_STREAM);
}
@@ -282,7 +282,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
final Pathname pathname;
if(first instanceof Pathname) {
Modified: trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
new Primitive("make-fill-pointer-output-stream", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof ComplexString) {
ComplexString string = (ComplexString) arg;
Modified: trunk/abcl/src/org/armedbear/lisp/Fixnum.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Fixnum.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Fixnum.java Fri Nov 6 15:07:54 2009
@@ -109,7 +109,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type instanceof Symbol)
{
@@ -268,13 +268,13 @@
}
@Override
- public boolean evenp() throws ConditionThrowable
+ public boolean evenp()
{
return (value & 0x01) == 0;
}
@Override
- public boolean oddp() throws ConditionThrowable
+ public boolean oddp()
{
return (value & 0x01) != 0;
}
@@ -297,7 +297,7 @@
return value == 0;
}
- public static int getValue(LispObject obj) throws ConditionThrowable
+ public static int getValue(LispObject obj)
{
if (obj instanceof Fixnum) return ((Fixnum)obj).value;
type_error(obj, Symbol.FIXNUM);
@@ -315,7 +315,7 @@
return (double)value;
}
- public static int getInt(LispObject obj) throws ConditionThrowable
+ public static int getInt(LispObject obj)
{
if (obj instanceof Fixnum) return ((Fixnum)obj).value;
type_error(obj, Symbol.FIXNUM);
@@ -323,7 +323,7 @@
return 0;
}
- public static BigInteger getBigInteger(LispObject obj) throws ConditionThrowable
+ public static BigInteger getBigInteger(LispObject obj)
{
if (obj instanceof Fixnum) return BigInteger.valueOf(((Fixnum)obj).value);
type_error(obj, Symbol.FIXNUM);
@@ -373,7 +373,7 @@
}
@Override
- public LispObject add(LispObject obj) throws ConditionThrowable
+ public LispObject add(LispObject obj)
{
if (obj instanceof Fixnum)
{
@@ -408,7 +408,7 @@
}
@Override
- public LispObject subtract(LispObject obj) throws ConditionThrowable
+ public LispObject subtract(LispObject obj)
{
if (obj instanceof Fixnum)
return number((long) value - ((Fixnum)obj).value);
@@ -443,7 +443,7 @@
}
@Override
- public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
+ public LispObject multiplyBy(LispObject obj)
{
if (obj instanceof Fixnum)
{
@@ -474,7 +474,7 @@
}
@Override
- public LispObject divideBy(LispObject obj) throws ConditionThrowable
+ public LispObject divideBy(LispObject obj)
{
try
{
@@ -528,7 +528,7 @@
}
@Override
- public boolean isEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value == ((Fixnum)obj).value;
@@ -552,7 +552,7 @@
}
@Override
- public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isNotEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value != ((Fixnum)obj).value;
@@ -577,7 +577,7 @@
}
@Override
- public boolean isLessThan(LispObject obj) throws ConditionThrowable
+ public boolean isLessThan(LispObject obj)
{
if (obj instanceof Fixnum)
return value < ((Fixnum)obj).value;
@@ -598,13 +598,13 @@
}
@Override
- public boolean isGreaterThan(int n) throws ConditionThrowable
+ public boolean isGreaterThan(int n)
{
return value > n;
}
@Override
- public boolean isGreaterThan(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThan(LispObject obj)
{
if (obj instanceof Fixnum)
return value > ((Fixnum)obj).value;
@@ -631,7 +631,7 @@
}
@Override
- public boolean isLessThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isLessThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value <= ((Fixnum)obj).value;
@@ -658,7 +658,7 @@
}
@Override
- public boolean isGreaterThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return value >= ((Fixnum)obj).value;
@@ -679,7 +679,7 @@
}
@Override
- public LispObject truncate(LispObject obj) throws ConditionThrowable
+ public LispObject truncate(LispObject obj)
{
final LispThread thread = LispThread.currentThread();
final LispObject value1, value2;
@@ -741,7 +741,7 @@
}
@Override
- public LispObject MOD(LispObject divisor) throws ConditionThrowable
+ public LispObject MOD(LispObject divisor)
{
if (divisor instanceof Fixnum)
return MOD(((Fixnum)divisor).value);
@@ -749,7 +749,7 @@
}
@Override
- public LispObject MOD(int divisor) throws ConditionThrowable
+ public LispObject MOD(int divisor)
{
final int r;
try
@@ -803,7 +803,7 @@
}
@Override
- public LispObject ash(LispObject obj) throws ConditionThrowable
+ public LispObject ash(LispObject obj)
{
if (obj instanceof Fixnum)
return ash(((Fixnum)obj).value);
@@ -829,13 +829,13 @@
}
@Override
- public LispObject LOGAND(int n) throws ConditionThrowable
+ public LispObject LOGAND(int n)
{
return Fixnum.getInstance(value & n);
}
@Override
- public LispObject LOGAND(LispObject obj) throws ConditionThrowable
+ public LispObject LOGAND(LispObject obj)
{
if (obj instanceof Fixnum)
return Fixnum.getInstance(value & ((Fixnum)obj).value);
@@ -857,13 +857,13 @@
}
@Override
- public LispObject LOGIOR(int n) throws ConditionThrowable
+ public LispObject LOGIOR(int n)
{
return Fixnum.getInstance(value | n);
}
@Override
- public LispObject LOGIOR(LispObject obj) throws ConditionThrowable
+ public LispObject LOGIOR(LispObject obj)
{
if (obj instanceof Fixnum)
return Fixnum.getInstance(value | ((Fixnum)obj).value);
@@ -877,13 +877,13 @@
}
@Override
- public LispObject LOGXOR(int n) throws ConditionThrowable
+ public LispObject LOGXOR(int n)
{
return Fixnum.getInstance(value ^ n);
}
@Override
- public LispObject LOGXOR(LispObject obj) throws ConditionThrowable
+ public LispObject LOGXOR(LispObject obj)
{
if (obj instanceof Fixnum)
return Fixnum.getInstance(value ^ ((Fixnum)obj).value);
@@ -908,7 +908,7 @@
/** Computes fixnum^bignum, returning a fixnum or a bignum.
*/
- public LispObject pow(LispObject obj) throws ConditionThrowable
+ public LispObject pow(LispObject obj)
{
BigInteger y = Bignum.getValue(obj);
@@ -949,7 +949,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
int base = Fixnum.getValue(Symbol.PRINT_BASE.symbolValue(thread));
Modified: trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
"&key traps")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length % 2 != 0)
error(new ProgramError("Odd number of keyword arguments."));
@@ -78,7 +78,7 @@
new Primitive("get-floating-point-modes", PACKAGE_EXT, true, "")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
LispObject traps = NIL;
if (TRAP_UNDERFLOW)
@@ -104,7 +104,7 @@
// See also: http://paste.lisp.org/display/10847
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat) {
int bits =
@@ -149,7 +149,7 @@
new Primitive("%float-bits", PACKAGE_SYS, true, "integer")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat) {
int bits = Float.floatToIntBits(((SingleFloat)arg).value);
@@ -170,7 +170,7 @@
new Primitive("rational", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat)
return ((SingleFloat)arg).rational();
@@ -188,7 +188,7 @@
new Primitive("float-radix", "float")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat || arg instanceof DoubleFloat)
return Fixnum.TWO;
@@ -205,7 +205,7 @@
new Primitive("float-digits", "float")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat)
return FIXNUM_24;
@@ -221,7 +221,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof SingleFloat) {
float f = ((SingleFloat)first).value;
@@ -242,7 +242,7 @@
new Primitive("coerce-to-single-float", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return SingleFloat.coerceToFloat(arg);
}
@@ -253,7 +253,7 @@
new Primitive("coerce-to-double-float", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return DoubleFloat.coerceToFloat(arg);
}
@@ -265,7 +265,7 @@
new Primitive("float", "number &optional prototype")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat || arg instanceof DoubleFloat)
return arg;
@@ -273,7 +273,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (second instanceof SingleFloat)
return SingleFloat.coerceToFloat(first);
@@ -288,7 +288,7 @@
private static final Primitive FLOATP = new Primitive("floatp", "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat)
return T;
@@ -303,7 +303,7 @@
new Primitive("single-float-bits", PACKAGE_SYS, true, "float")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat) {
SingleFloat f = (SingleFloat) arg;
@@ -318,7 +318,7 @@
new Primitive("double-float-high-bits", PACKAGE_SYS, true, "float")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof DoubleFloat) {
DoubleFloat f = (DoubleFloat) arg;
@@ -333,7 +333,7 @@
new Primitive("double-float-low-bits", PACKAGE_SYS, true, "float")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof DoubleFloat) {
DoubleFloat f = (DoubleFloat) arg;
@@ -349,7 +349,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof Fixnum) {
int bits = ((Fixnum)arg).value;
@@ -369,7 +369,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof Fixnum) {
long bits = (long) ((Fixnum)arg).value;
@@ -389,7 +389,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof SingleFloat)
return Float.isInfinite(((SingleFloat)arg).value) ? T : NIL;
@@ -405,7 +405,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof SingleFloat)
return Float.isNaN(((SingleFloat)arg).value) ? T : NIL;
@@ -420,7 +420,7 @@
new Primitive("float-string", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final String s1;
if (arg instanceof SingleFloat)
Modified: trunk/abcl/src/org/armedbear/lisp/FloatingPointInexact.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FloatingPointInexact.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FloatingPointInexact.java Fri Nov 6 15:07:54 2009
@@ -35,7 +35,7 @@
public final class FloatingPointInexact extends ArithmeticError
{
- public FloatingPointInexact(LispObject initArgs) throws ConditionThrowable
+ public FloatingPointInexact(LispObject initArgs)
{
super(StandardClass.FLOATING_POINT_INEXACT);
initialize(initArgs);
@@ -54,7 +54,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.FLOATING_POINT_INEXACT)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/FloatingPointInvalidOperation.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FloatingPointInvalidOperation.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FloatingPointInvalidOperation.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class FloatingPointInvalidOperation extends ArithmeticError
{
public FloatingPointInvalidOperation(LispObject initArgs)
- throws ConditionThrowable
+
{
super(StandardClass.FLOATING_POINT_INVALID_OPERATION);
initialize(initArgs);
@@ -55,7 +55,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.FLOATING_POINT_INVALID_OPERATION)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/FloatingPointOverflow.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FloatingPointOverflow.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FloatingPointOverflow.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class FloatingPointOverflow extends ArithmeticError
{
public FloatingPointOverflow(LispObject initArgs)
- throws ConditionThrowable
+
{
super(StandardClass.FLOATING_POINT_OVERFLOW);
initialize(initArgs);
@@ -55,7 +55,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.FLOATING_POINT_OVERFLOW)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/FloatingPointUnderflow.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FloatingPointUnderflow.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/FloatingPointUnderflow.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class FloatingPointUnderflow extends ArithmeticError
{
public FloatingPointUnderflow(LispObject initArgs)
- throws ConditionThrowable
+
{
super(StandardClass.FLOATING_POINT_UNDERFLOW);
initialize(initArgs);
@@ -55,7 +55,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.FLOATING_POINT_UNDERFLOW)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/ForwardReferencedClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ForwardReferencedClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ForwardReferencedClass.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.FORWARD_REFERENCED_CLASS)
return T;
@@ -63,7 +63,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
StringBuffer sb =
new StringBuffer(Symbol.FORWARD_REFERENCED_CLASS.writeToString());
@@ -80,7 +80,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof Symbol) {
Symbol name = (Symbol) arg;
Modified: trunk/abcl/src/org/armedbear/lisp/Function.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Function.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Function.java Fri Nov 6 15:07:54 2009
@@ -150,7 +150,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.FUNCTION)
return T;
@@ -177,27 +177,27 @@
propertyList = obj;
}
- public final void setClassBytes(byte[] bytes) throws ConditionThrowable
+ public final void setClassBytes(byte[] bytes)
{
propertyList = putf(propertyList, Symbol.CLASS_BYTES,
new JavaObject(bytes));
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -205,7 +205,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -213,7 +213,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -222,7 +222,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -231,7 +231,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -241,7 +241,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -251,19 +251,19 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
LispObject name = getLambdaName();
if (name != null && name != NIL) {
@@ -302,7 +302,7 @@
}
// Used by the JVM compiler.
- public final void argCountError() throws ConditionThrowable
+ public final void argCountError()
{
error(new WrongNumberOfArgumentsException(this));
}
Modified: trunk/abcl/src/org/armedbear/lisp/GenericFunction.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/GenericFunction.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/GenericFunction.java Fri Nov 6 15:07:54 2009
@@ -41,7 +41,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.GENERIC_FUNCTION)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/Go.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Go.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Go.java Fri Nov 6 15:07:54 2009
@@ -55,7 +55,7 @@
}
@Override
- public LispObject getCondition() throws ConditionThrowable
+ public LispObject getCondition()
{
try {
StringBuffer sb = new StringBuffer("No tag named ");
Modified: trunk/abcl/src/org/armedbear/lisp/HashTable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/HashTable.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/HashTable.java Fri Nov 6 15:07:54 2009
@@ -112,7 +112,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.HASH_TABLE)
return T;
@@ -122,7 +122,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (this == obj)
return true;
@@ -149,7 +149,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject parts = NIL;
for (int i = 0; i < buckets.length; i++)
@@ -174,7 +174,7 @@
// gethash key hash-table &optional default => value, present-p
public synchronized LispObject gethash(LispObject key)
- throws ConditionThrowable
+
{
LispObject value = get(key);
final LispObject presentp;
@@ -188,7 +188,7 @@
// gethash key hash-table &optional default => value, present-p
public synchronized LispObject gethash(LispObject key,
LispObject defaultValue)
- throws ConditionThrowable
+
{
LispObject value = get(key);
final LispObject presentp;
@@ -203,14 +203,14 @@
}
public synchronized LispObject gethash1(LispObject key)
- throws ConditionThrowable
+
{
final LispObject value = get(key);
return value != null ? value : NIL;
}
public synchronized LispObject puthash(LispObject key, LispObject newValue)
- throws ConditionThrowable
+
{
put(key, newValue);
return newValue;
@@ -218,14 +218,14 @@
// remhash key hash-table => generalized-boolean
public synchronized LispObject remhash(LispObject key)
- throws ConditionThrowable
+
{
// A value in a Lisp hash table can never be null, so...
return remove(key) != null ? T : NIL;
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (Symbol.PRINT_READABLY.symbolValue(LispThread.currentThread()) != NIL)
{
@@ -250,9 +250,9 @@
public abstract LispObject get(LispObject key);
public abstract void put(LispObject key, LispObject value)
- throws ConditionThrowable;
+ ;
- public abstract LispObject remove(LispObject key) throws ConditionThrowable;
+ public abstract LispObject remove(LispObject key);
protected abstract void rehash();
@@ -272,7 +272,7 @@
return list;
}
- public LispObject MAPHASH(LispObject function) throws ConditionThrowable
+ public LispObject MAPHASH(LispObject function)
{
for (int i = buckets.length; i-- > 0;)
{
Modified: trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.java Fri Nov 6 15:07:54 2009
@@ -51,7 +51,7 @@
@Override
public LispObject execute(LispObject test, LispObject size,
LispObject rehashSize, LispObject rehashThreshold)
- throws ConditionThrowable
+
{
final int n = Fixnum.getValue(size);
if (test == FUNCTION_EQL || test == NIL)
@@ -73,7 +73,7 @@
{
@Override
public LispObject execute(LispObject key, LispObject ht)
- throws ConditionThrowable
+
{
return checkHashTable(ht).gethash(key);
}
@@ -81,7 +81,7 @@
@Override
public LispObject execute(LispObject key, LispObject ht,
LispObject defaultValue)
- throws ConditionThrowable
+
{
return checkHashTable(ht).gethash(key, defaultValue);
}
@@ -93,7 +93,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final HashTable ht = checkHashTable(second);
synchronized (ht)
@@ -112,14 +112,14 @@
@Override
public LispObject execute(LispObject key, LispObject ht,
LispObject value)
- throws ConditionThrowable
+
{
return checkHashTable(ht).puthash(key, value);
}
@Override
public LispObject execute(LispObject key, LispObject ht,
LispObject ignored, LispObject value)
- throws ConditionThrowable
+
{
return checkHashTable(ht).puthash(key, value);
}
@@ -131,7 +131,7 @@
{
@Override
public LispObject execute(LispObject key, LispObject ht)
- throws ConditionThrowable
+
{
return checkHashTable(ht).remhash(key);
}
@@ -142,7 +142,7 @@
new Primitive(Symbol.CLRHASH, "hash-table")
{
@Override
- public LispObject execute(LispObject ht) throws ConditionThrowable
+ public LispObject execute(LispObject ht)
{
checkHashTable(ht).clear();
return ht;
@@ -154,7 +154,7 @@
new Primitive(Symbol.HASH_TABLE_COUNT, "hash-table")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(checkHashTable(arg).getCount());
}
@@ -165,7 +165,7 @@
new Primitive(Symbol.SXHASH, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(arg.sxhash());
}
@@ -177,7 +177,7 @@
new Primitive("psxhash", PACKAGE_SYS, true, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(arg.psxhash());
}
@@ -188,7 +188,7 @@
new Primitive(Symbol.HASH_TABLE_P,"object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof HashTable ? T : NIL;
}
@@ -199,7 +199,7 @@
new Primitive("hash-table-entries", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkHashTable(arg).ENTRIES();
}
@@ -210,7 +210,7 @@
new Primitive(Symbol.HASH_TABLE_TEST, "hash-table")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkHashTable(arg).getTest();
}
@@ -221,7 +221,7 @@
new Primitive(Symbol.HASH_TABLE_SIZE, "hash-table")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(checkHashTable(arg).getSize());
}
@@ -232,7 +232,7 @@
new Primitive(Symbol.HASH_TABLE_REHASH_SIZE, "hash-table")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkHashTable(arg).getRehashSize();
}
@@ -243,7 +243,7 @@
new Primitive(Symbol.HASH_TABLE_REHASH_THRESHOLD, "hash-table")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkHashTable(arg).getRehashThreshold();
}
@@ -255,13 +255,13 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return checkHashTable(second).MAPHASH(first);
}
};
-protected static HashTable checkHashTable(LispObject ht) throws ConditionThrowable {
+protected static HashTable checkHashTable(LispObject ht) {
if (ht instanceof HashTable) return (HashTable)ht;
type_error(ht, Symbol.HASH_TABLE);
return null;
Modified: trunk/abcl/src/org/armedbear/lisp/IllegalMonitorState.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/IllegalMonitorState.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/IllegalMonitorState.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class IllegalMonitorState extends ProgramError
{
public IllegalMonitorState()
- throws ConditionThrowable
+
{
// This is really just an ordinary PROGRAM-ERROR, broken out into its
// own Java class as a convenience for the implementation.
Modified: trunk/abcl/src/org/armedbear/lisp/Interpreter.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Interpreter.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Interpreter.java Fri Nov 6 15:07:54 2009
@@ -151,7 +151,7 @@
}
// Interface.
- public LispObject eval(String s) throws ConditionThrowable
+ public LispObject eval(String s)
{
return eval(new StringInputStream(s).read(true, NIL, false,
LispThread.currentThread()));
@@ -234,7 +234,7 @@
// Check for --noinit; verify that arguments are supplied for --load and
// --eval options.
private static void preprocessCommandLineArguments(String[] args)
- throws ConditionThrowable
+
{
if (args != null) {
for (int i = 0; i < args.length; ++i) {
@@ -267,7 +267,7 @@
// Do the --load and --eval actions.
private static void postprocessCommandLineArguments(String[] args)
- throws ConditionThrowable
+
{
if (args != null) {
for (int i = 0; i < args.length; ++i) {
@@ -475,7 +475,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable, UnhandledCondition
+ throws UnhandledCondition
{
final Condition condition = (Condition) first;
if (interpreter == null) {
@@ -528,11 +528,10 @@
*
* @param s A string with a valid Common Lisp expression
* @return The result of the evaluation
- * @throws org.armedbear.lisp.ConditionThrowable
* @exception UnhandledCondition in case the an error occurs which
* should be passed to the Lisp debugger
*/
- public static LispObject evaluate(String s) throws ConditionThrowable
+ public static LispObject evaluate(String s)
{
if (!initialized)
initializeJLisp();
Modified: trunk/abcl/src/org/armedbear/lisp/JHandler.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/JHandler.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/JHandler.java Fri Nov 6 15:07:54 2009
@@ -97,7 +97,7 @@
new Primitive("%jregister-handler", PACKAGE_JAVA)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 5)
return error(new WrongNumberOfArgumentsException(this));
Modified: trunk/abcl/src/org/armedbear/lisp/JProxy.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/JProxy.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/JProxy.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
"interface &rest method-names-and-defs")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
int length = args.length;
if (length < 3 || length % 2 != 1)
@@ -202,7 +202,7 @@
new Primitive("%jmake-invocation-handler", PACKAGE_JAVA, false,
"function") {
- public LispObject execute(LispObject[] args) throws ConditionThrowable {
+ public LispObject execute(LispObject[] args) {
int length = args.length;
if (length != 1) {
return error(new WrongNumberOfArgumentsException(this));
@@ -218,7 +218,7 @@
new Primitive("%jmake-proxy", PACKAGE_JAVA, false,
"interface invocation-handler") {
- public LispObject execute(final LispObject[] args) throws ConditionThrowable {
+ public LispObject execute(final LispObject[] args) {
int length = args.length;
if (length != 3) {
return error(new WrongNumberOfArgumentsException(this));
Modified: trunk/abcl/src/org/armedbear/lisp/Java.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Java.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Java.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
private static final LispClass java_exception = LispClass.findClass(Symbol.JAVA_EXCEPTION);
- private static boolean isJavaException(LispClass lc) throws ConditionThrowable
+ private static boolean isJavaException(LispClass lc)
{
return lc.subclassp(java_exception);
}
@@ -65,7 +65,7 @@
{
@Override
public LispObject execute(LispObject className, LispObject symbol)
- throws ConditionThrowable
+
{
// FIXME Verify that CONDITION-SYMBOL is a symbol that names a condition.
// FIXME Signal a continuable error if the exception is already registered.
@@ -85,14 +85,14 @@
{
@Override
public LispObject execute(LispObject className)
- throws ConditionThrowable
+
{
// FIXME Verify that EXCEPTION-NAME designates a subclass of Throwable.
return registeredExceptions.remove(classForName(className.getStringValue())) == null ? NIL : T;
}
};
- private static Symbol getCondition(Class cl) throws ConditionThrowable
+ private static Symbol getCondition(Class cl)
{
Class o = classForName("java.lang.Object");
for (Class c = cl ; c != o ; c = c.getSuperclass()) {
@@ -110,7 +110,7 @@
"Returns a reference to the Java class designated by NAME-OR-CLASS-REF.")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return JavaObject.getInstance(javaClass(arg));
}
@@ -146,7 +146,7 @@
//
private static final LispObject jfield(Primitive fun, LispObject[] args, boolean translate)
- throws ConditionThrowable
+
{
if (args.length < 2 || args.length > 4)
error(new WrongNumberOfArgumentsException(fun));
@@ -225,7 +225,7 @@
"class-ref-or-field field-or-instance &optional instance value")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jfield(this, args, true);
}
@@ -237,7 +237,7 @@
"class-ref-or-field field-or-instance &optional instance value")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jfield(this, args, false);
}
@@ -249,7 +249,7 @@
"class-ref &rest parameter-class-refs")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1)
error(new WrongNumberOfArgumentsException(this));
@@ -294,7 +294,7 @@
"class-ref name &rest parameter-class-refs")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 2)
error(new WrongNumberOfArgumentsException(this));
@@ -347,7 +347,7 @@
};
private static final LispObject jstatic(Primitive fun, LispObject[] args, boolean translate)
- throws ConditionThrowable
+
{
if (args.length < 2)
error(new WrongNumberOfArgumentsException(fun));
@@ -414,7 +414,7 @@
new Primitive("jstatic", PACKAGE_JAVA, true, "method class &rest args")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jstatic(this, args, true);
}
@@ -426,7 +426,7 @@
"method class &rest args")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jstatic(this, args, false);
}
@@ -437,7 +437,7 @@
new Primitive("jnew", PACKAGE_JAVA, true, "constructor &rest args")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1)
error(new WrongNumberOfArgumentsException(this));
@@ -481,7 +481,7 @@
"element-type &rest dimensions")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 2)
error(new WrongNumberOfArgumentsException(this));
@@ -501,7 +501,7 @@
};
private static final LispObject jarray_ref(Primitive fun, LispObject[] args, boolean translate)
- throws ConditionThrowable
+
{
if (args.length < 2)
error(new WrongNumberOfArgumentsException(fun));
@@ -534,7 +534,7 @@
"java-array &rest indices")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jarray_ref(this, args, true);
}
@@ -546,7 +546,7 @@
"java-array &rest indices")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jarray_ref(this, args, false);
}
@@ -558,7 +558,7 @@
"java-array new-value &rest indices")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 3)
error(new WrongNumberOfArgumentsException(this));
@@ -593,7 +593,7 @@
new Primitive(Symbol.JCALL, "method-ref instance &rest args")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jcall(this, args, true);
}
@@ -606,14 +606,14 @@
new Primitive(Symbol.JCALL_RAW, "method-ref instance &rest args")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return jcall(this, args, false);
}
};
private static LispObject jcall(Primitive fun, LispObject[] args, boolean translate)
- throws ConditionThrowable
+
{
if (args.length < 2)
error(new WrongNumberOfArgumentsException(fun));
@@ -689,7 +689,7 @@
"object &optional type")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1)
error(new WrongNumberOfArgumentsException(this));
@@ -726,7 +726,7 @@
new Primitive("java-object-p", PACKAGE_JAVA, true, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return (arg instanceof JavaObject) ? T : NIL;
}
@@ -737,7 +737,7 @@
new Primitive("jobject-lisp-value", PACKAGE_JAVA, true, "java-object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return JavaObject.getInstance(arg.javaInstance(), true);
}
@@ -748,7 +748,7 @@
"java-object property-name") {
@Override
- public LispObject execute(LispObject javaObject, LispObject propertyName) throws ConditionThrowable {
+ public LispObject execute(LispObject javaObject, LispObject propertyName) {
try {
Object obj = javaObject.javaInstance();
PropertyDescriptor pd = getPropertyDescriptor(obj, propertyName);
@@ -771,7 +771,7 @@
"java-object property-name value") {
@Override
- public LispObject execute(LispObject javaObject, LispObject propertyName, LispObject value) throws ConditionThrowable {
+ public LispObject execute(LispObject javaObject, LispObject propertyName, LispObject value) {
Object obj = null;
try {
obj = javaObject.javaInstance();
@@ -796,7 +796,7 @@
}
};
- private static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws ConditionThrowable, IntrospectionException {
+ private static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws IntrospectionException {
String prop = ((AbstractString) propertyName).getStringValue();
BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
for(PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {
@@ -809,7 +809,7 @@
return null; // not reached
}
- private static Class classForName(String className) throws ConditionThrowable
+ private static Class classForName(String className)
{
try {
return Class.forName(className);
@@ -827,7 +827,7 @@
}
// Supports Java primitive types too.
- private static Class javaClass(LispObject obj) throws ConditionThrowable
+ private static Class javaClass(LispObject obj)
{
if (obj instanceof AbstractString || obj instanceof Symbol) {
String s = javaString(obj);
Modified: trunk/abcl/src/org/armedbear/lisp/JavaClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/JavaClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/JavaClass.java Fri Nov 6 15:07:54 2009
@@ -84,7 +84,7 @@
return StandardClass.JAVA_CLASS;
}
- public LispObject typep(LispObject type) throws ConditionThrowable {
+ public LispObject typep(LispObject type) {
if (type == Symbol.JAVA_CLASS)
return T;
if (type == StandardClass.JAVA_CLASS)
@@ -92,11 +92,11 @@
return super.typep(type);
}
- public LispObject getDescription() throws ConditionThrowable {
+ public LispObject getDescription() {
return new SimpleString(writeToString());
}
- public String writeToString() throws ConditionThrowable {
+ public String writeToString() {
FastStringBuffer sb = new FastStringBuffer("#<JAVA-CLASS ");
sb.append(javaClass.getCanonicalName());
sb.append('>');
@@ -119,7 +119,7 @@
return javaClass;
}
- public boolean subclassp(LispObject obj) throws ConditionThrowable {
+ public boolean subclassp(LispObject obj) {
if(obj == BuiltInClass.CLASS_T) {
return true;
}
@@ -134,7 +134,7 @@
private static final Primitive _FIND_JAVA_CLASS = new Primitive(
"%find-java-class", PACKAGE_JAVA, false, "string") {
- public LispObject execute(LispObject arg) throws ConditionThrowable {
+ public LispObject execute(LispObject arg) {
try {
return findJavaClass(Class.forName((String) arg.getStringValue()));
} catch (ClassNotFoundException e) {
Modified: trunk/abcl/src/org/armedbear/lisp/JavaException.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/JavaException.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/JavaException.java Fri Nov 6 15:07:54 2009
@@ -40,7 +40,7 @@
{
private final Throwable throwable;
- public JavaException(Throwable throwable) throws ConditionThrowable
+ public JavaException(Throwable throwable)
{
super(StandardClass.JAVA_EXCEPTION);
Debug.assertTrue(slots.length == 3);
@@ -62,7 +62,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.JAVA_EXCEPTION)
return T;
@@ -91,7 +91,7 @@
" object that caused JAVA-EXCEPTION to be signalled.)")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Symbol.STD_SLOT_VALUE.execute(arg, Symbol.CAUSE);
}
Modified: trunk/abcl/src/org/armedbear/lisp/JavaObject.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/JavaObject.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/JavaObject.java Fri Nov 6 15:07:54 2009
@@ -65,7 +65,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.JAVA_OBJECT)
return T;
@@ -108,7 +108,7 @@
* @return a LispObject representing or encapsulating obj
*/
public final static LispObject getInstance(Object obj, boolean translated)
- throws ConditionThrowable
+
{
if (! translated)
return getInstance(obj);
@@ -175,7 +175,7 @@
}
@Override
- public Object javaInstance(Class c) throws ConditionThrowable {
+ public Object javaInstance(Class c) {
return javaInstance();
}
@@ -190,7 +190,7 @@
}
public static final Object getObject(LispObject o)
- throws ConditionThrowable
+
{
if (o instanceof JavaObject)
return ((JavaObject)o).obj;
@@ -221,7 +221,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (obj instanceof ConditionThrowable)
return obj.toString();
@@ -245,12 +245,12 @@
}
@Override
- public LispObject getDescription() throws ConditionThrowable {
+ public LispObject getDescription() {
return new SimpleString(describeJavaObject(this));
}
@Override
- public LispObject getParts() throws ConditionThrowable {
+ public LispObject getParts() {
if(obj != null) {
LispObject parts = NIL;
if(obj.getClass().isArray()) {
@@ -273,12 +273,12 @@
}
private LispObject getInspectedFields()
- throws ConditionThrowable {
+ {
final LispObject[] acc = new LispObject[] { NIL };
doClassHierarchy(obj.getClass(), new Function() {
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable {
+ {
//No possibility of type error - we're mapping this function
//over a list of classes
Class<?> c = (Class) arg.javaInstance();
@@ -305,7 +305,7 @@
private static void doClassHierarchy(Collection<Class<?>> classes,
LispObject callback,
Set<Class<?>> visited)
- throws ConditionThrowable {
+ {
Collection<Class<?>> newClasses = new LinkedList<Class<?>>();
for(Class<?> clss : classes) {
if(clss == null) {
@@ -334,7 +334,7 @@
* interfaces.
*/
public static void doClassHierarchy(Class<?> clss, LispObject callback)
- throws ConditionThrowable {
+ {
if (clss != null) {
Set<Class<?>> visited = new HashSet<Class<?>>();
Collection<Class<?>> classes = new ArrayList<Class<?>>(1);
@@ -345,12 +345,12 @@
public static LispObject mapcarClassHierarchy(Class<?> clss,
final LispObject fn)
- throws ConditionThrowable {
+ {
final LispObject[] acc = new LispObject[] { NIL };
doClassHierarchy(clss, new Function() {
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable {
+ {
acc[0] = acc[0].push(fn.execute(arg));
return acc[0];
}
@@ -359,7 +359,7 @@
}
public static String describeJavaObject(final JavaObject javaObject)
- throws ConditionThrowable {
+ {
final Object obj = javaObject.getObject();
final FastStringBuffer sb =
new FastStringBuffer(javaObject.writeToString());
@@ -423,7 +423,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (!(first instanceof JavaObject))
return type_error(first, Symbol.JAVA_OBJECT);
Modified: trunk/abcl/src/org/armedbear/lisp/JavaStackFrame.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/JavaStackFrame.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/JavaStackFrame.java Fri Nov 6 15:07:54 2009
@@ -69,7 +69,7 @@
@Override
public LispObject typep(LispObject typeSpecifier)
- throws ConditionThrowable
+
{
if (typeSpecifier == Symbol.JAVA_STACK_FRAME)
return T;
@@ -84,7 +84,7 @@
static final Symbol LINE = Packages.internKeyword("LINE");
static final Symbol NATIVE_METHOD = Packages.internKeyword("NATIVE-METHOD");
- public LispObject toLispList() throws ConditionThrowable
+ public LispObject toLispList()
{
LispObject result = Lisp.NIL;
@@ -109,14 +109,14 @@
@Override
public SimpleString toLispString()
- throws ConditionThrowable
+
{
return new SimpleString(javaFrame.toString());
}
@Override
public LispObject getParts()
- throws ConditionThrowable
+
{
LispObject result = NIL;
result = result.push(new Cons("CLASS",
Modified: trunk/abcl/src/org/armedbear/lisp/Layout.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Layout.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Layout.java Fri Nov 6 15:07:54 2009
@@ -104,7 +104,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject result = NIL;
result = result.push(new Cons("class", lispClass));
@@ -142,7 +142,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return unreadableString(Symbol.LAYOUT);
}
@@ -172,7 +172,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return new Layout(checkClass(first), checkList(second),
checkList(third));
@@ -185,7 +185,7 @@
new Primitive("layout-class", PACKAGE_SYS, true, "layout")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkLayout(arg).lispClass;
}
@@ -196,7 +196,7 @@
new Primitive("layout-length", PACKAGE_SYS, true, "layout")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(checkLayout(arg).slotNames.length);
}
@@ -211,7 +211,7 @@
}
public LispObject getSharedSlotLocation(LispObject slotName)
- throws ConditionThrowable
+
{
LispObject rest = sharedSlots;
while (rest != NIL)
@@ -230,7 +230,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final LispObject slotNames[] = checkLayout(first).slotNames;
for (int i = slotNames.length; i-- > 0;)
@@ -248,7 +248,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final Layout layOutFirst = checkLayout(first);
final LispObject slotNames[] = layOutFirst.slotNames;
@@ -276,7 +276,7 @@
new Primitive("%make-instances-obsolete", PACKAGE_SYS, true, "class")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispClass lispClass = checkClass(arg);
Layout oldLayout = lispClass.getClassLayout();
Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java Fri Nov 6 15:07:54 2009
@@ -155,7 +155,7 @@
// args must not be null!
public static final LispObject funcall(LispObject fun, LispObject[] args,
LispThread thread)
- throws ConditionThrowable
+
{
thread._values = null;
@@ -194,7 +194,7 @@
public static final LispObject macroexpand(LispObject form,
final Environment env,
final LispThread thread)
- throws ConditionThrowable
+
{
LispObject expanded = NIL;
while (true)
@@ -213,7 +213,7 @@
public static final LispObject macroexpand_1(final LispObject form,
final Environment env,
final LispThread thread)
- throws ConditionThrowable
+
{
if (form instanceof Cons)
{
@@ -272,7 +272,7 @@
new Primitive("interactive-eval", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject object) throws ConditionThrowable
+ public LispObject execute(LispObject object)
{
final LispThread thread = LispThread.currentThread();
thread.setSpecialVariable(Symbol.MINUS, object);
@@ -337,7 +337,7 @@
}
};
- private static final void pushJavaStackFrames() throws ConditionThrowable
+ private static final void pushJavaStackFrames()
{
final LispThread thread = LispThread.currentThread();
final StackTraceElement[] frames = thread.getJavaStackTrace();
@@ -360,14 +360,14 @@
public static final LispObject error(LispObject condition)
- throws ConditionThrowable
+
{
pushJavaStackFrames();
return Symbol.ERROR.execute(condition);
}
public static final LispObject error(LispObject condition, LispObject message)
- throws ConditionThrowable
+
{
pushJavaStackFrames();
return Symbol.ERROR.execute(condition, Keyword.FORMAT_CONTROL, message);
@@ -375,7 +375,7 @@
public static final LispObject type_error(LispObject datum,
LispObject expectedType)
- throws ConditionThrowable
+
{
return error(new TypeError(datum, expectedType));
}
@@ -387,7 +387,7 @@
interrupted = b;
}
- public static final void handleInterrupt() throws ConditionThrowable
+ public static final void handleInterrupt()
{
setInterrupted(false);
Symbol.BREAK.getSymbolFunction().execute();
@@ -396,7 +396,7 @@
// Used by the compiler.
public static final LispObject loadTimeValue(LispObject obj)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (Symbol.LOAD_TRUENAME.symbolValue(thread) != NIL)
@@ -406,7 +406,7 @@
}
public static final LispObject eval(LispObject obj)
- throws ConditionThrowable
+
{
return eval(obj, new Environment(), LispThread.currentThread());
}
@@ -414,7 +414,7 @@
public static final LispObject eval(final LispObject obj,
final Environment env,
final LispThread thread)
- throws ConditionThrowable
+
{
thread._values = null;
if (interrupted)
@@ -493,7 +493,7 @@
LispObject args,
Environment env,
LispThread thread)
- throws ConditionThrowable
+
{
if (args == NIL)
return thread.execute(function);
@@ -578,7 +578,7 @@
public static final LispObject parseBody(LispObject body,
boolean documentationAllowed)
- throws ConditionThrowable
+
{
LispObject decls = NIL;
LispObject doc = NIL;
@@ -600,7 +600,7 @@
}
public static final LispObject parseSpecials(LispObject forms)
- throws ConditionThrowable
+
{
LispObject specials = NIL;
while (forms != NIL) {
@@ -631,7 +631,7 @@
public static final LispObject progn(LispObject body, Environment env,
LispThread thread)
- throws ConditionThrowable
+
{
LispObject result = NIL;
while (body != NIL)
@@ -644,7 +644,7 @@
public static final LispObject preprocessTagBody(LispObject body,
Environment env)
- throws ConditionThrowable
+
{
LispObject localTags = NIL; // Tags that are local to this TAGBODY.
while (body != NIL)
@@ -668,7 +668,7 @@
*/
public static final LispObject nonLocalGo(LispObject tagbody,
LispObject tag)
- throws ConditionThrowable
+
{
if (tagbody == null)
return error(new ControlError("Unmatched tag "
@@ -686,7 +686,7 @@
*/
public static final LispObject nonLocalGo(Binding binding,
LispObject tag)
- throws ConditionThrowable
+
{
if (binding.env.inactive)
return error(new ControlError("Unmatched tag "
@@ -705,7 +705,7 @@
public static final LispObject nonLocalReturn(LispObject blockId,
LispObject blockName,
LispObject result)
- throws ConditionThrowable
+
{
if (blockId == null)
return error(new ControlError("Unmatched block "
@@ -724,7 +724,7 @@
public static final LispObject nonLocalReturn(Binding binding,
Symbol block,
LispObject result)
- throws ConditionThrowable
+
{
if (binding == null)
{
@@ -744,7 +744,7 @@
public static final LispObject processTagBody(LispObject body,
LispObject localTags,
Environment env)
- throws ConditionThrowable
+
{
LispObject remaining = body;
LispThread thread = LispThread.currentThread();
@@ -802,7 +802,7 @@
// Environment wrappers.
private static final boolean isSpecial(Symbol sym, LispObject ownSpecials,
Environment env)
- throws ConditionThrowable
+
{
if (ownSpecials != null)
{
@@ -820,7 +820,7 @@
protected static final void bindArg(LispObject ownSpecials,
Symbol sym, LispObject value,
Environment env, LispThread thread)
- throws ConditionThrowable
+
{
if (isSpecial(sym, ownSpecials, env)) {
env.declareSpecial(sym);
@@ -947,7 +947,7 @@
// Used by the compiler.
public static final LispObject multipleValueList(LispObject result)
- throws ConditionThrowable
+
{
LispThread thread = LispThread.currentThread();
LispObject[] values = thread._values;
@@ -964,7 +964,7 @@
public static final LispObject multipleValueCall1(LispObject result,
LispObject function,
LispThread thread)
- throws ConditionThrowable
+
{
LispObject[] values = thread._values;
thread._values = null;
@@ -977,7 +977,7 @@
public static final void progvBindVars(LispObject symbols,
LispObject values,
LispThread thread)
- throws ConditionThrowable
+
{
for (LispObject list = symbols; list != NIL; list = list.cdr())
{
@@ -998,7 +998,7 @@
}
}
- public static Symbol checkSymbol(LispObject obj) throws ConditionThrowable
+ public static Symbol checkSymbol(LispObject obj)
{
if (obj instanceof Symbol)
return (Symbol) obj;
@@ -1007,7 +1007,7 @@
}
public static final LispObject checkList(LispObject obj)
- throws ConditionThrowable
+
{
if (obj.listp())
return obj;
@@ -1015,7 +1015,7 @@
}
public static final AbstractArray checkArray(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof AbstractArray)
return (AbstractArray) obj;
@@ -1024,7 +1024,7 @@
}
public static final AbstractVector checkVector(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof AbstractVector)
return (AbstractVector) obj;
@@ -1033,7 +1033,7 @@
}
public static final DoubleFloat checkDoubleFloat(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof DoubleFloat)
return (DoubleFloat) obj;
@@ -1042,7 +1042,7 @@
}
public static final SingleFloat checkSingleFloat(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof SingleFloat)
return (SingleFloat) obj;
@@ -1051,7 +1051,7 @@
}
public static final StackFrame checkStackFrame(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof StackFrame)
return (StackFrame) obj;
@@ -1066,13 +1066,13 @@
}
public static final Symbol gensym(LispThread thread)
- throws ConditionThrowable
+
{
return gensym("G", thread);
}
public static final Symbol gensym(String prefix, LispThread thread)
- throws ConditionThrowable
+
{
FastStringBuffer sb = new FastStringBuffer(prefix);
SpecialBinding binding = thread.getSpecialBinding(Symbol.GENSYM_COUNTER);
@@ -1113,7 +1113,7 @@
}
public static final String javaString(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof AbstractString)
return arg.getStringValue();
@@ -1140,7 +1140,7 @@
public static final LispObject number(BigInteger numerator,
BigInteger denominator)
- throws ConditionThrowable
+
{
if (denominator.signum() == 0)
error(new DivisionByZero());
@@ -1170,7 +1170,7 @@
}
public static final int mod(int number, int divisor)
- throws ConditionThrowable
+
{
final int r;
try
@@ -1221,7 +1221,7 @@
}
public static final LispObject loadCompiledFunction(final String namestring)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final boolean absolute = Utilities.isFilenameAbsolute(namestring);
@@ -1446,7 +1446,7 @@
public static final LispObject makeCompiledClosure(LispObject template,
ClosureBinding[] context)
- throws ConditionThrowable
+
{
return ((CompiledClosure)template).dup().setContext(context);
}
@@ -1502,7 +1502,7 @@
Bignum.getInstance(4294967296L);
public static final LispObject getUpgradedArrayElementType(LispObject type)
- throws ConditionThrowable
+
{
if (type instanceof Symbol)
{
@@ -1605,7 +1605,7 @@
}
public static final byte coerceLispObjectToJavaByte(LispObject obj)
- throws ConditionThrowable
+
{
return (byte)Fixnum.getValue(obj);
}
@@ -1616,7 +1616,7 @@
}
public static final LispCharacter checkCharacter(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof LispCharacter)
return (LispCharacter) obj;
@@ -1625,7 +1625,7 @@
}
public static final Package checkPackage(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Package)
return (Package) obj;
@@ -1634,7 +1634,7 @@
}
public static final Function checkFunction(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Function)
return (Function) obj;
@@ -1643,7 +1643,7 @@
}
public static final Stream checkStream(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Stream)
return (Stream) obj;
@@ -1652,7 +1652,7 @@
}
public static final Stream checkCharacterInputStream(LispObject obj)
- throws ConditionThrowable
+
{
final Stream stream = checkStream(obj);
if (stream.isCharacterInputStream())
@@ -1663,7 +1663,7 @@
}
public static final Stream checkCharacterOutputStream(LispObject obj)
- throws ConditionThrowable
+
{
final Stream stream = checkStream(obj);
if (stream.isCharacterOutputStream())
@@ -1674,7 +1674,7 @@
}
public static final Stream checkBinaryInputStream(LispObject obj)
- throws ConditionThrowable
+
{
final Stream stream = checkStream(obj);
if (stream.isBinaryInputStream())
@@ -1685,7 +1685,7 @@
}
public static final Stream outSynonymOf(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Stream)
return (Stream) obj;
@@ -1698,7 +1698,7 @@
}
public static final Stream inSynonymOf(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Stream)
return (Stream) obj;
@@ -1711,7 +1711,7 @@
}
public static final void writeByte(int n, LispObject obj)
- throws ConditionThrowable
+
{
if (n < 0 || n > 255)
type_error(Fixnum.getInstance(n), UNSIGNED_BYTE_8);
@@ -1719,7 +1719,7 @@
}
public static final Readtable checkReadtable(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Readtable)
return (Readtable) obj;
@@ -1728,7 +1728,7 @@
}
public final static AbstractString checkString(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof AbstractString)
return (AbstractString) obj;
@@ -1737,7 +1737,7 @@
}
public final static LispClass checkClass(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof LispClass)
return (LispClass) obj;
@@ -1746,7 +1746,7 @@
}
public final static Layout checkLayout(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Layout)
return (Layout) obj;
@@ -1755,7 +1755,7 @@
}
public static final Readtable designator_readtable(LispObject obj)
- throws ConditionThrowable
+
{
if (obj == NIL)
obj = STANDARD_READTABLE.symbolValue();
@@ -1765,7 +1765,7 @@
}
public static final Environment checkEnvironment(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Environment)
return (Environment) obj;
@@ -1774,7 +1774,7 @@
}
public static final void checkBounds(int start, int end, int length)
- throws ConditionThrowable
+
{
if (start < 0 || end < 0 || start > end || end > length)
{
@@ -1790,7 +1790,7 @@
}
public static final LispObject coerceToFunction(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Function)
return obj;
@@ -1811,7 +1811,7 @@
// Returns package or throws exception.
public static final Package coerceToPackage(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Package)
return (Package) obj;
@@ -1824,7 +1824,7 @@
}
public static Pathname coerceToPathname(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof Pathname)
return (Pathname) arg;
@@ -1839,7 +1839,7 @@
}
public LispObject assq(LispObject item, LispObject alist)
- throws ConditionThrowable
+
{
while (alist instanceof Cons)
{
@@ -1859,7 +1859,7 @@
}
public static final boolean memq(LispObject item, LispObject list)
- throws ConditionThrowable
+
{
while (list instanceof Cons)
{
@@ -1873,7 +1873,7 @@
}
public static final boolean memql(LispObject item, LispObject list)
- throws ConditionThrowable
+
{
while (list instanceof Cons)
{
@@ -1889,7 +1889,7 @@
// Property lists.
public static final LispObject getf(LispObject plist, LispObject indicator,
LispObject defaultValue)
- throws ConditionThrowable
+
{
LispObject list = plist;
while (list != NIL)
@@ -1906,7 +1906,7 @@
}
public static final LispObject get(LispObject symbol, LispObject indicator)
- throws ConditionThrowable
+
{
LispObject list = checkSymbol(symbol).getPropertyList();
while (list != NIL)
@@ -1920,7 +1920,7 @@
public static final LispObject get(LispObject symbol, LispObject indicator,
LispObject defaultValue)
- throws ConditionThrowable
+
{
LispObject list = checkSymbol(symbol).getPropertyList();
while (list != NIL)
@@ -1934,7 +1934,7 @@
public static final LispObject put(Symbol symbol, LispObject indicator,
LispObject value)
- throws ConditionThrowable
+
{
LispObject list = symbol.getPropertyList();
while (list != NIL)
@@ -1957,7 +1957,7 @@
public static final LispObject putf(LispObject plist, LispObject indicator,
LispObject value)
- throws ConditionThrowable
+
{
LispObject list = plist;
while (list != NIL)
@@ -1976,7 +1976,7 @@
}
public static final LispObject remprop(Symbol symbol, LispObject indicator)
- throws ConditionThrowable
+
{
LispObject list = checkList(symbol.getPropertyList());
LispObject prev = null;
@@ -2003,7 +2003,7 @@
public static final String format(LispObject formatControl,
LispObject formatArguments)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
String control = formatControl.getStringValue();
@@ -2112,7 +2112,7 @@
// Used by the compiler.
public static final Symbol internInPackage(String name, String packageName)
- throws ConditionThrowable
+
{
Package pkg = Packages.findPackage(packageName);
if (pkg == null)
@@ -2145,7 +2145,7 @@
{
@Override
public LispObject execute(LispObject key, LispObject value)
- throws ConditionThrowable
+
{
objectTable.put(key.getStringValue(), value);
return NIL;
@@ -2269,7 +2269,7 @@
return (Stream) Symbol.STANDARD_INPUT.symbolValueNoThrow();
}
- public static final Stream getStandardOutput() throws ConditionThrowable
+ public static final Stream getStandardOutput()
{
return checkCharacterOutputStream(Symbol.STANDARD_OUTPUT.symbolValue());
}
@@ -2284,7 +2284,7 @@
public static final Symbol STANDARD_READTABLE =
internConstant("+STANDARD-READTABLE+", PACKAGE_SYS, new Readtable());
- public static final Readtable currentReadtable() throws ConditionThrowable
+ public static final Readtable currentReadtable()
{
return (Readtable) Symbol.CURRENT_READTABLE.symbolValue();
}
Modified: trunk/abcl/src/org/armedbear/lisp/LispCharacter.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispCharacter.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LispCharacter.java Fri Nov 6 15:07:54 2009
@@ -102,7 +102,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.CHARACTER)
return T;
@@ -188,7 +188,7 @@
return false;
}
- public static char getValue(LispObject obj) throws ConditionThrowable
+ public static char getValue(LispObject obj)
{
if (obj instanceof LispCharacter)
return ((LispCharacter)obj).value;
@@ -228,13 +228,13 @@
/** See LispObject.getStringValue() */
@Override
- public String getStringValue() throws ConditionThrowable
+ public String getStringValue()
{
return String.valueOf(value);
}
@Override
- public final String writeToString() throws ConditionThrowable
+ public final String writeToString()
{
final LispThread thread = LispThread.currentThread();
boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL);
@@ -297,7 +297,7 @@
new Primitive(Symbol.CHARACTER, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispCharacter)
return arg;
@@ -321,7 +321,7 @@
new Primitive("whitespacep", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Character.isWhitespace(LispCharacter.getValue(arg)) ? T : NIL;
}
@@ -332,7 +332,7 @@
new Primitive(Symbol.CHAR_CODE, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
int n = LispCharacter.getValue(arg);
return Fixnum.getInstance(n);
@@ -344,7 +344,7 @@
new Primitive(Symbol.CHAR_INT, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
int n = LispCharacter.getValue(arg);
return Fixnum.getInstance(n);
@@ -356,7 +356,7 @@
new Primitive(Symbol.CODE_CHAR, "code")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
int n = Fixnum.getValue(arg);
if (n < CHAR_MAX)
@@ -373,7 +373,7 @@
new Primitive(Symbol.CHARACTERP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof LispCharacter ? T : NIL;
}
@@ -384,7 +384,7 @@
new Primitive(Symbol.BOTH_CASE_P, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
char c = getValue(arg);
if (Character.isLowerCase(c) || Character.isUpperCase(c))
@@ -398,7 +398,7 @@
new Primitive(Symbol.LOWER_CASE_P, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Character.isLowerCase(getValue(arg)) ? T : NIL;
}
@@ -409,7 +409,7 @@
new Primitive(Symbol.UPPER_CASE_P, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Character.isUpperCase(getValue(arg)) ? T : NIL;
}
@@ -420,7 +420,7 @@
new Primitive(Symbol.CHAR_DOWNCASE, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final char c = LispCharacter.getValue(arg);
if (c < 128)
@@ -434,7 +434,7 @@
new Primitive(Symbol.CHAR_UPCASE, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final char c;
c = LispCharacter.getValue(arg);
@@ -449,7 +449,7 @@
new Primitive(Symbol.DIGIT_CHAR, "weight &optional radix")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Bignum)
return NIL;
@@ -461,7 +461,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
int radix;
if (second instanceof Fixnum)
@@ -489,14 +489,14 @@
new Primitive(Symbol.DIGIT_CHAR_P, "char &optional radix")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final int n = Character.digit(LispCharacter.getValue(arg), 10);
return n < 0 ? NIL : Fixnum.getInstance(n);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
char c;
c = LispCharacter.getValue(first);
@@ -520,7 +520,7 @@
new Primitive(Symbol.STANDARD_CHAR_P, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkCharacter(arg).isStandardChar() ? T : NIL;
}
@@ -531,7 +531,7 @@
new Primitive(Symbol.GRAPHIC_CHAR_P, "char")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
char c = LispCharacter.getValue(arg);
if (c >= ' ' && c < 127)
@@ -545,7 +545,7 @@
new Primitive(Symbol.ALPHA_CHAR_P, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Character.isLetter(LispCharacter.getValue(arg)) ? T : NIL;
}
@@ -556,7 +556,7 @@
new Primitive(Symbol.ALPHANUMERICP, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Character.isLetterOrDigit(LispCharacter.getValue(arg)) ? T : NIL;
}
@@ -598,7 +598,7 @@
new Primitive(Symbol.NAME_CHAR, "name")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
String s = arg.STRING().getStringValue();
int n = nameToChar(s);
@@ -640,7 +640,7 @@
new Primitive(Symbol.CHAR_NAME, "character")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
String name = charToName(LispCharacter.getValue(arg));
return name != null ? new SimpleString(name) : NIL;
Modified: trunk/abcl/src/org/armedbear/lisp/LispClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LispClass.java Fri Nov 6 15:07:54 2009
@@ -62,7 +62,7 @@
}
public static LispObject findClass(LispObject name, boolean errorp)
- throws ConditionThrowable
+
{
final Symbol symbol = checkSymbol(name);
final LispClass c;
@@ -115,7 +115,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject result = NIL;
result = result.push(new Cons("NAME", symbol != null ? symbol : NIL));
@@ -301,7 +301,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.CLASS)
return T;
@@ -310,7 +310,7 @@
return super.typep(type);
}
- public boolean subclassp(LispObject obj) throws ConditionThrowable
+ public boolean subclassp(LispObject obj)
{
LispObject cpl = classPrecedenceList;
while (cpl != NIL)
@@ -327,20 +327,20 @@
new Primitive(Symbol.FIND_CLASS, "symbol &optional errorp environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return findClass(arg, true);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return findClass(first, second != NIL);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
// FIXME Use environment!
return findClass(first, second != NIL);
@@ -353,7 +353,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final Symbol name = checkSymbol(first);
if (second == NIL)
@@ -373,7 +373,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final LispClass c = checkClass(first);
return c.subclassp(second) ? T : NIL;
Modified: trunk/abcl/src/org/armedbear/lisp/LispError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LispError.java Fri Nov 6 15:07:54 2009
@@ -35,22 +35,22 @@
public class LispError extends SeriousCondition
{
- public LispError() throws ConditionThrowable
+ public LispError()
{
}
- protected LispError(LispClass cls) throws ConditionThrowable
+ protected LispError(LispClass cls)
{
super(cls);
}
- public LispError(LispObject initArgs) throws ConditionThrowable
+ public LispError(LispObject initArgs)
{
super(StandardClass.ERROR);
initialize(initArgs);
}
- public LispError(String message) throws ConditionThrowable
+ public LispError(String message)
{
super(StandardClass.ERROR);
setFormatControl(message);
@@ -69,7 +69,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/LispObject.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispObject.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LispObject.java Fri Nov 6 15:07:54 2009
@@ -49,7 +49,7 @@
return BuiltInClass.CLASS_T;
}
- public LispObject getDescription() throws ConditionThrowable
+ public LispObject getDescription()
{
FastStringBuffer sb = new FastStringBuffer("An object of type ");
sb.append(typeOf().writeToString());
@@ -58,7 +58,7 @@
return new SimpleString(sb);
}
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
return NIL;
}
@@ -68,7 +68,7 @@
return true;
}
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == T)
return T;
@@ -99,12 +99,12 @@
return true;
}
- public Object javaInstance() throws ConditionThrowable
+ public Object javaInstance()
{
return this;
}
- public Object javaInstance(Class<?> c) throws ConditionThrowable
+ public Object javaInstance(Class<?> c)
{
if (c.isAssignableFrom(getClass()))
return this;
@@ -117,60 +117,59 @@
* interoperability
*
* @return An object to be used with synchronized, wait, notify, etc
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public Object lockableInstance() throws ConditionThrowable
+ public Object lockableInstance()
{
return this;
}
- public LispObject car() throws ConditionThrowable
+ public LispObject car()
{
return type_error(this, Symbol.LIST);
}
- public void setCar(LispObject obj) throws ConditionThrowable
+ public void setCar(LispObject obj)
{
type_error(this, Symbol.CONS);
}
- public LispObject RPLACA(LispObject obj) throws ConditionThrowable
+ public LispObject RPLACA(LispObject obj)
{
return type_error(this, Symbol.CONS);
}
- public LispObject cdr() throws ConditionThrowable
+ public LispObject cdr()
{
return type_error(this, Symbol.LIST);
}
- public void setCdr(LispObject obj) throws ConditionThrowable
+ public void setCdr(LispObject obj)
{
type_error(this, Symbol.CONS);
}
- public LispObject RPLACD(LispObject obj) throws ConditionThrowable
+ public LispObject RPLACD(LispObject obj)
{
return type_error(this, Symbol.CONS);
}
- public LispObject cadr() throws ConditionThrowable
+ public LispObject cadr()
{
return type_error(this, Symbol.LIST);
}
- public LispObject cddr() throws ConditionThrowable
+ public LispObject cddr()
{
return type_error(this, Symbol.LIST);
}
- public LispObject caddr() throws ConditionThrowable
+ public LispObject caddr()
{
return type_error(this, Symbol.LIST);
}
- public LispObject nthcdr(int n) throws ConditionThrowable
+ public LispObject nthcdr(int n)
{
if (n < 0)
return type_error(Fixnum.getInstance(n),
@@ -178,7 +177,7 @@
return type_error(this, Symbol.LIST);
}
- public LispObject push(LispObject obj) throws ConditionThrowable
+ public LispObject push(LispObject obj)
{
return type_error(this, Symbol.LIST);
}
@@ -208,7 +207,7 @@
return eql(obj) ? T : NIL;
}
- public final LispObject EQUAL(LispObject obj) throws ConditionThrowable
+ public final LispObject EQUAL(LispObject obj)
{
return equal(obj) ? T : NIL;
}
@@ -218,7 +217,7 @@
return false;
}
- public boolean equal(LispObject obj) throws ConditionThrowable
+ public boolean equal(LispObject obj)
{
return this == obj;
}
@@ -228,68 +227,68 @@
return false;
}
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
return this == obj;
}
- public LispObject ABS() throws ConditionThrowable
+ public LispObject ABS()
{
return type_error(this, Symbol.NUMBER);
}
- public LispObject NUMERATOR() throws ConditionThrowable
+ public LispObject NUMERATOR()
{
return type_error(this, Symbol.RATIONAL);
}
- public LispObject DENOMINATOR() throws ConditionThrowable
+ public LispObject DENOMINATOR()
{
return type_error(this, Symbol.RATIONAL);
}
- public LispObject EVENP() throws ConditionThrowable
+ public LispObject EVENP()
{
return evenp() ? T : NIL;
}
- public boolean evenp() throws ConditionThrowable
+ public boolean evenp()
{
type_error(this, Symbol.INTEGER);
// Not reached.
return false;
}
- public LispObject ODDP() throws ConditionThrowable
+ public LispObject ODDP()
{
return oddp() ? T : NIL;
}
- public boolean oddp() throws ConditionThrowable
+ public boolean oddp()
{
type_error(this, Symbol.INTEGER);
// Not reached.
return false;
}
- public LispObject PLUSP() throws ConditionThrowable
+ public LispObject PLUSP()
{
return plusp() ? T : NIL;
}
- public boolean plusp() throws ConditionThrowable
+ public boolean plusp()
{
type_error(this, Symbol.REAL);
// Not reached.
return false;
}
- public LispObject MINUSP() throws ConditionThrowable
+ public LispObject MINUSP()
{
return minusp() ? T : NIL;
}
- public boolean minusp() throws ConditionThrowable
+ public boolean minusp()
{
type_error(this, Symbol.REAL);
// Not reached.
@@ -306,12 +305,12 @@
return false;
}
- public LispObject ZEROP() throws ConditionThrowable
+ public LispObject ZEROP()
{
return zerop() ? T : NIL;
}
- public boolean zerop() throws ConditionThrowable
+ public boolean zerop()
{
type_error(this, Symbol.NUMBER);
// Not reached.
@@ -398,127 +397,127 @@
return false;
}
- public int length() throws ConditionThrowable
+ public int length()
{
type_error(this, Symbol.SEQUENCE);
// Not reached.
return 0;
}
- public final LispObject LENGTH() throws ConditionThrowable
+ public final LispObject LENGTH()
{
return Fixnum.getInstance(length());
}
- public LispObject CHAR(int index) throws ConditionThrowable
+ public LispObject CHAR(int index)
{
return type_error(this, Symbol.STRING);
}
- public LispObject SCHAR(int index) throws ConditionThrowable
+ public LispObject SCHAR(int index)
{
return type_error(this, Symbol.SIMPLE_STRING);
}
- public LispObject NTH(int index) throws ConditionThrowable
+ public LispObject NTH(int index)
{
return type_error(this, Symbol.LIST);
}
- public LispObject NTH(LispObject arg) throws ConditionThrowable
+ public LispObject NTH(LispObject arg)
{
return type_error(this, Symbol.LIST);
}
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
return type_error(this, Symbol.SEQUENCE);
}
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
return type_error(this, Symbol.SEQUENCE);
}
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
return type_error(this, Symbol.SEQUENCE);
}
- public long aref_long(int index) throws ConditionThrowable
+ public long aref_long(int index)
{
return AREF(index).longValue();
}
- public int aref(int index) throws ConditionThrowable
+ public int aref(int index)
{
return AREF(index).intValue();
}
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
return type_error(this, Symbol.ARRAY);
}
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
return AREF(Fixnum.getValue(index));
}
public void aset(int index, int n)
- throws ConditionThrowable
+
{
aset(index, Fixnum.getInstance(n));
}
public void aset(int index, LispObject newValue)
- throws ConditionThrowable
+
{
type_error(this, Symbol.ARRAY);
}
public void aset(LispObject index, LispObject newValue)
- throws ConditionThrowable
+
{
aset(Fixnum.getValue(index), newValue);
}
- public LispObject SVREF(int index) throws ConditionThrowable
+ public LispObject SVREF(int index)
{
return type_error(this, Symbol.SIMPLE_VECTOR);
}
- public void svset(int index, LispObject newValue) throws ConditionThrowable
+ public void svset(int index, LispObject newValue)
{
type_error(this, Symbol.SIMPLE_VECTOR);
}
public void vectorPushExtend(LispObject element)
- throws ConditionThrowable
+
{
noFillPointer();
}
public LispObject VECTOR_PUSH_EXTEND(LispObject element)
- throws ConditionThrowable
+
{
return noFillPointer();
}
public LispObject VECTOR_PUSH_EXTEND(LispObject element, LispObject extension)
- throws ConditionThrowable
+
{
return noFillPointer();
}
- public final LispObject noFillPointer() throws ConditionThrowable
+ public final LispObject noFillPointer()
{
return type_error(this, list(Symbol.AND, Symbol.VECTOR,
list(Symbol.SATISFIES,
Symbol.ARRAY_HAS_FILL_POINTER_P)));
}
- public LispObject[] copyToArray() throws ConditionThrowable
+ public LispObject[] copyToArray()
{
type_error(this, Symbol.LIST);
// Not reached.
@@ -540,14 +539,14 @@
return NIL;
}
- public boolean endp() throws ConditionThrowable
+ public boolean endp()
{
type_error(this, Symbol.LIST);
// Not reached.
return false;
}
- public LispObject ENDP() throws ConditionThrowable
+ public LispObject ENDP()
{
return type_error(this, Symbol.LIST);
}
@@ -557,7 +556,7 @@
return NIL;
}
- public boolean isSpecialOperator() throws ConditionThrowable
+ public boolean isSpecialOperator()
{
type_error(this, Symbol.SYMBOL);
// Not reached.
@@ -573,7 +572,7 @@
new EqHashTable(11, NIL, NIL);
public LispObject getDocumentation(LispObject docType)
- throws ConditionThrowable
+
{
LispObject alist = documentationHashTable.get(this);
if (alist != null)
@@ -586,7 +585,7 @@
}
public void setDocumentation(LispObject docType, LispObject documentation)
- throws ConditionThrowable
+
{
LispObject alist = documentationHashTable.get(this);
if (alist == null)
@@ -612,22 +611,22 @@
{
}
- public LispObject getSymbolValue() throws ConditionThrowable
+ public LispObject getSymbolValue()
{
return type_error(this, Symbol.SYMBOL);
}
- public LispObject getSymbolFunction() throws ConditionThrowable
+ public LispObject getSymbolFunction()
{
return type_error(this, Symbol.SYMBOL);
}
- public LispObject getSymbolFunctionOrDie() throws ConditionThrowable
+ public LispObject getSymbolFunctionOrDie()
{
return type_error(this, Symbol.SYMBOL);
}
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return toString();
}
@@ -635,7 +634,7 @@
public String unreadableString(String s) {
return unreadableString(s, true);
}
- public String unreadableString(Symbol sym) throws ConditionThrowable {
+ public String unreadableString(Symbol sym) {
return unreadableString(sym, true);
}
@@ -653,44 +652,44 @@
}
public String unreadableString(Symbol symbol, boolean identity)
- throws ConditionThrowable
+
{
return unreadableString(symbol.writeToString(), identity);
}
// Special operator
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
return error(new LispError());
}
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return type_error(this, Symbol.FUNCTION);
}
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return type_error(this, Symbol.FUNCTION);
}
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return type_error(this, Symbol.FUNCTION);
}
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return type_error(this, Symbol.FUNCTION);
}
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return type_error(this, Symbol.FUNCTION);
}
@@ -698,7 +697,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
return type_error(this, Symbol.FUNCTION);
}
@@ -706,7 +705,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
return type_error(this, Symbol.FUNCTION);
}
@@ -715,7 +714,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
return type_error(this, Symbol.FUNCTION);
}
@@ -724,18 +723,18 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
return type_error(this, Symbol.FUNCTION);
}
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return type_error(this, Symbol.FUNCTION);
}
// Used by COMPILE-MULTIPLE-VALUE-CALL.
- public LispObject dispatch(LispObject[] args) throws ConditionThrowable
+ public LispObject dispatch(LispObject[] args)
{
switch (args.length)
{
@@ -765,192 +764,192 @@
}
}
- public int intValue() throws ConditionThrowable
+ public int intValue()
{
type_error(this, Symbol.INTEGER);
// Not reached.
return 0;
}
- public long longValue() throws ConditionThrowable
+ public long longValue()
{
type_error(this, Symbol.INTEGER);
// Not reached.
return 0;
}
- public float floatValue() throws ConditionThrowable
+ public float floatValue()
{
type_error(this, Symbol.SINGLE_FLOAT);
// Not reached
return 0;
}
- public double doubleValue() throws ConditionThrowable
+ public double doubleValue()
{
type_error(this, Symbol.DOUBLE_FLOAT);
// Not reached
return 0;
}
- public LispObject incr() throws ConditionThrowable
+ public LispObject incr()
{
return type_error(this, Symbol.NUMBER);
}
- public LispObject decr() throws ConditionThrowable
+ public LispObject decr()
{
return type_error(this, Symbol.NUMBER);
}
- public LispObject negate() throws ConditionThrowable
+ public LispObject negate()
{
return Fixnum.ZERO.subtract(this);
}
- public LispObject add(int n) throws ConditionThrowable
+ public LispObject add(int n)
{
return add(Fixnum.getInstance(n));
}
- public LispObject add(LispObject obj) throws ConditionThrowable
+ public LispObject add(LispObject obj)
{
return type_error(this, Symbol.NUMBER);
}
- public LispObject subtract(int n) throws ConditionThrowable
+ public LispObject subtract(int n)
{
return subtract(Fixnum.getInstance(n));
}
- public LispObject subtract(LispObject obj) throws ConditionThrowable
+ public LispObject subtract(LispObject obj)
{
return type_error(this, Symbol.NUMBER);
}
- public LispObject multiplyBy(int n) throws ConditionThrowable
+ public LispObject multiplyBy(int n)
{
return multiplyBy(Fixnum.getInstance(n));
}
- public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
+ public LispObject multiplyBy(LispObject obj)
{
return type_error(this, Symbol.NUMBER);
}
- public LispObject divideBy(LispObject obj) throws ConditionThrowable
+ public LispObject divideBy(LispObject obj)
{
return type_error(this, Symbol.NUMBER);
}
- public boolean isEqualTo(int n) throws ConditionThrowable
+ public boolean isEqualTo(int n)
{
return isEqualTo(Fixnum.getInstance(n));
}
- public boolean isEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isEqualTo(LispObject obj)
{
type_error(this, Symbol.NUMBER);
// Not reached.
return false;
}
- public LispObject IS_E(LispObject obj) throws ConditionThrowable
+ public LispObject IS_E(LispObject obj)
{
return isEqualTo(obj) ? T : NIL;
}
- public boolean isNotEqualTo(int n) throws ConditionThrowable
+ public boolean isNotEqualTo(int n)
{
return isNotEqualTo(Fixnum.getInstance(n));
}
- public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isNotEqualTo(LispObject obj)
{
type_error(this, Symbol.NUMBER);
// Not reached.
return false;
}
- public LispObject IS_NE(LispObject obj) throws ConditionThrowable
+ public LispObject IS_NE(LispObject obj)
{
return isNotEqualTo(obj) ? T : NIL;
}
- public boolean isLessThan(int n) throws ConditionThrowable
+ public boolean isLessThan(int n)
{
return isLessThan(Fixnum.getInstance(n));
}
- public boolean isLessThan(LispObject obj) throws ConditionThrowable
+ public boolean isLessThan(LispObject obj)
{
type_error(this, Symbol.REAL);
// Not reached.
return false;
}
- public LispObject IS_LT(LispObject obj) throws ConditionThrowable
+ public LispObject IS_LT(LispObject obj)
{
return isLessThan(obj) ? T : NIL;
}
- public boolean isGreaterThan(int n) throws ConditionThrowable
+ public boolean isGreaterThan(int n)
{
return isGreaterThan(Fixnum.getInstance(n));
}
- public boolean isGreaterThan(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThan(LispObject obj)
{
type_error(this, Symbol.REAL);
// Not reached.
return false;
}
- public LispObject IS_GT(LispObject obj) throws ConditionThrowable
+ public LispObject IS_GT(LispObject obj)
{
return isGreaterThan(obj) ? T : NIL;
}
- public boolean isLessThanOrEqualTo(int n) throws ConditionThrowable
+ public boolean isLessThanOrEqualTo(int n)
{
return isLessThanOrEqualTo(Fixnum.getInstance(n));
}
- public boolean isLessThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isLessThanOrEqualTo(LispObject obj)
{
type_error(this, Symbol.REAL);
// Not reached.
return false;
}
- public LispObject IS_LE(LispObject obj) throws ConditionThrowable
+ public LispObject IS_LE(LispObject obj)
{
return isLessThanOrEqualTo(obj) ? T : NIL;
}
- public boolean isGreaterThanOrEqualTo(int n) throws ConditionThrowable
+ public boolean isGreaterThanOrEqualTo(int n)
{
return isGreaterThanOrEqualTo(Fixnum.getInstance(n));
}
- public boolean isGreaterThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThanOrEqualTo(LispObject obj)
{
type_error(this, Symbol.REAL);
// Not reached.
return false;
}
- public LispObject IS_GE(LispObject obj) throws ConditionThrowable
+ public LispObject IS_GE(LispObject obj)
{
return isGreaterThanOrEqualTo(obj) ? T : NIL;
}
- public LispObject truncate(LispObject obj) throws ConditionThrowable
+ public LispObject truncate(LispObject obj)
{
return type_error(this, Symbol.REAL);
}
- public LispObject MOD(LispObject divisor) throws ConditionThrowable
+ public LispObject MOD(LispObject divisor)
{
truncate(divisor);
final LispThread thread = LispThread.currentThread();
@@ -972,57 +971,57 @@
return remainder;
}
- public LispObject MOD(int divisor) throws ConditionThrowable
+ public LispObject MOD(int divisor)
{
return MOD(Fixnum.getInstance(divisor));
}
- public LispObject ash(int shift) throws ConditionThrowable
+ public LispObject ash(int shift)
{
return ash(Fixnum.getInstance(shift));
}
- public LispObject ash(LispObject obj) throws ConditionThrowable
+ public LispObject ash(LispObject obj)
{
return type_error(this, Symbol.INTEGER);
}
- public LispObject LOGNOT() throws ConditionThrowable
+ public LispObject LOGNOT()
{
return type_error(this, Symbol.INTEGER);
}
- public LispObject LOGAND(int n) throws ConditionThrowable
+ public LispObject LOGAND(int n)
{
return LOGAND(Fixnum.getInstance(n));
}
- public LispObject LOGAND(LispObject obj) throws ConditionThrowable
+ public LispObject LOGAND(LispObject obj)
{
return type_error(this, Symbol.INTEGER);
}
- public LispObject LOGIOR(int n) throws ConditionThrowable
+ public LispObject LOGIOR(int n)
{
return LOGIOR(Fixnum.getInstance(n));
}
- public LispObject LOGIOR(LispObject obj) throws ConditionThrowable
+ public LispObject LOGIOR(LispObject obj)
{
return type_error(this, Symbol.INTEGER);
}
- public LispObject LOGXOR(int n) throws ConditionThrowable
+ public LispObject LOGXOR(int n)
{
return LOGXOR(Fixnum.getInstance(n));
}
- public LispObject LOGXOR(LispObject obj) throws ConditionThrowable
+ public LispObject LOGXOR(LispObject obj)
{
return type_error(this, Symbol.INTEGER);
}
- public LispObject LDB(int size, int position) throws ConditionThrowable
+ public LispObject LDB(int size, int position)
{
return type_error(this, Symbol.INTEGER);
}
@@ -1043,19 +1042,19 @@
return psxhash();
}
- public LispObject STRING() throws ConditionThrowable
+ public LispObject STRING()
{
return error(new TypeError(writeToString() + " cannot be coerced to a string."));
}
- public char[] chars() throws ConditionThrowable
+ public char[] chars()
{
type_error(this, Symbol.STRING);
// Not reached.
return null;
}
- public char[] getStringChars() throws ConditionThrowable
+ public char[] getStringChars()
{
type_error(this, Symbol.STRING);
// Not reached.
@@ -1067,46 +1066,46 @@
*
* Throws an error if the instance isn't a string designator.
*/
- public String getStringValue() throws ConditionThrowable
+ public String getStringValue()
{
type_error(this, Symbol.STRING);
// Not reached.
return null;
}
- public LispObject getSlotValue_0() throws ConditionThrowable
+ public LispObject getSlotValue_0()
{
return type_error(this, Symbol.STRUCTURE_OBJECT);
}
- public LispObject getSlotValue_1() throws ConditionThrowable
+ public LispObject getSlotValue_1()
{
return type_error(this, Symbol.STRUCTURE_OBJECT);
}
- public LispObject getSlotValue_2() throws ConditionThrowable
+ public LispObject getSlotValue_2()
{
return type_error(this, Symbol.STRUCTURE_OBJECT);
}
- public LispObject getSlotValue_3() throws ConditionThrowable
+ public LispObject getSlotValue_3()
{
return type_error(this, Symbol.STRUCTURE_OBJECT);
}
- public LispObject getSlotValue(int index) throws ConditionThrowable
+ public LispObject getSlotValue(int index)
{
return type_error(this, Symbol.STRUCTURE_OBJECT);
}
- public int getFixnumSlotValue(int index) throws ConditionThrowable
+ public int getFixnumSlotValue(int index)
{
type_error(this, Symbol.STRUCTURE_OBJECT);
// Not reached.
return 0;
}
- public boolean getSlotValueAsBoolean(int index) throws ConditionThrowable
+ public boolean getSlotValueAsBoolean(int index)
{
type_error(this, Symbol.STRUCTURE_OBJECT);
// Not reached.
@@ -1114,42 +1113,42 @@
}
public void setSlotValue_0(LispObject value)
- throws ConditionThrowable
+
{
type_error(this, Symbol.STRUCTURE_OBJECT);
}
public void setSlotValue_1(LispObject value)
- throws ConditionThrowable
+
{
type_error(this, Symbol.STRUCTURE_OBJECT);
}
public void setSlotValue_2(LispObject value)
- throws ConditionThrowable
+
{
type_error(this, Symbol.STRUCTURE_OBJECT);
}
public void setSlotValue_3(LispObject value)
- throws ConditionThrowable
+
{
type_error(this, Symbol.STRUCTURE_OBJECT);
}
public void setSlotValue(int index, LispObject value)
- throws ConditionThrowable
+
{
type_error(this, Symbol.STRUCTURE_OBJECT);
}
- public LispObject SLOT_VALUE(LispObject slotName) throws ConditionThrowable
+ public LispObject SLOT_VALUE(LispObject slotName)
{
return type_error(this, Symbol.STANDARD_OBJECT);
}
public void setSlotValue(LispObject slotName, LispObject newValue)
- throws ConditionThrowable
+
{
type_error(this, Symbol.STANDARD_OBJECT);
}
Modified: trunk/abcl/src/org/armedbear/lisp/LispReader.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispReader.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LispReader.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
try
{
@@ -68,7 +68,7 @@
{
@Override
public LispObject execute(Stream stream, char terminator)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final Readtable rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread);
@@ -134,7 +134,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
return stream.readList(false, false);
}
@@ -147,7 +147,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
return error(new ReaderError("Unmatched right parenthesis.", stream));
}
@@ -160,7 +160,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored)
- throws ConditionThrowable
+
{
return new Cons(Symbol.QUOTE,
new Cons(stream.read(true, NIL, true,
@@ -175,7 +175,7 @@
{
@Override
public LispObject execute(Stream stream, char c)
- throws ConditionThrowable
+
{
return stream.readDispatchChar(c, false);
}
@@ -188,7 +188,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject list = stream.readList(true, false);
@@ -215,7 +215,7 @@
{
@Override
public LispObject execute(Stream stream, char ignored, int n)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final Readtable rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread);
@@ -283,7 +283,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (Symbol.READ_EVAL.symbolValue(thread) == NIL)
@@ -302,7 +302,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readSymbol();
}
@@ -315,7 +315,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readArray(n);
}
@@ -328,7 +328,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readRadix(2);
}
@@ -341,7 +341,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readComplex();
}
@@ -354,7 +354,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readRadix(8);
}
@@ -367,7 +367,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readPathname();
}
@@ -380,7 +380,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readRadix(n);
}
@@ -393,7 +393,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readStructure();
}
@@ -406,7 +406,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return stream.readRadix(16);
}
@@ -419,7 +419,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
return new Cons(Symbol.FUNCTION,
new Cons(stream.read(true, NIL, true,
@@ -434,7 +434,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final Readtable rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread);
@@ -449,7 +449,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
stream.skipBalancedComment();
return null;
@@ -463,7 +463,7 @@
{
@Override
public LispObject execute(Stream stream, char c, int n)
- throws ConditionThrowable
+
{
FastStringBuffer sb = new FastStringBuffer("Illegal # macro character: #\\");
String s = LispCharacter.charToName(c);
Modified: trunk/abcl/src/org/armedbear/lisp/LispStackFrame.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispStackFrame.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LispStackFrame.java Fri Nov 6 15:07:54 2009
@@ -129,7 +129,7 @@
@Override
public LispObject typep(LispObject typeSpecifier)
- throws ConditionThrowable
+
{
if (typeSpecifier == Symbol.LISP_STACK_FRAME)
return T;
@@ -139,7 +139,7 @@
}
public LispObject toLispList()
- throws ConditionThrowable
+
{
LispObject result = argsToLispList();
if (operator instanceof Operator) {
@@ -151,7 +151,7 @@
}
private LispObject argsToLispList()
- throws ConditionThrowable
+
{
LispObject result = Lisp.NIL;
if (args != null) {
@@ -185,7 +185,7 @@
}
public SimpleString toLispString()
- throws ConditionThrowable
+
{
String result;
try {
@@ -204,7 +204,7 @@
@Override
public LispObject getParts()
- throws ConditionThrowable
+
{
LispObject result = NIL;
result = result.push(new Cons("OPERATOR", getOperator()));
Modified: trunk/abcl/src/org/armedbear/lisp/LispThread.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispThread.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LispThread.java Fri Nov 6 15:07:54 2009
@@ -136,7 +136,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.THREAD)
return T;
@@ -169,7 +169,7 @@
}
private final synchronized void processThreadInterrupts()
- throws ConditionThrowable
+
{
while (pending != NIL) {
LispObject function = pending.car();
@@ -386,7 +386,7 @@
}
public final LispObject pushSpecial(Symbol name, LispObject thing)
- throws ConditionThrowable
+
{
SpecialBinding binding = lastSpecialBinding;
while (binding != null) {
@@ -427,12 +427,12 @@
private LispObject catchTags = NIL;
- public void pushCatchTag(LispObject tag) throws ConditionThrowable
+ public void pushCatchTag(LispObject tag)
{
catchTags = new Cons(tag, catchTags);
}
- public void popCatchTag() throws ConditionThrowable
+ public void popCatchTag()
{
if (catchTags != NIL)
catchTags = catchTags.cdr();
@@ -441,7 +441,7 @@
}
public void throwToTag(LispObject tag, LispObject result)
- throws ConditionThrowable
+
{
LispObject rest = catchTags;
while (rest != NIL) {
@@ -468,7 +468,6 @@
}
public final void pushStackFrame(StackFrame frame)
- throws ConditionThrowable
{
frame.setNext(stack);
stack = frame;
@@ -487,7 +486,7 @@
}
@Override
- public LispObject execute(LispObject function) throws ConditionThrowable
+ public LispObject execute(LispObject function)
{
if (use_fast_calls)
return function.execute();
@@ -503,7 +502,7 @@
@Override
public LispObject execute(LispObject function, LispObject arg)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(arg);
@@ -520,7 +519,7 @@
@Override
public LispObject execute(LispObject function, LispObject first,
LispObject second)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(first, second);
@@ -537,7 +536,7 @@
@Override
public LispObject execute(LispObject function, LispObject first,
LispObject second, LispObject third)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(first, second, third);
@@ -555,7 +554,7 @@
public LispObject execute(LispObject function, LispObject first,
LispObject second, LispObject third,
LispObject fourth)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(first, second, third, fourth);
@@ -573,7 +572,7 @@
public LispObject execute(LispObject function, LispObject first,
LispObject second, LispObject third,
LispObject fourth, LispObject fifth)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(first, second, third, fourth, fifth);
@@ -592,7 +591,7 @@
LispObject second, LispObject third,
LispObject fourth, LispObject fifth,
LispObject sixth)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(first, second, third, fourth, fifth, sixth);
@@ -612,7 +611,7 @@
LispObject second, LispObject third,
LispObject fourth, LispObject fifth,
LispObject sixth, LispObject seventh)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(first, second, third, fourth, fifth, sixth,
@@ -634,7 +633,7 @@
LispObject fourth, LispObject fifth,
LispObject sixth, LispObject seventh,
LispObject eighth)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(first, second, third, fourth, fifth, sixth,
@@ -652,7 +651,7 @@
}
public LispObject execute(LispObject function, LispObject[] args)
- throws ConditionThrowable
+
{
if (use_fast_calls)
return function.execute(args);
@@ -701,7 +700,7 @@
}
}
- public LispObject backtrace(int limit) throws ConditionThrowable
+ public LispObject backtrace(int limit)
{
LispObject result = NIL;
if (stack != null) {
@@ -722,7 +721,7 @@
return result.nreverse();
}
- public void incrementCallCounts() throws ConditionThrowable
+ public void incrementCallCounts()
{
StackFrame s = stack;
@@ -750,7 +749,7 @@
}
private static void pprint(LispObject obj, int indentBy, Stream stream)
- throws ConditionThrowable
+
{
if (stream.getCharPos() == 0) {
StringBuffer sb = new StringBuffer();
@@ -810,7 +809,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
StringBuffer sb = new StringBuffer("THREAD");
if (name != NIL) {
@@ -826,7 +825,7 @@
new Primitive("make-thread", PACKAGE_THREADS, true, "function &optional &key name")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
final int length = args.length;
if (length == 0)
@@ -853,7 +852,7 @@
"Boolean predicate as whether OBJECT is a thread.")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof LispThread ? T : NIL;
}
@@ -865,7 +864,7 @@
"Boolean predicate whether THREAD is alive.")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispThread lispThread;
if (arg instanceof LispThread) {
@@ -884,7 +883,7 @@
"Return the name of THREAD if it has one.")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof LispThread) {
return ((LispThread)arg).name;
@@ -894,7 +893,7 @@
};
public static final long javaSleepInterval(LispObject lispSleep)
- throws ConditionThrowable
+
{
double d =
checkDoubleFloat(lispSleep.multiplyBy(new DoubleFloat(1000))).getValue();
@@ -909,7 +908,7 @@
"Causes the invoking thread to sleep for SECONDS seconds.\nSECONDS may be a value between 0 1and 1.")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
try {
@@ -928,7 +927,7 @@
"Applies FUNCTION to all existing threads.")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Function fun = checkFunction(arg);
final LispThread thread = LispThread.currentThread();
@@ -949,7 +948,7 @@
"Mark THREAD as destroyed.")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispThread thread;
if (arg instanceof LispThread) {
@@ -974,7 +973,7 @@
"Interrupts THREAD and forces it to apply FUNCTION to ARGS.\nWhen the function returns, the thread's original computation continues. If multiple interrupts are queued for a thread, they are all run, but the order is not guaranteed.")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -1000,7 +999,7 @@
"Returns a reference to invoking thread.")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return currentThread();
}
@@ -1013,7 +1012,7 @@
{
@Override
public LispObject execute(LispObject[] args)
- throws ConditionThrowable
+
{
if (args.length > 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -1027,7 +1026,7 @@
{
@Override
public LispObject execute(LispObject[] args)
- throws ConditionThrowable
+
{
if (args.length != 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -1042,7 +1041,7 @@
{
@Override
public LispObject execute(LispObject[] args)
- throws ConditionThrowable
+
{
if (args.length != 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -1074,7 +1073,7 @@
new Primitive("use-fast-calls", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
use_fast_calls = (arg != NIL);
return use_fast_calls ? T : NIL;
@@ -1088,7 +1087,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args == NIL)
return error(new WrongNumberOfArgumentsException(this));
@@ -1107,7 +1106,7 @@
{
@Override
public LispObject execute(LispObject object)
- throws ConditionThrowable
+
{
try {
object.lockableInstance().wait();
@@ -1123,7 +1122,7 @@
@Override
public LispObject execute(LispObject object, LispObject timeout)
- throws ConditionThrowable
+
{
try {
object.lockableInstance().wait(javaSleepInterval(timeout));
@@ -1145,7 +1144,7 @@
{
@Override
public LispObject execute(LispObject object)
- throws ConditionThrowable
+
{
try {
object.lockableInstance().notify();
@@ -1164,7 +1163,7 @@
{
@Override
public LispObject execute(LispObject object)
- throws ConditionThrowable
+
{
try {
object.lockableInstance().notifyAll();
Modified: trunk/abcl/src/org/armedbear/lisp/Load.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Load.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Load.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
public final class Load extends Lisp
{
public static final LispObject load(String filename)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
return load(new Pathname(filename),
@@ -93,7 +93,7 @@
boolean verbose,
boolean print,
boolean ifDoesNotExist)
- throws ConditionThrowable {
+ {
return load(pathname, filename, verbose, print, ifDoesNotExist, false);
}
@@ -103,7 +103,7 @@
boolean print,
boolean ifDoesNotExist,
boolean returnLastResult)
- throws ConditionThrowable
+
{
String dir = null;
if (!Utilities.isFilenameAbsolute(filename)) {
@@ -268,7 +268,7 @@
}
public static final LispObject loadSystemFile(String filename)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
return loadSystemFile(filename,
@@ -278,7 +278,7 @@
}
public static final LispObject loadSystemFile(String filename, boolean auto)
- throws ConditionThrowable
+
{
LispThread thread = LispThread.currentThread();
if (auto) {
@@ -307,7 +307,7 @@
boolean verbose,
boolean print,
boolean auto)
- throws ConditionThrowable
+
{
final int ARRAY_SIZE = 2;
String[] candidates = new String[ARRAY_SIZE];
@@ -445,7 +445,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first == Keyword.VERSION) {
if (second.eql(_FASL_VERSION_.getSymbolValue())) {
@@ -466,7 +466,7 @@
boolean verbose,
boolean print,
boolean auto)
- throws ConditionThrowable {
+ {
return loadFileFromStream(pathname, truename, in, verbose, print, auto, false);
}
@@ -477,7 +477,7 @@
boolean print,
boolean auto,
boolean returnLastResult)
- throws ConditionThrowable
+
{
long start = System.currentTimeMillis();
final LispThread thread = LispThread.currentThread();
@@ -541,13 +541,13 @@
private static final LispObject loadStream(Stream in, boolean print,
LispThread thread)
- throws ConditionThrowable {
+ {
return loadStream(in, print, thread, false);
}
private static final LispObject loadStream(Stream in, boolean print,
LispThread thread, boolean returnLastResult)
- throws ConditionThrowable
+
{
SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
thread.bindSpecial(_LOAD_STREAM_, in);
@@ -583,7 +583,7 @@
}
private static final LispObject faslLoadStream(LispThread thread)
- throws ConditionThrowable
+
{
Stream in = (Stream) _LOAD_STREAM_.symbolValue(thread);
final Environment env = new Environment();
@@ -676,7 +676,7 @@
@Override
public LispObject execute(LispObject filespec, LispObject verbose,
LispObject print, LispObject ifDoesNotExist)
- throws ConditionThrowable {
+ {
return load(filespec, verbose, print, ifDoesNotExist, NIL);
}
};
@@ -689,7 +689,7 @@
@Override
public LispObject execute(LispObject filespec, LispObject verbose,
LispObject print, LispObject ifDoesNotExist)
- throws ConditionThrowable {
+ {
return load(filespec, verbose, print, ifDoesNotExist, T);
}
};
@@ -699,7 +699,7 @@
LispObject print,
LispObject ifDoesNotExist,
LispObject returnLastResult)
- throws ConditionThrowable {
+ {
if (filespec instanceof Stream) {
if (((Stream)filespec).isOpen()) {
LispObject pathname;
@@ -738,7 +738,7 @@
new Primitive("load-system-file", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispThread thread = LispThread.currentThread();
return loadSystemFile(arg.getStringValue(),
Modified: trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
{
}
- public LogicalPathname(String host, String rest) throws ConditionThrowable
+ public LogicalPathname(String host, String rest)
{
final int limit = rest.length();
for (int i = 0; i < limit; i++) {
@@ -120,7 +120,7 @@
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-";
public static final SimpleString canonicalizeStringComponent(AbstractString s)
- throws ConditionThrowable
+
{
final int limit = s.length();
for (int i = 0; i < limit; i++) {
@@ -137,13 +137,13 @@
}
public static Pathname translateLogicalPathname(LogicalPathname pathname)
- throws ConditionThrowable
+
{
return (Pathname) Symbol.TRANSLATE_LOGICAL_PATHNAME.execute(pathname);
}
private static final LispObject parseDirectory(String s)
- throws ConditionThrowable
+
{
LispObject result;
if (s.charAt(0) == ';') {
@@ -185,7 +185,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.LOGICAL_PATHNAME)
return T;
@@ -195,7 +195,7 @@
}
@Override
- protected String getDirectoryNamestring() throws ConditionThrowable
+ protected String getDirectoryNamestring()
{
FastStringBuffer sb = new FastStringBuffer();
// "If a pathname is converted to a namestring, the symbols NIL and
@@ -233,7 +233,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL);
@@ -281,7 +281,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
AbstractString s = checkString(arg);
if (s.length() == 0) {
@@ -300,7 +300,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
// Check for a logical pathname host.
String s = arg.getStringValue();
Modified: trunk/abcl/src/org/armedbear/lisp/MacroObject.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/MacroObject.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/MacroObject.java Fri Nov 6 15:07:54 2009
@@ -48,20 +48,20 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new UndefinedFunction(name));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return error(new UndefinedFunction(name));
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(name));
}
@@ -69,7 +69,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(name));
}
@@ -77,7 +77,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(name));
}
@@ -86,7 +86,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(name));
}
@@ -95,7 +95,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(name));
}
@@ -105,7 +105,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(name));
}
@@ -115,13 +115,13 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(name));
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return error(new UndefinedFunction(name));
}
Modified: trunk/abcl/src/org/armedbear/lisp/MathFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/MathFunctions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/MathFunctions.java Fri Nov 6 15:07:54 2009
@@ -39,13 +39,13 @@
private static final Primitive SIN = new Primitive("sin", "radians")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return sin(arg);
}
};
- private static LispObject sin(LispObject arg) throws ConditionThrowable
+ private static LispObject sin(LispObject arg)
{
if (arg instanceof DoubleFloat)
return new DoubleFloat(Math.sin(((DoubleFloat)arg).value));
@@ -66,13 +66,13 @@
private static final Primitive COS = new Primitive("cos", "radians")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return cos(arg);
}
};
- private static LispObject cos(LispObject arg) throws ConditionThrowable
+ private static LispObject cos(LispObject arg)
{
if (arg instanceof DoubleFloat)
return new DoubleFloat(Math.cos(((DoubleFloat)arg).value));
@@ -92,7 +92,7 @@
private static final Primitive TAN = new Primitive("tan", "radians")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof DoubleFloat)
return new DoubleFloat(Math.tan(((DoubleFloat)arg).value));
@@ -106,13 +106,13 @@
private static final Primitive ASIN = new Primitive("asin", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return asin(arg);
}
};
- private static LispObject asin(LispObject arg) throws ConditionThrowable
+ private static LispObject asin(LispObject arg)
{
if (arg instanceof SingleFloat) {
float f = ((SingleFloat)arg).value;
@@ -147,13 +147,13 @@
private static final Primitive ACOS = new Primitive("acos", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return acos(arg);
}
};
- private static LispObject acos(LispObject arg) throws ConditionThrowable
+ private static LispObject acos(LispObject arg)
{
if (arg instanceof DoubleFloat) {
double d = ((DoubleFloat)arg).value;
@@ -190,7 +190,7 @@
new Primitive("atan", "number1 &optional number2")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg.numberp())
return atan(arg);
@@ -206,7 +206,7 @@
// y = -0 x = -0 -<PI>
@Override
public LispObject execute(LispObject y, LispObject x)
- throws ConditionThrowable
+
{
if (!y.realp())
return type_error(y, Symbol.REAL);
@@ -223,7 +223,7 @@
}
};
- private static LispObject atan(LispObject arg) throws ConditionThrowable
+ private static LispObject atan(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).imagpart;
@@ -251,13 +251,13 @@
private static final Primitive SINH = new Primitive("sinh", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return sinh(arg);
}
};
- private static LispObject sinh(LispObject arg) throws ConditionThrowable
+ private static LispObject sinh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -301,13 +301,13 @@
private static final Primitive COSH = new Primitive("cosh", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return cosh(arg);
}
};
- private static LispObject cosh(LispObject arg) throws ConditionThrowable
+ private static LispObject cosh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -351,7 +351,7 @@
private static final Primitive TANH = new Primitive("tanh", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat) {
try {
@@ -380,13 +380,13 @@
private static final Primitive ASINH = new Primitive("asinh", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return asinh(arg);
}
};
- private static LispObject asinh(LispObject arg) throws ConditionThrowable
+ private static LispObject asinh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -413,13 +413,13 @@
private static final Primitive ACOSH = new Primitive("acosh", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return acosh(arg);
}
};
- private static LispObject acosh(LispObject arg) throws ConditionThrowable
+ private static LispObject acosh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -450,13 +450,13 @@
private static final Primitive ATANH = new Primitive("atanh", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return atanh(arg);
}
};
- private static LispObject atanh(LispObject arg) throws ConditionThrowable
+ private static LispObject atanh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -482,13 +482,13 @@
private static final Primitive CIS = new Primitive("cis", "radians")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return cis(arg);
}
};
- private static LispObject cis(LispObject arg) throws ConditionThrowable
+ private static LispObject cis(LispObject arg)
{
if (arg.realp())
return Complex.getInstance(cos(arg), sin(arg));
@@ -499,13 +499,13 @@
private static final Primitive EXP = new Primitive("exp", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return exp(arg);
}
};
- private static LispObject exp(LispObject arg) throws ConditionThrowable
+ private static LispObject exp(LispObject arg)
{
if (arg.realp()) {
if (arg instanceof DoubleFloat) {
@@ -527,13 +527,13 @@
private static final Primitive SQRT = new Primitive("sqrt", "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return sqrt(arg);
}
};
- private static final LispObject sqrt(LispObject obj) throws ConditionThrowable
+ private static final LispObject sqrt(LispObject obj)
{
if (obj instanceof DoubleFloat) {
if (obj.minusp())
@@ -564,13 +564,13 @@
new Primitive("log", "number &optional base")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return log(arg);
}
@Override
public LispObject execute(LispObject number, LispObject base)
- throws ConditionThrowable
+
{
if (number.realp() && !number.minusp()
&& base.isEqualTo(Fixnum.getInstance(10))) {
@@ -592,7 +592,7 @@
}
};
- private static final LispObject log(LispObject obj) throws ConditionThrowable
+ private static final LispObject log(LispObject obj)
{
if (obj.realp() && !obj.minusp()) {
// Result is real.
@@ -648,7 +648,7 @@
{
@Override
public LispObject execute(LispObject base, LispObject power)
- throws ConditionThrowable
+
{
if (power.zerop()) {
if (power instanceof Fixnum) {
@@ -745,10 +745,9 @@
*
* @param number
* @return number or signals an appropriate error
- * @throws org.armedbear.lisp.ConditionThrowable
*/
private final static LispObject OverUnderFlowCheck(LispObject number)
- throws ConditionThrowable
+
{
if (number instanceof Complex) {
OverUnderFlowCheck(((Complex)number).realpart);
@@ -775,10 +774,9 @@
*
* @param number
* @return number or signals an appropriate error
- * @throws org.armedbear.lisp.ConditionThrowable
*/
final static float OverUnderFlowCheck(float number)
- throws ConditionThrowable
+
{
if (TRAP_OVERFLOW) {
if (Float.isInfinite(number))
@@ -795,10 +793,9 @@
*
* @param number
* @return number or signals an appropriate error
- * @throws org.armedbear.lisp.ConditionThrowable
*/
public final static double OverUnderFlowCheck(double number)
- throws ConditionThrowable
+
{
if (TRAP_OVERFLOW) {
if (Double.isInfinite(number))
@@ -815,10 +812,9 @@
*
* @param base A value of any type
* @param power An integer (fixnum or bignum) value
- * @throws org.armedbear.lisp.ConditionThrowable
*/
private static final LispObject intexp(LispObject base, LispObject power)
- throws ConditionThrowable
+
{
if (power.isEqualTo(0))
return Fixnum.ONE;
Modified: trunk/abcl/src/org/armedbear/lisp/Nil.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Nil.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Nil.java Fri Nov 6 15:07:54 2009
@@ -69,7 +69,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.NULL)
return T;
@@ -135,7 +135,7 @@
}
@Override
- public LispObject nthcdr(int n) throws ConditionThrowable
+ public LispObject nthcdr(int n)
{
if (n < 0)
return type_error(Fixnum.getInstance(n),
@@ -156,7 +156,7 @@
}
@Override
- public LispObject NTH(int index) throws ConditionThrowable
+ public LispObject NTH(int index)
{
if (index < 0)
error(new TypeError(String.valueOf(index) +
@@ -165,7 +165,7 @@
}
@Override
- public LispObject NTH(LispObject arg) throws ConditionThrowable
+ public LispObject NTH(LispObject arg)
{
int index;
if (arg instanceof Fixnum) {
@@ -182,7 +182,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
return error(new TypeError("ELT: invalid index " + index + " for " + this + "."));
}
Modified: trunk/abcl/src/org/armedbear/lisp/NilVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/NilVector.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/NilVector.java Fri Nov 6 15:07:54 2009
@@ -37,13 +37,13 @@
{
private int capacity;
- public NilVector(int capacity) throws ConditionThrowable
+ public NilVector(int capacity)
{
this.capacity = capacity;
}
@Override
- public char[] chars() throws ConditionThrowable
+ public char[] chars()
{
if (capacity != 0)
accessError();
@@ -51,7 +51,7 @@
}
@Override
- public char[] getStringChars() throws ConditionThrowable
+ public char[] getStringChars()
{
if (capacity != 0)
accessError();
@@ -59,7 +59,7 @@
}
@Override
- public String getStringValue() throws ConditionThrowable
+ public String getStringValue()
{
if (capacity != 0)
accessError();
@@ -79,7 +79,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.NIL_VECTOR)
return T;
@@ -103,7 +103,7 @@
}
@Override
- public boolean equal(LispObject obj) throws ConditionThrowable
+ public boolean equal(LispObject obj)
{
if (obj instanceof NilVector) {
if (capacity != ((NilVector)obj).capacity)
@@ -128,7 +128,7 @@
return false;
}
- public String getValue() throws ConditionThrowable
+ public String getValue()
{
if (capacity == 0)
return "";
@@ -156,31 +156,31 @@
}
@Override
- public LispObject CHAR(int index) throws ConditionThrowable
+ public LispObject CHAR(int index)
{
return accessError();
}
@Override
- public LispObject SCHAR(int index) throws ConditionThrowable
+ public LispObject SCHAR(int index)
{
return accessError();
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
return accessError();
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
storeError(newValue);
}
@Override
- public char charAt(int index) throws ConditionThrowable
+ public char charAt(int index)
{
accessError();
// Not reached.
@@ -188,13 +188,13 @@
}
@Override
- public void setCharAt(int index, char c) throws ConditionThrowable
+ public void setCharAt(int index, char c)
{
storeError(LispCharacter.getInstance(c));
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
if (capacity == 0 && start == 0 && end == 0)
return this;
@@ -202,34 +202,34 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
storeError(obj);
}
@Override
- public void fill(char c) throws ConditionThrowable
+ public void fill(char c)
{
storeError(LispCharacter.getInstance(c));
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
return accessError();
}
- public LispObject accessError() throws ConditionThrowable
+ public LispObject accessError()
{
return error(new TypeError("Attempt to access an array of element type NIL."));
}
- private void storeError(LispObject obj) throws ConditionThrowable
+ private void storeError(LispObject obj)
{
error(new TypeError(String.valueOf(obj) + " is not of type NIL."));
}
@@ -250,7 +250,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
accessError();
// Not reached.
@@ -260,7 +260,7 @@
@Override
public AbstractVector adjustArray(int size, AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
accessError();
// Not reached.
Modified: trunk/abcl/src/org/armedbear/lisp/Operator.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Operator.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Operator.java Fri Nov 6 15:07:54 2009
@@ -60,7 +60,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject result = NIL;
result = result.push(new Cons("lambda-name", lambdaName));
Modified: trunk/abcl/src/org/armedbear/lisp/Package.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Package.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Package.java Fri Nov 6 15:07:54 2009
@@ -95,7 +95,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.PACKAGE)
return T;
@@ -135,7 +135,7 @@
return nicknames;
}
- public final synchronized boolean delete() throws ConditionThrowable
+ public final synchronized boolean delete()
{
if (name != null) {
Packages.deletePackage(this);
@@ -162,7 +162,7 @@
}
public final synchronized void rename(String newName, LispObject newNicks)
- throws ConditionThrowable
+
{
ArrayList<String> arrayList = null;
while (newNicks != NIL) {
@@ -198,14 +198,14 @@
// Returns null if symbol is not accessible in this package.
public synchronized Symbol findAccessibleSymbol(String name)
- throws ConditionThrowable
+
{
return findAccessibleSymbol(new SimpleString(name));
}
// Returns null if symbol is not accessible in this package.
public synchronized Symbol findAccessibleSymbol(SimpleString name)
- throws ConditionThrowable
+
{
// Look in external and internal symbols of this package.
Symbol symbol = externalSymbols.get(name);
@@ -230,7 +230,7 @@
}
public synchronized LispObject findSymbol(String name)
- throws ConditionThrowable
+
{
final SimpleString s = new SimpleString(name);
final LispThread thread = LispThread.currentThread();
@@ -366,7 +366,7 @@
}
public synchronized Symbol internAndExport(String symbolName)
- throws ConditionThrowable
+
{
final SimpleString s = new SimpleString(symbolName);
final int hash = s.sxhash();
@@ -401,7 +401,7 @@
}
public synchronized LispObject unintern(final Symbol symbol)
- throws ConditionThrowable
+
{
final String symbolName = symbol.getName();
final boolean shadow;
@@ -453,7 +453,7 @@
return T;
}
- public synchronized void importSymbol(Symbol symbol) throws ConditionThrowable
+ public synchronized void importSymbol(Symbol symbol)
{
if (symbol.getPackage() == this)
return; // Nothing to do.
@@ -471,7 +471,7 @@
symbol.setPackage(this);
}
- public synchronized void export(final Symbol symbol) throws ConditionThrowable
+ public synchronized void export(final Symbol symbol)
{
final String symbolName = symbol.getName();
boolean added = false;
@@ -527,7 +527,7 @@
}
public synchronized void unexport(final Symbol symbol)
- throws ConditionThrowable
+
{
if (symbol.getPackage() == this) {
if (externalSymbols.get(symbol.name) == symbol) {
@@ -554,7 +554,7 @@
}
public synchronized void shadow(final String symbolName)
- throws ConditionThrowable
+
{
if (shadowingSymbols == null)
shadowingSymbols = new HashMap<String,Symbol>();
@@ -576,7 +576,7 @@
shadowingSymbols.put(symbolName, symbol);
}
- public synchronized void shadowingImport(Symbol symbol) throws ConditionThrowable
+ public synchronized void shadowingImport(Symbol symbol)
{
LispObject where = NIL;
final String symbolName = symbol.getName();
@@ -622,7 +622,7 @@
// "USE-PACKAGE causes PACKAGE to inherit all the external symbols of
// PACKAGES-TO-USE. The inherited symbols become accessible as internal
// symbols of PACKAGE."
- public void usePackage(Package pkg) throws ConditionThrowable
+ public void usePackage(Package pkg)
{
if (useList == null)
useList = NIL;
@@ -654,7 +654,7 @@
}
}
- public void unusePackage(Package pkg) throws ConditionThrowable
+ public void unusePackage(Package pkg)
{
if (useList instanceof Cons) {
if (memq(pkg, useList)) {
@@ -674,7 +674,7 @@
}
}
- public final void addNickname(String s) throws ConditionThrowable
+ public final void addNickname(String s)
{
// This call will signal an error if there's a naming conflict.
Packages.addNickname(this, s);
@@ -714,7 +714,7 @@
return useList;
}
- public boolean uses(LispObject pkg) throws ConditionThrowable
+ public boolean uses(LispObject pkg)
{
return (useList instanceof Cons) && memq(pkg, useList);
}
@@ -849,7 +849,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (_PRINT_FASL_.symbolValue() != NIL && name != null) {
FastStringBuffer sb = new FastStringBuffer("#.(FIND-PACKAGE \"");
Modified: trunk/abcl/src/org/armedbear/lisp/PackageError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/PackageError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/PackageError.java Fri Nov 6 15:07:54 2009
@@ -35,14 +35,14 @@
public final class PackageError extends LispError
{
- public PackageError(LispObject initArgs) throws ConditionThrowable
+ public PackageError(LispObject initArgs)
{
super(StandardClass.PACKAGE_ERROR);
initialize(initArgs);
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
@@ -76,7 +76,7 @@
setPackage(pkg);
}
- public PackageError(String message) throws ConditionThrowable
+ public PackageError(String message)
{
super(StandardClass.PACKAGE_ERROR);
setFormatControl(message);
@@ -95,7 +95,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.PACKAGE_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java Fri Nov 6 15:07:54 2009
@@ -40,7 +40,7 @@
private static final Primitive PACKAGEP = new Primitive("packagep", "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof Package ? T : NIL;
}
@@ -52,7 +52,7 @@
new Primitive("package-name", "package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).NAME();
}
@@ -64,7 +64,7 @@
new Primitive("package-nicknames", "package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).packageNicknames();
}
@@ -76,7 +76,7 @@
new Primitive("package-use-list", "package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).getUseList();
}
@@ -88,7 +88,7 @@
new Primitive("package-used-by-list", "package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).getUsedByList();
}
@@ -100,7 +100,7 @@
new Primitive("%import", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length == 0 || args.length > 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -124,7 +124,7 @@
new Primitive("unexport", "symbols &optional package")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length == 0 || args.length > 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -148,7 +148,7 @@
new Primitive("shadow", "symbol-names &optional package")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length == 0 || args.length > 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -172,7 +172,7 @@
new Primitive("shadowing-import", "symbols &optional package")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length == 0 || args.length > 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -196,7 +196,7 @@
new Primitive("package-shadowing-symbols", "package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).getShadowingSymbols();
}
@@ -207,7 +207,7 @@
new Primitive("delete-package", "package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).delete() ? T : NIL;
}
@@ -219,7 +219,7 @@
new Primitive("unuse-package", "packages-to-unuse &optional package")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1 || args.length > 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -246,7 +246,7 @@
new Primitive("rename-package", "package new-name &optional new-nicknames")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 2 || args.length > 3)
return error(new WrongNumberOfArgumentsException(this));
@@ -274,7 +274,7 @@
new Primitive("%defpackage", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 10)
return error(new WrongNumberOfArgumentsException(this));
Modified: trunk/abcl/src/org/armedbear/lisp/Packages.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Packages.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Packages.java Fri Nov 6 15:07:54 2009
@@ -63,7 +63,7 @@
}
public static final synchronized void addPackage(Package pkg)
- throws ConditionThrowable
+
{
final String name = pkg.getName();
if (map.get(name) != null)
@@ -91,7 +91,7 @@
}
public static final synchronized Package makePackage(String name)
- throws ConditionThrowable
+
{
if (map.get(name) != null)
{
@@ -106,7 +106,7 @@
}
public static final synchronized void addNickname(Package pkg, String nickname)
- throws ConditionThrowable
+
{
Object obj = map.get(nickname);
if (obj != null && obj != pkg)
Modified: trunk/abcl/src/org/armedbear/lisp/ParseError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ParseError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ParseError.java Fri Nov 6 15:07:54 2009
@@ -35,14 +35,14 @@
public final class ParseError extends LispError
{
- public ParseError(String message) throws ConditionThrowable
+ public ParseError(String message)
{
super(StandardClass.PARSE_ERROR);
setFormatControl(message);
setFormatArguments(NIL);
}
- public ParseError(LispObject initArgs) throws ConditionThrowable
+ public ParseError(LispObject initArgs)
{
super(StandardClass.PARSE_ERROR);
initialize(initArgs);
@@ -61,7 +61,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.PARSE_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java Fri Nov 6 15:07:54 2009
@@ -58,12 +58,12 @@
{
}
- public Pathname(String s) throws ConditionThrowable
+ public Pathname(String s)
{
init(s);
}
- public Pathname(URL url) throws ConditionThrowable
+ public Pathname(URL url)
{
String protocol = url.getProtocol();
if ("jar".equals(protocol)) {
@@ -109,7 +109,7 @@
error(new LispError("Unsupported URL: \"" + url.toString() + '"'));
}
- private final void init(String s) throws ConditionThrowable
+ private final void init(String s)
{
if (s == null)
return;
@@ -230,7 +230,7 @@
}
private static final LispObject parseDirectory(String d)
- throws ConditionThrowable
+
{
if (d.equals("/") || (Utilities.isPlatformWindows && d.equals("\\")))
return new Cons(Keyword.ABSOLUTE);
@@ -261,7 +261,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject parts = NIL;
parts = parts.push(new Cons("HOST", host));
@@ -286,7 +286,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.PATHNAME)
return T;
@@ -300,7 +300,7 @@
return device;
}
- public String getNamestring() throws ConditionThrowable
+ public String getNamestring()
{
if (namestring != null)
return namestring;
@@ -378,7 +378,7 @@
return namestring = sb.toString();
}
- protected String getDirectoryNamestring() throws ConditionThrowable
+ protected String getDirectoryNamestring()
{
validateDirectory(true);
FastStringBuffer sb = new FastStringBuffer();
@@ -430,7 +430,7 @@
}
@Override
- public boolean equal(LispObject obj) throws ConditionThrowable
+ public boolean equal(LispObject obj)
{
if (this == obj)
return true;
@@ -472,7 +472,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
return equal(obj);
}
@@ -488,7 +488,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
try {
final LispThread thread = LispThread.currentThread();
@@ -586,13 +586,13 @@
LOGICAL_PATHNAME_TRANSLATIONS);
public static Pathname parseNamestring(String s)
- throws ConditionThrowable
+
{
return new Pathname(s);
}
public static Pathname parseNamestring(AbstractString namestring)
- throws ConditionThrowable
+
{
// Check for a logical pathname host.
String s = namestring.getStringValue();
@@ -606,7 +606,7 @@
public static Pathname parseNamestring(AbstractString namestring,
AbstractString host)
- throws ConditionThrowable
+
{
// Look for a logical pathname host in the namestring.
String s = namestring.getStringValue();
@@ -642,7 +642,7 @@
}
private static final void checkCaseArgument(LispObject arg)
- throws ConditionThrowable
+
{
if (arg != Keyword.COMMON && arg != Keyword.LOCAL)
type_error(arg, list(Symbol.MEMBER, Keyword.COMMON,
@@ -655,7 +655,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkCaseArgument(second);
return coerceToPathname(first).host;
@@ -668,7 +668,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkCaseArgument(second);
return coerceToPathname(first).device;
@@ -681,7 +681,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkCaseArgument(second);
return coerceToPathname(first).directory;
@@ -694,7 +694,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkCaseArgument(second);
return coerceToPathname(first).name;
@@ -707,7 +707,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkCaseArgument(second);
return coerceToPathname(first).type;
@@ -719,7 +719,7 @@
new Primitive("pathname-version", "pathname")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPathname(arg).version;
}
@@ -731,7 +731,7 @@
new Primitive("namestring", "pathname")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname pathname = coerceToPathname(arg);
String namestring = pathname.getNamestring();
@@ -748,7 +748,7 @@
new Primitive("directory-namestring", "pathname")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new SimpleString(coerceToPathname(arg).getDirectoryNamestring());
}
@@ -759,7 +759,7 @@
new Primitive("pathname", "pathspec")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPathname(arg);
}
@@ -773,7 +773,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final AbstractString namestring = checkString(first);
@@ -805,7 +805,7 @@
{
@Override
public LispObject execute(LispObject[] args)
- throws ConditionThrowable
+
{
return _makePathname(args);
}
@@ -813,13 +813,13 @@
// Used by the #p reader.
public static final Pathname makePathname(LispObject args)
- throws ConditionThrowable
+
{
return _makePathname(args.copyToArray());
}
private static final Pathname _makePathname(LispObject[] args)
- throws ConditionThrowable
+
{
if (args.length % 2 != 0)
error(new ProgramError("Odd number of keyword arguments."));
@@ -937,7 +937,7 @@
}
private static final AbstractString validateStringComponent(AbstractString s)
- throws ConditionThrowable
+
{
final int limit = s.length();
for (int i = 0; i < limit; i++) {
@@ -954,7 +954,7 @@
}
private final boolean validateDirectory(boolean signalError)
- throws ConditionThrowable
+
{
LispObject temp = directory;
while (temp != NIL) {
@@ -983,7 +983,7 @@
new Primitive("pathnamep", "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof Pathname ? T : NIL;
}
@@ -994,7 +994,7 @@
new Primitive("logical-pathname-p", PACKAGE_SYS, true, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof LogicalPathname ? T : NIL;
}
@@ -1005,7 +1005,7 @@
new Primitive("user-homedir-pathname", "&optional host")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
switch (args.length) {
case 0: {
@@ -1027,7 +1027,7 @@
new Primitive("list-directory", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname pathname = coerceToPathname(arg);
if (pathname instanceof LogicalPathname)
@@ -1063,7 +1063,7 @@
}
};
- public boolean isWild() throws ConditionThrowable
+ public boolean isWild()
{
if (host == Keyword.WILD || host == Keyword.WILD_INFERIORS)
return true;
@@ -1090,7 +1090,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Pathname pathname = coerceToPathname(first);
if (second == NIL)
@@ -1131,7 +1131,7 @@
"pathname &optional default-pathname default-version")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname pathname = coerceToPathname(arg);
Pathname defaultPathname =
@@ -1141,7 +1141,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Pathname pathname = coerceToPathname(first);
Pathname defaultPathname =
@@ -1152,7 +1152,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
Pathname pathname = coerceToPathname(first);
Pathname defaultPathname =
@@ -1165,7 +1165,7 @@
public static final Pathname mergePathnames(Pathname pathname,
Pathname defaultPathname,
LispObject defaultVersion)
- throws ConditionThrowable
+
{
Pathname p;
if (pathname instanceof LogicalPathname)
@@ -1226,7 +1226,7 @@
private static final LispObject mergeDirectories(LispObject dir,
LispObject defaultDir)
- throws ConditionThrowable
+
{
if (dir == NIL)
return defaultDir;
@@ -1262,7 +1262,7 @@
public static final LispObject truename(LispObject arg,
boolean errorIfDoesNotExist)
- throws ConditionThrowable
+
{
Pathname pathname = coerceToPathname(arg);
if (pathname instanceof LogicalPathname)
@@ -1303,7 +1303,7 @@
new Primitive("mkdir", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final Pathname pathname = coerceToPathname(arg);
if (pathname.isWild())
@@ -1323,7 +1323,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final Pathname original = (Pathname) truename(first, true);
final String originalNamestring = original.getNamestring();
@@ -1360,7 +1360,7 @@
new Primitive("file-namestring", "pathname")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname p = coerceToPathname(arg);
FastStringBuffer sb = new FastStringBuffer();
@@ -1384,7 +1384,7 @@
new Primitive("host-namestring", "pathname")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPathname(arg).host;
}
Modified: trunk/abcl/src/org/armedbear/lisp/Primitive.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Primitive.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Primitive.java Fri Nov 6 15:07:54 2009
@@ -94,14 +94,14 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
LispObject[] args = new LispObject[0];
return execute(args);
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
LispObject[] args = new LispObject[1];
args[0] = arg;
@@ -110,7 +110,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[2];
args[0] = first;
@@ -121,7 +121,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[3];
args[0] = first;
@@ -133,7 +133,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[4];
args[0] = first;
@@ -147,7 +147,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[5];
args[0] = first;
@@ -162,7 +162,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[6];
args[0] = first;
@@ -179,7 +179,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[7];
args[0] = first;
@@ -197,7 +197,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
LispObject[] args = new LispObject[8];
args[0] = first;
Modified: trunk/abcl/src/org/armedbear/lisp/Primitives.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Primitives.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Primitives.java Fri Nov 6 15:07:54 2009
@@ -48,7 +48,7 @@
return Fixnum.ONE;
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg.numberp())
return arg;
@@ -56,12 +56,12 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.multiplyBy(second);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = Fixnum.ONE;
for (int i = 0; i < args.length; i++)
@@ -75,23 +75,23 @@
new Primitive(Symbol.SLASH, "numerator &rest denominators")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.ONE.divideBy(arg);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.divideBy(second);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = args[0];
for (int i = 1; i < args.length; i++)
@@ -105,12 +105,12 @@
new Primitive(Symbol.MIN, "&rest reals")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg.realp())
return arg;
@@ -118,12 +118,12 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isLessThan(second) ? first : second;
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = args[0];
if (!result.realp())
@@ -142,12 +142,12 @@
new Primitive(Symbol.MAX, "&rest reals")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg.realp())
return arg;
@@ -155,12 +155,12 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isGreaterThan(second) ? first : second;
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = args[0];
if (!result.realp())
@@ -179,7 +179,7 @@
new Primitive(Symbol.IDENTITY, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg;
}
@@ -190,7 +190,7 @@
new Primitive(Symbol.COMPILED_FUNCTION_P, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.typep(Symbol.COMPILED_FUNCTION);
}
@@ -201,7 +201,7 @@
new Primitive(Symbol.CONSP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof Cons ? T : NIL;
}
@@ -212,7 +212,7 @@
new Primitive(Symbol.LISTP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.LISTP();
}
@@ -223,7 +223,7 @@
new Primitive(Symbol.ABS, "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.ABS();
}
@@ -234,7 +234,7 @@
new Primitive(Symbol.ARRAYP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof AbstractArray ? T : NIL;
}
@@ -245,7 +245,7 @@
new Primitive(Symbol.ARRAY_HAS_FILL_POINTER_P, "array")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkArray(arg).hasFillPointer() ? T : NIL;
}
@@ -256,7 +256,7 @@
new Primitive(Symbol.VECTORP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.VECTORP();
}
@@ -267,7 +267,7 @@
new Primitive(Symbol.SIMPLE_VECTOR_P, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof SimpleVector ? T : NIL;
}
@@ -278,7 +278,7 @@
new Primitive(Symbol.BIT_VECTOR_P, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof AbstractBitVector ? T : NIL;
}
@@ -289,7 +289,7 @@
new Primitive(Symbol.SIMPLE_BIT_VECTOR_P, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.typep(Symbol.SIMPLE_BIT_VECTOR);
}
@@ -300,7 +300,7 @@
new Primitive("%eval", PACKAGE_SYS, false, "form")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return eval(arg, new Environment(), LispThread.currentThread());
}
@@ -311,7 +311,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first == second ? T : NIL;
}
@@ -322,7 +322,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.eql(second) ? T : NIL;
}
@@ -333,7 +333,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.equal(second) ? T : NIL;
}
@@ -344,7 +344,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.equalp(second) ? T : NIL;
}
@@ -395,7 +395,7 @@
new Primitive(Symbol.VALUES_LIST, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == NIL)
return LispThread.currentThread().setValues();
@@ -411,7 +411,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return new Cons(first, second);
}
@@ -422,7 +422,7 @@
new Primitive(Symbol.LENGTH, "sequence")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.LENGTH();
}
@@ -434,7 +434,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.elt(Fixnum.getValue(second));
}
@@ -444,7 +444,7 @@
private static final Primitive ATOM = new Primitive(Symbol.ATOM, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof Cons ? NIL : T;
}
@@ -455,13 +455,13 @@
new Primitive(Symbol.CONSTANTP, "form &optional environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.constantp() ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.constantp() ? T : NIL;
}
@@ -472,7 +472,7 @@
new Primitive(Symbol.FUNCTIONP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return (arg instanceof Function || arg instanceof StandardGenericFunction) ? T : NIL;
}
@@ -483,7 +483,7 @@
new Primitive(Symbol.SPECIAL_OPERATOR_P, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.isSpecialOperator() ? T : NIL;
}
@@ -494,7 +494,7 @@
new Primitive(Symbol.SYMBOLP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof Symbol ? T : NIL;
}
@@ -504,7 +504,7 @@
private static final Primitive ENDP = new Primitive(Symbol.ENDP, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.endp() ? T : NIL;
}
@@ -514,7 +514,7 @@
private static final Primitive NULL = new Primitive(Symbol.NULL, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg == NIL ? T : NIL;
}
@@ -524,7 +524,7 @@
private static final Primitive NOT = new Primitive(Symbol.NOT, "x")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg == NIL ? T : NIL;
}
@@ -534,7 +534,7 @@
private static final Primitive PLUSP = new Primitive(Symbol.PLUSP, "real")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.PLUSP();
}
@@ -545,7 +545,7 @@
new Primitive(Symbol.MINUSP, "real")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.MINUSP();
}
@@ -556,7 +556,7 @@
new Primitive(Symbol.ZEROP, "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.ZEROP();
}
@@ -567,7 +567,7 @@
new Primitive("fixnump", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof Fixnum ? T : NIL;
}
@@ -578,7 +578,7 @@
new Primitive(Symbol.SYMBOL_VALUE, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispObject value;
value = checkSymbol(arg).symbolValue();
@@ -595,7 +595,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return LispThread.currentThread().setSpecialVariable(checkSymbol(first),
second);
@@ -608,7 +608,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
first.setCar(second);
return first;
@@ -621,7 +621,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
first.setCdr(second);
return first;
@@ -638,7 +638,7 @@
return Fixnum.ZERO;
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg.numberp())
return arg;
@@ -646,19 +646,19 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.add(second);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return first.add(second).add(third);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = Fixnum.ZERO;
final int length = args.length;
@@ -673,7 +673,7 @@
new Primitive(Symbol.ONE_PLUS, "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.incr();
}
@@ -684,23 +684,23 @@
new Primitive(Symbol.MINUS, "minuend &rest subtrahends")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.negate();
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.subtract(second);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = args[0];
for (int i = 1; i < args.length; i++)
@@ -714,7 +714,7 @@
new Primitive(Symbol.ONE_MINUS, "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.decr();
}
@@ -726,7 +726,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args == NIL)
return error(new WrongNumberOfArgumentsException(this));
@@ -747,7 +747,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args == NIL)
return error(new WrongNumberOfArgumentsException(this));
@@ -768,7 +768,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStream(second)._writeString(first.writeToString());
return first;
@@ -781,7 +781,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final LispObject out;
if (second == T)
@@ -800,7 +800,7 @@
new Primitive("%write-to-string", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new SimpleString(arg.writeToString());
}
@@ -811,7 +811,7 @@
new Primitive("%stream-terpri", PACKAGE_SYS, true, "output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
checkStream(arg)._writeChar('\n');
return NIL;
@@ -823,7 +823,7 @@
new Primitive("%terpri", PACKAGE_SYS, false, "output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == T)
arg = Symbol.TERMINAL_IO.symbolValue();
@@ -841,7 +841,7 @@
new Primitive("%fresh-line", PACKAGE_SYS, false, "output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == T)
arg = Symbol.TERMINAL_IO.symbolValue();
@@ -860,7 +860,7 @@
new Primitive(Symbol.BOUNDP, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final Symbol symbol;
symbol = checkSymbol(arg);
@@ -881,7 +881,7 @@
new Primitive(Symbol.FBOUNDP, "name")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Symbol)
return arg.getSymbolFunction() != null ? T : NIL;
@@ -899,7 +899,7 @@
new Primitive(Symbol.FMAKUNBOUND, "name")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Symbol)
{
@@ -920,7 +920,7 @@
new Primitive("setf-function-name-p", PACKAGE_SYS, true, "thing")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return isValidSetfFunctionName(arg) ? T : NIL;
}
@@ -932,7 +932,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return remprop(checkSymbol(first), second);
}
@@ -954,7 +954,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first == NIL)
return second;
@@ -975,7 +975,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first == NIL)
return execute(second, third);
@@ -1000,7 +1000,7 @@
return result;
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
Cons result = null;
Cons splice = null;
@@ -1057,7 +1057,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first == NIL)
return second;
@@ -1076,7 +1076,7 @@
return type_error(first, Symbol.LIST);
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
LispObject result = null;
Cons splice = null;
@@ -1122,7 +1122,7 @@
new Primitive(Symbol.EQUALS, "&rest numbers")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -1133,14 +1133,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isEqualTo(second) ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first.isEqualTo(second) && second.isEqualTo(third))
return T;
@@ -1148,7 +1148,7 @@
return NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
final LispObject obj = array[0];
@@ -1167,7 +1167,7 @@
new Primitive(Symbol.NOT_EQUALS, "&rest numbers")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -1178,14 +1178,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isNotEqualTo(second) ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first.isEqualTo(second))
return NIL;
@@ -1196,7 +1196,7 @@
return T;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
for (int i = 0; i < length; i++)
@@ -1218,7 +1218,7 @@
new Primitive(Symbol.LT, "&rest numbers")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -1229,14 +1229,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isLessThan(second) ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first.isLessThan(second) && second.isLessThan(third))
return T;
@@ -1244,7 +1244,7 @@
return NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
for (int i = 1; i < length; i++)
@@ -1261,7 +1261,7 @@
new Primitive(Symbol.LE, "&rest numbers")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -1272,14 +1272,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isLessThanOrEqualTo(second) ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first.isLessThanOrEqualTo(second) && second.isLessThanOrEqualTo(third))
return T;
@@ -1287,7 +1287,7 @@
return NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
for (int i = 1; i < length; i++)
@@ -1304,7 +1304,7 @@
new Primitive(Symbol.GT, "&rest numbers")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -1315,14 +1315,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isGreaterThan(second) ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first.isGreaterThan(second) && second.isGreaterThan(third))
return T;
@@ -1330,7 +1330,7 @@
return NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
for (int i = 1; i < length; i++)
@@ -1347,7 +1347,7 @@
new Primitive(Symbol.GE, "&rest numbers")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@@ -1358,14 +1358,14 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.isGreaterThanOrEqualTo(second) ? T : NIL;
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first.isGreaterThanOrEqualTo(second) && second.isGreaterThanOrEqualTo(third))
return T;
@@ -1373,7 +1373,7 @@
return NIL;
}
@Override
- public LispObject execute(LispObject[] array) throws ConditionThrowable
+ public LispObject execute(LispObject[] array)
{
final int length = array.length;
for (int i = 1; i < length; i++)
@@ -1390,7 +1390,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return second.NTH(first);
}
@@ -1403,7 +1403,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
int index = Fixnum.getValue(first);
if (index < 0)
@@ -1433,7 +1433,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final int index = Fixnum.getValue(first);
if (index < 0)
@@ -1455,7 +1455,7 @@
new Primitive(Symbol.ERROR, "datum &rest arguments")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
Error e = new Error();
@@ -1483,7 +1483,7 @@
new Primitive(Symbol.AUTOCOMPILE, "function")
{
@Override
- public LispObject execute(LispObject function) throws ConditionThrowable
+ public LispObject execute(LispObject function)
{
return NIL;
}
@@ -1500,7 +1500,7 @@
new Primitive(Symbol.SIGNAL, "datum &rest arguments")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -1517,7 +1517,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(first));
}
@@ -1531,7 +1531,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
LispObject destination = first;
// Copy remaining arguments.
@@ -1544,7 +1544,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
LispObject destination = first;
// Copy remaining arguments.
@@ -1556,7 +1556,7 @@
return outputFormattedString(s, destination);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -1569,7 +1569,7 @@
return outputFormattedString(s, destination);
}
private final String _format(LispObject[] args)
- throws ConditionThrowable
+
{
LispObject formatControl = args[0];
LispObject formatArguments = NIL;
@@ -1580,7 +1580,7 @@
}
private final LispObject outputFormattedString(String s,
LispObject destination)
- throws ConditionThrowable
+
{
if (destination == T)
{
@@ -1614,7 +1614,7 @@
internSpecial("*SIMPLE-FORMAT-FUNCTION*", PACKAGE_SYS, _FORMAT);
private static void checkRedefinition(LispObject arg)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (_WARN_ON_REDEFINITION_.symbolValue(thread) != NIL)
@@ -1665,7 +1665,7 @@
{
@Override
public LispObject execute(LispObject name, LispObject definition)
- throws ConditionThrowable
+
{
if (name instanceof Symbol)
{
@@ -1694,7 +1694,7 @@
new Primitive("fdefinition-block-name", PACKAGE_SYS, true, "function-name")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Symbol)
return arg;
@@ -1709,7 +1709,7 @@
new Primitive(Symbol.MACRO_FUNCTION, "symbol &optional environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
LispObject obj = arg.getSymbolFunction();
if (obj instanceof AutoloadMacro)
@@ -1734,7 +1734,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
LispObject obj;
if (second != NIL)
@@ -1772,7 +1772,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
Symbol symbol = checkSymbol(args.car());
LispObject lambdaList = checkList(args.cadr());
@@ -1806,7 +1806,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return new MacroObject(first, second);
}
@@ -1817,7 +1817,7 @@
new Primitive("macro-function-p", PACKAGE_SYS, true, "value")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return (arg instanceof MacroObject) ? T : NIL;
}
@@ -1829,7 +1829,7 @@
new Primitive("make-symbol-macro", PACKAGE_SYS, true, "expansion")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new SymbolMacro(arg);
}
@@ -1840,7 +1840,7 @@
new Primitive("symbol-macro-p", PACKAGE_SYS, true, "value")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return (arg instanceof SymbolMacro) ? T : NIL;
}
@@ -1853,7 +1853,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final Symbol symbol;
symbol = checkSymbol(first);
@@ -1871,7 +1871,7 @@
new Primitive("%defvar", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final Symbol symbol;
symbol = checkSymbol(arg);
@@ -1880,7 +1880,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final Symbol symbol;
symbol = checkSymbol(first);
@@ -1896,7 +1896,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final Symbol symbol;
symbol = checkSymbol(first);
@@ -1918,7 +1918,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = NIL;
@@ -1949,7 +1949,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject key = eval(args.car(), env, thread);
@@ -1996,7 +1996,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject key = eval(args.car(), env, thread);
@@ -2062,13 +2062,13 @@
"typespec &optional environment")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return getUpgradedArrayElementType(arg);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
// Ignore environment.
return getUpgradedArrayElementType(first);
@@ -2080,7 +2080,7 @@
new Primitive(Symbol.ARRAY_RANK, "array")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(checkArray(arg).getRank());
@@ -2093,7 +2093,7 @@
new Primitive(Symbol.ARRAY_DIMENSIONS, "array")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkArray(arg).getDimensions();
}
@@ -2105,7 +2105,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final AbstractArray array = checkArray(first);
return Fixnum.getInstance(array.getDimension(Fixnum.getValue(second)));
@@ -2117,7 +2117,7 @@
new Primitive(Symbol.ARRAY_TOTAL_SIZE, "array")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(checkArray(arg).getTotalSize());
}
@@ -2130,7 +2130,7 @@
new Primitive(Symbol.ARRAY_ELEMENT_TYPE, "array")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkArray(arg).getElementType();
}
@@ -2141,7 +2141,7 @@
new Primitive(Symbol.ADJUSTABLE_ARRAY_P, "array")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkArray(arg).isAdjustable() ? T : NIL;
}
@@ -2152,7 +2152,7 @@
new Primitive(Symbol.ARRAY_DISPLACEMENT, "array")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkArray(arg).arrayDisplacement();
@@ -2164,7 +2164,7 @@
new Primitive(Symbol.ARRAY_IN_BOUNDS_P, "array &rest subscripts")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -2206,7 +2206,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final AbstractArray array;
array = checkArray(first);
@@ -2220,12 +2220,12 @@
new Primitive(Symbol.AREF, "array &rest subscripts")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final AbstractArray array;
array = checkArray( arg);
@@ -2239,19 +2239,19 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.AREF(second);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return checkArray(first).get(new int[]{Fixnum.getValue(second),Fixnum.getValue(third)} );
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
final AbstractArray array = checkArray(args[0]);
final int[] subs = new int[args.length - 1];
@@ -2270,7 +2270,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
// Rank zero array.
final ZeroRankArray array;
@@ -2289,13 +2289,13 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
first.aset(second, third);
return third;
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
final AbstractArray array = checkArray(args[0]);
final int nsubs = args.length - 2;
@@ -2314,7 +2314,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return checkArray(first).AREF(Fixnum.getValue(second));
}
@@ -2325,7 +2325,7 @@
new Primitive(Symbol.VECTOR, "&rest objects")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return new SimpleVector(args);
}
@@ -2337,7 +2337,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof AbstractArray) {
AbstractArray aa = (AbstractArray)arg;
@@ -2356,7 +2356,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof AbstractVector) {
@@ -2380,7 +2380,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final AbstractVector v = checkVector(second);
int fillPointer = v.getFillPointer();
@@ -2402,7 +2402,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return second.VECTOR_PUSH_EXTEND(first);
}
@@ -2410,7 +2410,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return second.VECTOR_PUSH_EXTEND(first, third);
}
@@ -2421,7 +2421,7 @@
new Primitive(Symbol.VECTOR_POP, "vector")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final AbstractVector v = checkVector( arg);
int fillPointer = v.getFillPointer();
@@ -2441,7 +2441,7 @@
new Primitive(Symbol.TYPE_OF, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.typeOf();
}
@@ -2452,7 +2452,7 @@
new Primitive(Symbol.CLASS_OF, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.classOf();
}
@@ -2464,7 +2464,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.typep(second);
}
@@ -2476,7 +2476,7 @@
new Primitive(Symbol.FUNCTION_LAMBDA_EXPRESSION, "function")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispObject value1, value2, value3;
if (arg instanceof CompiledClosure)
@@ -2525,32 +2525,32 @@
new Primitive(Symbol.FUNCALL, "function &rest args")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return LispThread.currentThread().execute(arg);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(first, second);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(first, second, third);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(first, second, third,
fourth);
@@ -2559,7 +2559,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(first, second, third,
fourth, fifth);
@@ -2568,7 +2568,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(first, second, third,
fourth, fifth, sixth);
@@ -2578,7 +2578,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(first, second, third,
fourth, fifth, sixth,
@@ -2589,14 +2589,14 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eigth)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(first, second, third,
fourth, fifth, sixth,
seventh, eigth);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
final int length = args.length - 1; // Number of arguments.
if (length == 8)
@@ -2621,18 +2621,18 @@
new Primitive(Symbol.APPLY, "function &rest args")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
public LispObject execute(LispObject fun, LispObject args)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final int length = args.length();
@@ -2666,7 +2666,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (third.listp())
{
@@ -2684,7 +2684,7 @@
return type_error(third, Symbol.LIST);
}
@Override
- public LispObject execute(final LispObject[] args) throws ConditionThrowable
+ public LispObject execute(final LispObject[] args)
{
final int numArgs = args.length;
LispObject spread = args[numArgs - 1];
@@ -2712,7 +2712,7 @@
{
@Override
public LispObject execute(LispObject fun, LispObject list)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = NIL;
@@ -2744,7 +2744,7 @@
@Override
public LispObject execute(LispObject fun, LispObject list1,
LispObject list2)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = NIL;
@@ -2772,7 +2772,7 @@
}
@Override
public LispObject execute(final LispObject[] args)
- throws ConditionThrowable
+
{
final int numArgs = args.length;
if (numArgs < 2)
@@ -2814,7 +2814,7 @@
{
@Override
public LispObject execute(LispObject fun, LispObject list)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = list;
@@ -2834,7 +2834,7 @@
@Override
public LispObject execute(LispObject fun, LispObject list1,
LispObject list2)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = list1;
@@ -2849,7 +2849,7 @@
}
@Override
public LispObject execute(final LispObject[] args)
- throws ConditionThrowable
+
{
final int numArgs = args.length;
if (numArgs < 2)
@@ -2887,7 +2887,7 @@
new Primitive(Symbol.MACROEXPAND, "form &optional env")
{
@Override
- public LispObject execute(LispObject form) throws ConditionThrowable
+ public LispObject execute(LispObject form)
{
return macroexpand(form,
new Environment(),
@@ -2895,7 +2895,7 @@
}
@Override
public LispObject execute(LispObject form, LispObject env)
- throws ConditionThrowable
+
{
return macroexpand(form,
env != NIL ? checkEnvironment(env) : new Environment(),
@@ -2908,7 +2908,7 @@
new Primitive(Symbol.MACROEXPAND_1, "form &optional env")
{
@Override
- public LispObject execute(LispObject form) throws ConditionThrowable
+ public LispObject execute(LispObject form)
{
return macroexpand_1(form,
new Environment(),
@@ -2916,7 +2916,7 @@
}
@Override
public LispObject execute(LispObject form, LispObject env)
- throws ConditionThrowable
+
{
return macroexpand_1(form,
env != NIL ? checkEnvironment(env) : new Environment(),
@@ -2929,12 +2929,12 @@
new Primitive(Symbol.GENSYM, "&optional x")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return gensym("G", LispThread.currentThread());
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Fixnum)
{
@@ -2969,7 +2969,7 @@
private static final Primitive STRING = new Primitive(Symbol.STRING, "x")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.STRING();
}
@@ -2983,7 +2983,7 @@
new Primitive(Symbol.INTERN, "string &optional package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final SimpleString s;
if (arg instanceof SimpleString)
@@ -2996,7 +2996,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final SimpleString s;
if (first instanceof SimpleString)
@@ -3014,7 +3014,7 @@
new Primitive(Symbol.UNINTERN, "symbol &optional package")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length == 0 || args.length > 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -3033,7 +3033,7 @@
new Primitive(Symbol.FIND_PACKAGE, "name")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Package)
return arg;
@@ -3070,7 +3070,7 @@
*/
@Override
public LispObject execute()
- throws ConditionThrowable
+
{
return new Package();
}
@@ -3081,7 +3081,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
String packageName = javaString(first);
Package pkg = Packages.findPackage(packageName);
@@ -3164,7 +3164,7 @@
new Primitive("%in-package", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final String packageName = javaString(arg);
final Package pkg = Packages.findPackage(packageName);
@@ -3187,7 +3187,7 @@
new Primitive(Symbol.USE_PACKAGE, "packages-to-use &optional package")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1 || args.length > 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -3216,7 +3216,7 @@
new Primitive("package-symbols", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).getSymbols();
}
@@ -3227,7 +3227,7 @@
new Primitive("package-internal-symbols", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).PACKAGE_INTERNAL_SYMBOLS();
}
@@ -3238,7 +3238,7 @@
new Primitive("package-external-symbols", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).PACKAGE_EXTERNAL_SYMBOLS();
}
@@ -3249,7 +3249,7 @@
new Primitive("package-inherited-symbols", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToPackage(arg).PACKAGE_INHERITED_SYMBOLS();
}
@@ -3260,7 +3260,7 @@
new Primitive(Symbol.EXPORT, "symbols &optional package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final Package pkg = (Package) Symbol._PACKAGE_.symbolValue();
if (arg instanceof Cons)
@@ -3275,7 +3275,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Cons)
{
@@ -3294,14 +3294,14 @@
new Primitive(Symbol.FIND_SYMBOL, "string &optional package")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return getCurrentPackage().findSymbol(arg.getStringValue());
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return coerceToPackage(second).findSymbol(first.getStringValue());
}
@@ -3314,21 +3314,21 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return execute(first, second, NIL, NIL, NIL);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return execute(first, second, third, NIL, NIL);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return execute(first, second, third, fourth, NIL);
}
@@ -3336,7 +3336,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
if (first instanceof Symbol)
{
@@ -3383,7 +3383,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSymbol(first).setPropertyList(checkList(second));
return second;
@@ -3396,14 +3396,14 @@
{
@Override
public LispObject execute(LispObject plist, LispObject indicator)
- throws ConditionThrowable
+
{
return getf(plist, indicator, NIL);
}
@Override
public LispObject execute(LispObject plist, LispObject indicator,
LispObject defaultValue)
- throws ConditionThrowable
+
{
return getf(plist, indicator, defaultValue);
}
@@ -3415,14 +3415,14 @@
{
@Override
public LispObject execute(LispObject symbol, LispObject indicator)
- throws ConditionThrowable
+
{
return get(symbol, indicator, NIL);
}
@Override
public LispObject execute(LispObject symbol, LispObject indicator,
LispObject defaultValue)
- throws ConditionThrowable
+
{
return get(symbol, indicator, defaultValue);
}
@@ -3435,14 +3435,14 @@
@Override
public LispObject execute(LispObject symbol, LispObject indicator,
LispObject value)
- throws ConditionThrowable
+
{
return put(checkSymbol(symbol), indicator, value);
}
@Override
public LispObject execute(LispObject symbol, LispObject indicator,
LispObject defaultValue, LispObject value)
- throws ConditionThrowable
+
{
return put(checkSymbol(symbol), indicator, value);
}
@@ -3454,7 +3454,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispObject defs = checkList(args.car());
final LispThread thread = LispThread.currentThread();
@@ -3492,7 +3492,7 @@
{
@Override
public LispObject execute(LispObject definition)
- throws ConditionThrowable
+
{
Symbol symbol = checkSymbol(definition.car());
LispObject lambdaList = definition.cadr();
@@ -3518,7 +3518,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
Environment ext = new Environment(env);
try {
@@ -3536,7 +3536,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() != 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -3556,7 +3556,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args == NIL)
return error(new WrongNumberOfArgumentsException(this));
@@ -3593,7 +3593,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final int length = args.length();
if (length < 1 || length > 2)
@@ -3614,7 +3614,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() < 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -3652,7 +3652,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() != 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -3670,7 +3670,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result;
@@ -3704,7 +3704,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispObject situations = args.car();
if (situations != NIL)
@@ -3728,7 +3728,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispObject vars = args.car();
args = args.cdr();
@@ -3805,7 +3805,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() == 0)
return error(new WrongNumberOfArgumentsException(this));
@@ -3828,7 +3828,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() == 0)
return error(new WrongNumberOfArgumentsException(this));
@@ -3880,7 +3880,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = T;
@@ -3909,7 +3909,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = NIL;
@@ -3939,7 +3939,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() != 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -3965,7 +3965,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() != 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -3992,7 +3992,7 @@
new Primitive("call-count", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(arg.getCallCount());
}
@@ -4004,7 +4004,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
first.setCallCount(Fixnum.getValue(second));
return second;
@@ -4016,7 +4016,7 @@
new Primitive("hot-count", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(arg.getHotCount());
}
@@ -4028,7 +4028,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
first.setHotCount(Fixnum.getValue(second));
return second;
@@ -4040,7 +4040,7 @@
new Primitive("lambda-name", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Operator)
{
@@ -4060,7 +4060,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Operator)
{
@@ -4085,7 +4085,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkVector(first).shrink(Fixnum.getValue(second));
return first;
@@ -4098,7 +4098,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final int start = Fixnum.getValue(second);
if (start < 0)
@@ -4120,7 +4120,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final int start = Fixnum.getValue(second);
if (start < 0)
@@ -4161,7 +4161,7 @@
private static final LispObject list_subseq(LispObject list, int start,
int end)
- throws ConditionThrowable
+
{
int index = 0;
LispObject result = NIL;
@@ -4211,7 +4211,7 @@
new Cons(fourth))));
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = NIL;
for (int i = args.length; i-- > 0;)
@@ -4225,39 +4225,39 @@
new Primitive(Symbol.LIST_STAR, "&rest objects")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new WrongNumberOfArgumentsException(this));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg;
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return new Cons(first, second);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return new Cons(first, new Cons(second, third));
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return new Cons(first,
new Cons(second,
new Cons(third, fourth)));
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
int i = args.length - 1;
LispObject result = args[i];
@@ -4272,7 +4272,7 @@
new Primitive(Symbol.NREVERSE, "sequence")
{
@Override
- public LispObject execute (LispObject arg) throws ConditionThrowable
+ public LispObject execute (LispObject arg)
{
return arg.nreverse();
}
@@ -4284,7 +4284,7 @@
{
@Override
public LispObject execute(LispObject list, LispObject obj)
- throws ConditionThrowable
+
{
if (list instanceof Cons)
{
@@ -4330,7 +4330,7 @@
new Primitive(Symbol.REVERSE, "sequence")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.reverse();
}
@@ -4342,7 +4342,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject sequence)
- throws ConditionThrowable
+
{
if (sequence instanceof AbstractVector)
return ((AbstractVector)sequence).deleteEq(item);
@@ -4357,7 +4357,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject sequence)
- throws ConditionThrowable
+
{
if (sequence instanceof AbstractVector)
return ((AbstractVector)sequence).deleteEql(item);
@@ -4372,7 +4372,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject list)
- throws ConditionThrowable
+
{
if (list instanceof Cons)
{
@@ -4422,7 +4422,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject list)
- throws ConditionThrowable
+
{
if (list instanceof Cons)
{
@@ -4472,7 +4472,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject vector)
- throws ConditionThrowable
+
{
checkVector(vector).deleteEq(item);
return vector;
@@ -4485,7 +4485,7 @@
{
@Override
public LispObject execute(LispObject item, LispObject vector)
- throws ConditionThrowable
+
{
checkVector(vector).deleteEql(item);
return vector;
@@ -4500,7 +4500,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first instanceof AbstractVector)
{
@@ -4537,7 +4537,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
int size = Fixnum.getValue(first);
if (size < 0)
@@ -4558,7 +4558,7 @@
public LispObject execute(LispObject item, LispObject list,
LispObject key, LispObject test,
LispObject testNot)
- throws ConditionThrowable
+
{
LispObject tail = checkList(list);
if (test != NIL && testNot != NIL)
@@ -4632,7 +4632,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first != NIL)
return LispThread.currentThread().execute(first, second);
@@ -4645,7 +4645,7 @@
new Primitive("coerce-to-function", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return coerceToFunction(arg);
}
@@ -4657,7 +4657,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Cons && ((Cons)first).car == Symbol.LAMBDA)
{
@@ -4699,7 +4699,7 @@
new Primitive(Symbol.EVENP, "integer")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.EVENP();
}
@@ -4709,7 +4709,7 @@
private static final Primitive ODDP = new Primitive(Symbol.ODDP, "integer")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.ODDP();
}
@@ -4753,7 +4753,7 @@
new Primitive(Symbol.COMPLEX, "realpart &optional imagpart")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat)
return Complex.getInstance(arg, SingleFloat.ZERO);
@@ -4765,7 +4765,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return Complex.getInstance(first, second);
}
@@ -4787,7 +4787,7 @@
new Primitive(Symbol.NUMERATOR, "rational")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.NUMERATOR();
}
@@ -4798,7 +4798,7 @@
new Primitive(Symbol.DENOMINATOR, "rational")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.DENOMINATOR();
}
@@ -4809,7 +4809,7 @@
new Primitive(Symbol.REALPART, "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Complex)
return ((Complex)arg).getRealPart();
@@ -4824,7 +4824,7 @@
new Primitive(Symbol.IMAGPART, "number")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Complex)
return ((Complex)arg).getImaginaryPart();
@@ -4837,7 +4837,7 @@
new Primitive(Symbol.INTEGER_LENGTH, "integer")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Fixnum)
{
@@ -4864,7 +4864,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
BigInteger n1, n2;
if (first instanceof Fixnum)
@@ -4888,7 +4888,7 @@
new Primitive("identity-hash-code", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(System.identityHashCode(arg));
}
@@ -4901,7 +4901,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
AbstractVector v = checkVector(second);
if (first.length() == 0)
@@ -4975,7 +4975,7 @@
new Primitive("uptime", PACKAGE_EXT, true)
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return number(System.currentTimeMillis() - Main.startTimeMillis);
}
@@ -4986,7 +4986,7 @@
new Primitive("built-in-function-p", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSymbol(arg).isBuiltInFunction() ? T : NIL;
}
@@ -4997,7 +4997,7 @@
new Primitive("inspected-parts", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.getParts();
}
@@ -5008,7 +5008,7 @@
new Primitive("inspected-description", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.getDescription();
}
@@ -5019,7 +5019,7 @@
new Primitive(Symbol.SYMBOL_NAME, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSymbol(arg).name;
}
@@ -5030,7 +5030,7 @@
new Primitive(Symbol.SYMBOL_PACKAGE, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSymbol(arg).getPackage();
}
@@ -5041,7 +5041,7 @@
new Primitive(Symbol.SYMBOL_FUNCTION, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
LispObject function = checkSymbol(arg).getSymbolFunction();
if (function != null)
@@ -5057,7 +5057,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSymbol(first).setSymbolFunction(second);
return second;
@@ -5069,7 +5069,7 @@
new Primitive(Symbol.SYMBOL_PLIST, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSymbol(arg).getPropertyList();
}
@@ -5080,7 +5080,7 @@
new Primitive(Symbol.KEYWORDP, "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Symbol)
{
@@ -5096,7 +5096,7 @@
new Primitive(Symbol.MAKE_SYMBOL, "name")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SimpleString)
return new Symbol((SimpleString)arg);
@@ -5112,7 +5112,7 @@
new Primitive(Symbol.MAKUNBOUND, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
checkSymbol(arg).setSymbolValue(null);
return arg;
@@ -5124,7 +5124,7 @@
new Primitive("%class-name", PACKAGE_SYS, true, "class")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkClass(arg).symbol;
}
@@ -5136,7 +5136,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkClass(first).symbol = checkSymbol(second);
return second;
@@ -5148,7 +5148,7 @@
new Primitive("class-layout", PACKAGE_SYS, true, "class")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Layout layout = checkClass(arg).getClassLayout();
return layout != null ? layout : NIL;
@@ -5161,7 +5161,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (second instanceof Layout)
{
@@ -5177,7 +5177,7 @@
new Primitive("class-direct-superclasses", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkClass(arg).getDirectSuperclasses();
}
@@ -5189,7 +5189,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkClass(first).setDirectSuperclasses(second);
return second;
@@ -5201,7 +5201,7 @@
new Primitive("class-direct-subclasses", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkClass(arg).getDirectSubclasses();
}
@@ -5214,7 +5214,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkClass(first).setDirectSubclasses(second);
return second;
@@ -5226,7 +5226,7 @@
new Primitive("%class-precedence-list", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkClass(arg).getCPL();
}
@@ -5238,7 +5238,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkClass(first).classPrecedenceList = second;
return second;
@@ -5251,7 +5251,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
return checkClass(arg).directMethods;
}
@@ -5263,7 +5263,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkClass(first).directMethods = second;
return second;
@@ -5276,7 +5276,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
return checkClass(arg).documentation;
}
@@ -5288,7 +5288,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkClass(first).documentation = second;
return second;
@@ -5300,7 +5300,7 @@
new Primitive("class-finalized-p", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkClass(arg).isFinalized() ? T : NIL;
}
@@ -5312,7 +5312,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkClass(first).setFinalized(second != NIL);
return second;
@@ -5335,7 +5335,7 @@
new Primitive("char-to-utf8", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispCharacter c;
c = checkCharacter( arg);
@@ -5370,7 +5370,7 @@
{
@Override
public LispObject execute(LispObject object, LispObject docType)
- throws ConditionThrowable
+
{
LispObject doc = object.getDocumentation(docType);
if (doc == NIL)
@@ -5394,7 +5394,7 @@
@Override
public LispObject execute(LispObject object, LispObject docType,
LispObject documentation)
- throws ConditionThrowable
+
{
object.setDocumentation(docType, documentation);
return documentation;
@@ -5409,7 +5409,7 @@
@Override
public LispObject execute(LispObject plist, LispObject indicator,
LispObject newValue)
- throws ConditionThrowable
+
{
return putf(plist, indicator, newValue);
}
@@ -5420,7 +5420,7 @@
new Primitive("function-plist", PACKAGE_SYS, true, "function")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkFunction(arg).getPropertyList();
}
@@ -5431,7 +5431,7 @@
new Primitive("make-keyword", PACKAGE_SYS, true, "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return PACKAGE_KEYWORD.intern(checkSymbol(arg).name);
}
Modified: trunk/abcl/src/org/armedbear/lisp/PrintNotReadable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/PrintNotReadable.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/PrintNotReadable.java Fri Nov 6 15:07:54 2009
@@ -35,7 +35,7 @@
public class PrintNotReadable extends LispError
{
- public PrintNotReadable(LispObject initArgs) throws ConditionThrowable
+ public PrintNotReadable(LispObject initArgs)
{
super(StandardClass.PRINT_NOT_READABLE);
super.initialize(initArgs);
@@ -67,7 +67,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.PRINT_NOT_READABLE)
return T;
@@ -112,7 +112,7 @@
new Primitive("print-not-readable-object", "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof PrintNotReadable) return ((PrintNotReadable)arg).getInstanceSlotValue(Symbol.OBJECT);
return type_error(arg, Symbol.PRINT_NOT_READABLE);
Modified: trunk/abcl/src/org/armedbear/lisp/Profiler.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Profiler.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Profiler.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
Stream out = getStandardOutput();
@@ -120,7 +120,7 @@
new Primitive("stop-profiler", PACKAGE_PROF, true)
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
Stream out = getStandardOutput();
out.freshLine();
Modified: trunk/abcl/src/org/armedbear/lisp/ProgramError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ProgramError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ProgramError.java Fri Nov 6 15:07:54 2009
@@ -35,12 +35,12 @@
public class ProgramError extends LispError
{
- protected ProgramError(LispClass cls) throws ConditionThrowable
+ protected ProgramError(LispClass cls)
{
super(cls);
}
- public ProgramError(LispObject initArgs) throws ConditionThrowable
+ public ProgramError(LispObject initArgs)
{
super(StandardClass.PROGRAM_ERROR);
initialize(initArgs);
@@ -52,7 +52,7 @@
}
- public ProgramError(String message) throws ConditionThrowable
+ public ProgramError(String message)
{
super(StandardClass.PROGRAM_ERROR);
setFormatControl(message);
@@ -72,7 +72,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.PROGRAM_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/RandomState.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/RandomState.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/RandomState.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
random = new Random();
}
- public RandomState(RandomState rs) throws ConditionThrowable
+ public RandomState(RandomState rs)
{
try {
File file = File.createTempFile("MAKE-RANDOM-STATE", null);
@@ -82,7 +82,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.RANDOM_STATE)
return T;
@@ -92,12 +92,12 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return unreadableString(Symbol.RANDOM_STATE);
}
- public LispObject random(LispObject arg) throws ConditionThrowable
+ public LispObject random(LispObject arg)
{
if (arg instanceof Fixnum) {
int limit = ((Fixnum)arg).value;
@@ -136,7 +136,7 @@
new Primitive(Symbol.RANDOM, "limit &optional random-state")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
RandomState randomState =
(RandomState) Symbol._RANDOM_STATE_.symbolValue();
@@ -144,7 +144,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (second instanceof RandomState) {
RandomState randomState = (RandomState) second;
@@ -159,13 +159,13 @@
new Primitive(Symbol.MAKE_RANDOM_STATE, "&optional state")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return new RandomState((RandomState)Symbol._RANDOM_STATE_.symbolValue());
}
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg == NIL)
return new RandomState((RandomState)Symbol._RANDOM_STATE_.symbolValue());
Modified: trunk/abcl/src/org/armedbear/lisp/Ratio.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Ratio.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Ratio.java Fri Nov 6 15:07:54 2009
@@ -81,7 +81,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.RATIO)
return T;
@@ -225,19 +225,19 @@
}
@Override
- public final LispObject incr() throws ConditionThrowable
+ public final LispObject incr()
{
return new Ratio(numerator.add(denominator), denominator);
}
@Override
- public final LispObject decr() throws ConditionThrowable
+ public final LispObject decr()
{
return new Ratio(numerator.subtract(denominator), denominator);
}
@Override
- public LispObject add(LispObject obj) throws ConditionThrowable
+ public LispObject add(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n =
@@ -272,7 +272,7 @@
}
@Override
- public LispObject subtract(LispObject obj) throws ConditionThrowable
+ public LispObject subtract(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n =
@@ -308,7 +308,7 @@
}
@Override
- public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
+ public LispObject multiplyBy(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n = ((Fixnum)obj).getBigInteger();
@@ -338,7 +338,7 @@
}
@Override
- public LispObject divideBy(LispObject obj) throws ConditionThrowable
+ public LispObject divideBy(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n = ((Fixnum)obj).getBigInteger();
@@ -380,7 +380,7 @@
}
@Override
- public boolean isEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isEqualTo(LispObject obj)
{
if (obj instanceof Ratio)
return (numerator.equals(((Ratio)obj).numerator) &&
@@ -397,13 +397,13 @@
}
@Override
- public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isNotEqualTo(LispObject obj)
{
return !isEqualTo(obj);
}
@Override
- public boolean isLessThan(LispObject obj) throws ConditionThrowable
+ public boolean isLessThan(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n2 = ((Fixnum)obj).getBigInteger().multiply(denominator);
@@ -428,7 +428,7 @@
}
@Override
- public boolean isGreaterThan(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThan(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n2 = ((Fixnum)obj).getBigInteger().multiply(denominator);
@@ -453,7 +453,7 @@
}
@Override
- public boolean isLessThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isLessThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n2 = ((Fixnum)obj).getBigInteger().multiply(denominator);
@@ -478,7 +478,7 @@
}
@Override
- public boolean isGreaterThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum) {
BigInteger n2 = ((Fixnum)obj).getBigInteger().multiply(denominator);
@@ -503,7 +503,7 @@
}
@Override
- public LispObject truncate(LispObject obj) throws ConditionThrowable
+ public LispObject truncate(LispObject obj)
{
// "When rationals and floats are combined by a numerical function,
// the rational is first converted to a float of the same format."
@@ -550,7 +550,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
int base = Fixnum.getValue(Symbol.PRINT_BASE.symbolValue(thread));
Modified: trunk/abcl/src/org/armedbear/lisp/ReaderError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ReaderError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ReaderError.java Fri Nov 6 15:07:54 2009
@@ -35,14 +35,14 @@
public final class ReaderError extends StreamError
{
- public ReaderError(String message) throws ConditionThrowable
+ public ReaderError(String message)
{
super(StandardClass.READER_ERROR);
setFormatControl(message);
setFormatArguments(NIL);
}
- public ReaderError(String message, Stream stream) throws ConditionThrowable
+ public ReaderError(String message, Stream stream)
{
super(StandardClass.READER_ERROR);
setFormatControl(message);
@@ -50,7 +50,7 @@
setStream(stream);
}
- public ReaderError(LispObject initArgs) throws ConditionThrowable
+ public ReaderError(LispObject initArgs)
{
super(StandardClass.READER_ERROR);
initialize(initArgs);
@@ -69,7 +69,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.READER_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/ReaderMacroFunction.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ReaderMacroFunction.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ReaderMacroFunction.java Fri Nov 6 15:07:54 2009
@@ -63,7 +63,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Stream stream = inSynonymOf(first);
char c = LispCharacter.getValue(second);
@@ -71,5 +71,5 @@
}
public abstract LispObject execute(Stream stream, char c)
- throws ConditionThrowable;
+ ;
}
Modified: trunk/abcl/src/org/armedbear/lisp/Readtable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Readtable.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Readtable.java Fri Nov 6 15:07:54 2009
@@ -119,7 +119,7 @@
readtableCase = Keyword.UPCASE;
}
- public Readtable(LispObject obj) throws ConditionThrowable
+ public Readtable(LispObject obj)
{
Readtable rt;
if (obj == NIL)
@@ -181,7 +181,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.READTABLE)
return T;
@@ -228,7 +228,7 @@
}
}
- public void checkInvalid(char c, Stream stream) throws ConditionThrowable
+ public void checkInvalid(char c, Stream stream)
{
// "... no mechanism is provided for changing the constituent trait of a
// character." (2.1.4.2)
@@ -250,7 +250,7 @@
return readerMacroFunctions.get(c);
}
- private LispObject getMacroCharacter(char c) throws ConditionThrowable
+ private LispObject getMacroCharacter(char c)
{
LispObject function = getReaderMacroFunction(c);
LispObject non_terminating_p;
@@ -283,7 +283,7 @@
}
public LispObject getDispatchMacroCharacter(char dispChar, char subChar)
- throws ConditionThrowable
+
{
DispatchTable dispatchTable = dispatchTables.get(dispChar);
if (dispatchTable == null)
@@ -299,7 +299,7 @@
public void setDispatchMacroCharacter(char dispChar, char subChar,
LispObject function)
- throws ConditionThrowable
+
{
DispatchTable dispatchTable = dispatchTables.get(dispChar);
if (dispatchTable == null)
@@ -343,20 +343,20 @@
new Primitive("copy-readtable", "&optional from-readtable to-readtable")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return new Readtable(currentReadtable());
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new Readtable(arg);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Readtable from = designator_readtable(first);
if (second == NIL)
@@ -373,7 +373,7 @@
new Primitive("get-macro-character", "char &optional readtable")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
char c = LispCharacter.getValue(arg);
Readtable rt = currentReadtable();
@@ -382,7 +382,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
char c = LispCharacter.getValue(first);
Readtable rt = designator_readtable(second);
@@ -398,7 +398,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return execute(first, second, NIL, currentReadtable());
}
@@ -406,7 +406,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return execute(first, second, third, currentReadtable());
}
@@ -414,7 +414,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
char c = LispCharacter.getValue(first);
final LispObject designator;
@@ -446,7 +446,7 @@
"char &optional non-terminating-p readtable")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 1 || args.length > 3)
return error(new WrongNumberOfArgumentsException(this));
@@ -473,7 +473,7 @@
"disp-char sub-char &optional readtable")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 2 || args.length > 3)
return error(new WrongNumberOfArgumentsException(this));
@@ -495,7 +495,7 @@
"disp-char sub-char new-function &optional readtable")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 3 || args.length > 4)
return error(new WrongNumberOfArgumentsException(this));
@@ -519,7 +519,7 @@
"to-char from-char &optional to-readtable from-readtable")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length < 2 || args.length > 4)
return error(new WrongNumberOfArgumentsException(this));
@@ -557,7 +557,7 @@
new Primitive("readtable-case", "readtable")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkReadtable(arg).readtableCase;
}
@@ -570,7 +570,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final Readtable readtable = checkReadtable(first);
if (second == Keyword.UPCASE || second == Keyword.DOWNCASE ||
Modified: trunk/abcl/src/org/armedbear/lisp/Return.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Return.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Return.java Fri Nov 6 15:07:54 2009
@@ -69,7 +69,7 @@
}
@Override
- public LispObject getCondition() throws ConditionThrowable
+ public LispObject getCondition()
{
try {
FastStringBuffer sb = new FastStringBuffer("No block named ");
Modified: trunk/abcl/src/org/armedbear/lisp/RuntimeClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/RuntimeClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/RuntimeClass.java Fri Nov 6 15:07:54 2009
@@ -49,7 +49,7 @@
new Primitive("%jnew-runtime-class", PACKAGE_JAVA, false, "class-name &rest method-names-and-defs")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
int length = args.length;
if (length < 3 || length % 2 != 1)
@@ -74,7 +74,7 @@
@Override
public LispObject execute(LispObject className, LispObject methodName,
LispObject methodDef)
- throws ConditionThrowable
+
{
String cn = className.getStringValue();
@@ -100,7 +100,7 @@
{
@Override
public LispObject execute(LispObject className, LispObject classBytes)
- throws ConditionThrowable
+
{
String cn = className.getStringValue();
String pn = cn.substring(0,cn.lastIndexOf('.'));
@@ -132,7 +132,7 @@
LispObject args,
Environment env,
LispThread thread)
- throws ConditionThrowable
+
{
return evalCall(function, args, env, thread);
}
@@ -149,47 +149,47 @@
methods.put(methodName, def);
}
- public static final LispObject makeLispObject(Object obj) throws ConditionThrowable
+ public static final LispObject makeLispObject(Object obj)
{
return new JavaObject(obj);
}
- public static final Fixnum makeLispObject(byte i) throws ConditionThrowable
+ public static final Fixnum makeLispObject(byte i)
{
return Fixnum.getInstance(i);
}
- public static final Fixnum makeLispObject(short i) throws ConditionThrowable
+ public static final Fixnum makeLispObject(short i)
{
return Fixnum.getInstance(i);
}
- public static final Fixnum makeLispObject(int i) throws ConditionThrowable
+ public static final Fixnum makeLispObject(int i)
{
return Fixnum.getInstance(i);
}
- public static final LispInteger makeLispObject(long i) throws ConditionThrowable
+ public static final LispInteger makeLispObject(long i)
{
return Bignum.getInstance(i);
}
- public static final SingleFloat makeLispObject(float i) throws ConditionThrowable
+ public static final SingleFloat makeLispObject(float i)
{
return new SingleFloat(i);
}
- public static final DoubleFloat makeLispObject(double i) throws ConditionThrowable
+ public static final DoubleFloat makeLispObject(double i)
{
return new DoubleFloat(i);
}
- public static final LispCharacter makeLispObject(char i) throws ConditionThrowable
+ public static final LispCharacter makeLispObject(char i)
{
return LispCharacter.getInstance(i);
}
- public static final LispObject makeLispObject(boolean i) throws ConditionThrowable
+ public static final LispObject makeLispObject(boolean i)
{
return i ? T : NIL;
}
Modified: trunk/abcl/src/org/armedbear/lisp/SeriousCondition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SeriousCondition.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SeriousCondition.java Fri Nov 6 15:07:54 2009
@@ -35,22 +35,22 @@
public class SeriousCondition extends Condition
{
- public SeriousCondition() throws ConditionThrowable
+ public SeriousCondition()
{
}
- protected SeriousCondition(LispClass cls) throws ConditionThrowable
+ protected SeriousCondition(LispClass cls)
{
super(cls);
}
- public SeriousCondition(LispObject initArgs) throws ConditionThrowable
+ public SeriousCondition(LispObject initArgs)
{
super(initArgs);
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
}
@@ -73,7 +73,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SERIOUS_CONDITION)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/ShellCommand.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ShellCommand.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ShellCommand.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
private int exitValue = -1;
public ShellCommand(String command, String directory, Stream outputStream)
- throws ConditionThrowable
+
{
this.command = command;
this.directory = directory;
@@ -68,7 +68,7 @@
return exitValue;
}
- private void processOutput(String s) throws ConditionThrowable
+ private void processOutput(String s)
{
if (outputStream != null)
outputStream._writeString(s);
@@ -247,7 +247,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (!(Utilities.isPlatformUnix || Utilities.isPlatformWindows)) {
return error(new LispError("run-shell-command not implemented for "
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleArray_T.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleArray_T.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleArray_T.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
public SimpleArray_T(int[] dimv,
LispObject elementType,
LispObject initialContents)
- throws ConditionThrowable
+
{
this.dimv = dimv;
this.elementType = elementType;
@@ -70,7 +70,7 @@
}
public SimpleArray_T(int rank, LispObject initialContents)
- throws ConditionThrowable
+
{
if (rank < 2)
Debug.assertTrue(false);
@@ -99,7 +99,7 @@
private int setInitialContents(int axis, int[] dims, LispObject contents,
int index)
- throws ConditionThrowable
+
{
if (dims.length == 0)
{
@@ -163,7 +163,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.SIMPLE_ARRAY)
return T;
@@ -188,7 +188,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
try
{
@@ -220,7 +220,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try
{
@@ -233,7 +233,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
try
{
@@ -246,7 +246,7 @@
}
@Override
- public int getRowMajorIndex(int[] subscripts) throws ConditionThrowable
+ public int getRowMajorIndex(int[] subscripts)
{
final int rank = dimv.length;
if (rank != subscripts.length)
@@ -281,7 +281,7 @@
}
@Override
- public LispObject get(int[] subscripts) throws ConditionThrowable
+ public LispObject get(int[] subscripts)
{
try
{
@@ -296,7 +296,7 @@
@Override
public void set(int[] subscripts, LispObject newValue)
- throws ConditionThrowable
+
{
try
{
@@ -317,7 +317,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return writeToString(dimv);
}
@@ -325,7 +325,7 @@
@Override
public AbstractArray adjustArray(int[] dimv, LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
return new SimpleArray_T(dimv, elementType, initialContents);
@@ -347,7 +347,7 @@
// Copy a1 to a2 for index tuples that are valid for both arrays.
static void copyArray(AbstractArray a1, AbstractArray a2)
- throws ConditionThrowable
+
{
Debug.assertTrue(a1.getRank() == a2.getRank());
int[] subscripts = new int[a1.getRank()];
@@ -357,7 +357,7 @@
private static void copySubArray(AbstractArray a1, AbstractArray a2,
int[] subscripts, int axis)
- throws ConditionThrowable
+
{
if (axis < subscripts.length)
{
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
}
public SimpleArray_UnsignedByte16(int[] dimv, LispObject initialContents)
- throws ConditionThrowable
+
{
this.dimv = dimv;
final int rank = dimv.length;
@@ -62,7 +62,7 @@
}
public SimpleArray_UnsignedByte16(int rank, LispObject initialContents)
- throws ConditionThrowable
+
{
if (rank < 2)
Debug.assertTrue(false);
@@ -81,7 +81,7 @@
private int setInitialContents(int axis, int[] dims, LispObject contents,
int index)
- throws ConditionThrowable
+
{
if (dims.length == 0) {
try {
@@ -134,7 +134,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.SIMPLE_ARRAY)
return T;
@@ -159,7 +159,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
try {
return dimv[n];
@@ -189,7 +189,7 @@
}
@Override
- public int aref(int index) throws ConditionThrowable
+ public int aref(int index)
{
try {
return data[index];
@@ -202,7 +202,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try {
return Fixnum.getInstance(data[index]);
@@ -213,7 +213,7 @@
}
@Override
- public void aset(int index, LispObject obj) throws ConditionThrowable
+ public void aset(int index, LispObject obj)
{
try {
data[index] = Fixnum.getValue(obj);
@@ -224,7 +224,7 @@
}
@Override
- public int getRowMajorIndex(int[] subscripts) throws ConditionThrowable
+ public int getRowMajorIndex(int[] subscripts)
{
final int rank = dimv.length;
if (rank != subscripts.length) {
@@ -256,7 +256,7 @@
}
@Override
- public LispObject get(int[] subscripts) throws ConditionThrowable
+ public LispObject get(int[] subscripts)
{
try {
return Fixnum.getInstance(data[getRowMajorIndex(subscripts)]);
@@ -269,7 +269,7 @@
@Override
public void set(int[] subscripts, LispObject obj)
- throws ConditionThrowable
+
{
try {
data[getRowMajorIndex(subscripts)] = Fixnum.getValue(obj);
@@ -281,7 +281,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
int n = Fixnum.getValue(obj);
for (int i = totalSize; i-- > 0;)
@@ -289,7 +289,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
error(new PrintNotReadable(list(Keyword.OBJECT, this)));
@@ -301,7 +301,7 @@
public AbstractArray adjustArray(int[] dimv, LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
return new SimpleArray_UnsignedByte16(dimv, initialContents);
@@ -321,7 +321,7 @@
// Copy a1 to a2 for index tuples that are valid for both arrays.
private static void copyArray(AbstractArray a1, AbstractArray a2)
- throws ConditionThrowable
+
{
Debug.assertTrue(a1.getRank() == a2.getRank());
int[] subscripts = new int[a1.getRank()];
@@ -331,7 +331,7 @@
private static void copySubArray(AbstractArray a1, AbstractArray a2,
int[] subscripts, int axis)
- throws ConditionThrowable
+
{
if (axis < subscripts.length) {
final int limit =
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java Fri Nov 6 15:07:54 2009
@@ -51,7 +51,7 @@
}
public SimpleArray_UnsignedByte32(int[] dimv, LispObject initialContents)
- throws ConditionThrowable
+
{
this.dimv = dimv;
final int rank = dimv.length;
@@ -66,7 +66,7 @@
}
public SimpleArray_UnsignedByte32(int rank, LispObject initialContents)
- throws ConditionThrowable
+
{
if (rank < 2)
Debug.assertTrue(false);
@@ -85,7 +85,7 @@
private int setInitialContents(int axis, int[] dims, LispObject contents,
int index)
- throws ConditionThrowable
+
{
if (dims.length == 0) {
try {
@@ -138,7 +138,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.SIMPLE_ARRAY)
return T;
@@ -163,7 +163,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
try {
return dimv[n];
@@ -193,7 +193,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try {
return data[index];
@@ -204,7 +204,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
try {
data[index] = newValue;
@@ -215,7 +215,7 @@
}
@Override
- public int getRowMajorIndex(int[] subscripts) throws ConditionThrowable
+ public int getRowMajorIndex(int[] subscripts)
{
final int rank = dimv.length;
if (rank != subscripts.length) {
@@ -247,7 +247,7 @@
}
@Override
- public LispObject get(int[] subscripts) throws ConditionThrowable
+ public LispObject get(int[] subscripts)
{
try {
return data[getRowMajorIndex(subscripts)];
@@ -260,7 +260,7 @@
@Override
public void set(int[] subscripts, LispObject newValue)
- throws ConditionThrowable
+
{
try {
data[getRowMajorIndex(subscripts)] = newValue;
@@ -279,7 +279,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
error(new PrintNotReadable(list(Keyword.OBJECT, this)));
@@ -291,7 +291,7 @@
public AbstractArray adjustArray(int[] dimv, LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
return new SimpleArray_UnsignedByte32(dimv, initialContents);
@@ -311,7 +311,7 @@
// Copy a1 to a2 for index tuples that are valid for both arrays.
static void copyArray(AbstractArray a1, AbstractArray a2)
- throws ConditionThrowable
+
{
Debug.assertTrue(a1.getRank() == a2.getRank());
int[] subscripts = new int[a1.getRank()];
@@ -321,7 +321,7 @@
private static void copySubArray(AbstractArray a1, AbstractArray a2,
int[] subscripts, int axis)
- throws ConditionThrowable
+
{
if (axis < subscripts.length) {
final int limit =
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte8.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte8.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte8.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
}
public SimpleArray_UnsignedByte8(int[] dimv, LispObject initialContents)
- throws ConditionThrowable
+
{
this.dimv = dimv;
final int rank = dimv.length;
@@ -62,7 +62,7 @@
}
public SimpleArray_UnsignedByte8(int rank, LispObject initialContents)
- throws ConditionThrowable
+
{
if (rank < 2)
Debug.assertTrue(false);
@@ -81,7 +81,7 @@
private int setInitialContents(int axis, int[] dims, LispObject contents,
int index)
- throws ConditionThrowable
+
{
if (dims.length == 0) {
try {
@@ -134,7 +134,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.SIMPLE_ARRAY)
return T;
@@ -159,7 +159,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
try {
return dimv[n];
@@ -189,7 +189,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try {
return coerceJavaByteToLispObject(data[index]);
@@ -200,7 +200,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
try {
data[index] = coerceLispObjectToJavaByte(newValue);
@@ -211,7 +211,7 @@
}
@Override
- public int getRowMajorIndex(int[] subscripts) throws ConditionThrowable
+ public int getRowMajorIndex(int[] subscripts)
{
final int rank = dimv.length;
if (rank != subscripts.length) {
@@ -243,7 +243,7 @@
}
@Override
- public LispObject get(int[] subscripts) throws ConditionThrowable
+ public LispObject get(int[] subscripts)
{
try {
return coerceJavaByteToLispObject(data[getRowMajorIndex(subscripts)]);
@@ -256,7 +256,7 @@
@Override
public void set(int[] subscripts, LispObject newValue)
- throws ConditionThrowable
+
{
try {
data[getRowMajorIndex(subscripts)] = coerceLispObjectToJavaByte(newValue);
@@ -268,7 +268,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
byte b = coerceLispObjectToJavaByte(obj);
for (int i = totalSize; i-- > 0;)
@@ -276,7 +276,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
error(new PrintNotReadable(list(Keyword.OBJECT, this)));
@@ -288,7 +288,7 @@
public AbstractArray adjustArray(int[] dimv, LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
return new SimpleArray_UnsignedByte8(dimv, initialContents);
@@ -308,7 +308,7 @@
// Copy a1 to a2 for index tuples that are valid for both arrays.
static void copyArray(AbstractArray a1, AbstractArray a2)
- throws ConditionThrowable
+
{
Debug.assertTrue(a1.getRank() == a2.getRank());
int[] subscripts = new int[a1.getRank()];
@@ -318,7 +318,7 @@
private static void copySubArray(AbstractArray a1, AbstractArray a2,
int[] subscripts, int axis)
- throws ConditionThrowable
+
{
if (axis < subscripts.length) {
final int limit =
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java Fri Nov 6 15:07:54 2009
@@ -49,7 +49,7 @@
bits = new long[size];
}
- public SimpleBitVector(String s) throws ConditionThrowable
+ public SimpleBitVector(String s)
{
this(s.length());
for (int i = capacity; i-- > 0;) {
@@ -75,7 +75,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_BIT_VECTOR)
return T;
@@ -113,7 +113,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
if (index < 0 || index >= length())
badIndex(index, length());
@@ -122,7 +122,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (index < 0 || index >= capacity)
badIndex(index, capacity);
@@ -131,7 +131,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
if (index < 0 || index >= capacity)
badIndex(index, capacity);
@@ -172,7 +172,7 @@
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (n < capacity) {
int size = n >>> 6;
@@ -195,7 +195,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null) {
SimpleBitVector v = new SimpleBitVector(newCapacity);
@@ -240,7 +240,7 @@
public AbstractVector adjustArray(int newCapacity,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
return new ComplexBitVector(newCapacity, displacedTo, displacement);
}
@@ -343,7 +343,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).and((SimpleBitVector)second,
((SimpleBitVector)third));
@@ -358,7 +358,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).ior((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -374,7 +374,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).xor((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -390,7 +390,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).eqv((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -405,7 +405,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).nand((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -420,7 +420,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).nor((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -435,7 +435,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).andc1((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -450,7 +450,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).andc2((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -466,7 +466,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).orc1((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -481,7 +481,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return ((SimpleBitVector)first).orc2((SimpleBitVector)second,
(SimpleBitVector)third);
@@ -495,7 +495,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
SimpleBitVector v = (SimpleBitVector) first;
SimpleBitVector result = (SimpleBitVector) second;
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleCondition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleCondition.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleCondition.java Fri Nov 6 15:07:54 2009
@@ -35,20 +35,20 @@
public class SimpleCondition extends Condition
{
- public SimpleCondition() throws ConditionThrowable
+ public SimpleCondition()
{
setFormatControl(NIL);
setFormatArguments(NIL);
}
public SimpleCondition(LispObject formatControl, LispObject formatArguments)
- throws ConditionThrowable
+
{
setFormatControl(formatControl);
setFormatArguments(formatArguments);
}
- public SimpleCondition(LispObject initArgs) throws ConditionThrowable
+ public SimpleCondition(LispObject initArgs)
{
super(initArgs);
}
@@ -71,7 +71,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_CONDITION)
return T;
@@ -85,7 +85,7 @@
new Primitive(Symbol.SIMPLE_CONDITION_FORMAT_CONTROL, "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Symbol.STD_SLOT_VALUE.execute(arg, Symbol.FORMAT_CONTROL);
}
@@ -96,7 +96,7 @@
new Primitive(Symbol.SIMPLE_CONDITION_FORMAT_ARGUMENTS, "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Symbol.STD_SLOT_VALUE.execute(arg, Symbol.FORMAT_ARGUMENTS);
}
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleError.java Fri Nov 6 15:07:54 2009
@@ -36,20 +36,20 @@
public final class SimpleError extends LispError
{
public SimpleError(LispObject formatControl, LispObject formatArguments)
- throws ConditionThrowable
+
{
super(StandardClass.SIMPLE_ERROR);
setFormatControl(formatControl);
setFormatArguments(formatArguments);
}
- public SimpleError(LispObject initArgs) throws ConditionThrowable
+ public SimpleError(LispObject initArgs)
{
super(StandardClass.SIMPLE_ERROR);
initialize(initArgs);
}
- public SimpleError(String message) throws ConditionThrowable
+ public SimpleError(String message)
{
super(StandardClass.SIMPLE_ERROR);
setFormatControl(message);
@@ -69,7 +69,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleString.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleString.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleString.java Fri Nov 6 15:07:54 2009
@@ -118,7 +118,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_STRING)
return T;
@@ -154,7 +154,7 @@
}
@Override
- public boolean equal(LispObject obj) throws ConditionThrowable
+ public boolean equal(LispObject obj)
{
if (this == obj)
return true;
@@ -182,7 +182,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (this == obj)
return true;
@@ -217,13 +217,13 @@
return false;
}
- public final SimpleString substring(int start) throws ConditionThrowable
+ public final SimpleString substring(int start)
{
return substring(start, capacity);
}
public final SimpleString substring(int start, int end)
- throws ConditionThrowable
+
{
SimpleString s = new SimpleString(end - start);
int i = start, j = 0;
@@ -240,13 +240,13 @@
}
@Override
- public final LispObject subseq(int start, int end) throws ConditionThrowable
+ public final LispObject subseq(int start, int end)
{
return substring(start, end);
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
fill(LispCharacter.getValue(obj));
}
@@ -259,7 +259,7 @@
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (n < capacity) {
char[] newArray = new char[n];
@@ -274,7 +274,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
SimpleString result = new SimpleString(capacity);
int i, j;
@@ -284,7 +284,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
int i = 0;
int j = capacity - 1;
@@ -329,7 +329,7 @@
}
@Override
- public char charAt(int index) throws ConditionThrowable
+ public char charAt(int index)
{
try {
return chars[index];
@@ -341,7 +341,7 @@
}
@Override
- public void setCharAt(int index, char c) throws ConditionThrowable
+ public void setCharAt(int index, char c)
{
try {
chars[index] = c;
@@ -352,7 +352,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
try {
return LispCharacter.getInstance(chars[index]);
@@ -364,7 +364,7 @@
}
@Override
- public LispObject CHAR(int index) throws ConditionThrowable
+ public LispObject CHAR(int index)
{
try {
return LispCharacter.getInstance(chars[index]);
@@ -376,7 +376,7 @@
}
@Override
- public LispObject SCHAR(int index) throws ConditionThrowable
+ public LispObject SCHAR(int index)
{
try {
return LispCharacter.getInstance(chars[index]);
@@ -388,7 +388,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try {
return LispCharacter.getInstance(chars[index]);
@@ -400,7 +400,7 @@
}
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
try {
return LispCharacter.getInstance(chars[Fixnum.getValue(index)]);
@@ -412,7 +412,7 @@
}
@Override
- public void aset(int index, LispObject obj) throws ConditionThrowable
+ public void aset(int index, LispObject obj)
{
try {
chars[index] = LispCharacter.getValue(obj);
@@ -457,7 +457,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null) {
char[] newChars = new char[newCapacity];
@@ -492,7 +492,7 @@
public AbstractVector adjustArray(int newCapacity,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable
+
{
return new ComplexString(newCapacity, displacedTo, displacement);
}
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleTypeError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleTypeError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleTypeError.java Fri Nov 6 15:07:54 2009
@@ -35,7 +35,7 @@
public final class SimpleTypeError extends TypeError
{
- public SimpleTypeError(LispObject initArgs) throws ConditionThrowable
+ public SimpleTypeError(LispObject initArgs)
{
super(StandardClass.SIMPLE_TYPE_ERROR);
initialize(initArgs);
@@ -54,7 +54,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_TYPE_ERROR)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleVector.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleVector.java Fri Nov 6 15:07:54 2009
@@ -49,7 +49,7 @@
this.capacity = capacity;
}
- public SimpleVector(LispObject obj) throws ConditionThrowable
+ public SimpleVector(LispObject obj)
{
if (obj.listp())
{
@@ -95,7 +95,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_VECTOR)
return T;
@@ -145,7 +145,7 @@
}
@Override
- public LispObject elt(int index) throws ConditionThrowable
+ public LispObject elt(int index)
{
try
{
@@ -159,7 +159,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
try
{
@@ -173,7 +173,7 @@
}
@Override
- public LispObject AREF(LispObject index) throws ConditionThrowable
+ public LispObject AREF(LispObject index)
{
int idx = Fixnum.getValue(index);
try
@@ -188,7 +188,7 @@
}
@Override
- public void aset(int index, LispObject newValue) throws ConditionThrowable
+ public void aset(int index, LispObject newValue)
{
try
{
@@ -201,7 +201,7 @@
}
@Override
- public LispObject SVREF(int index) throws ConditionThrowable
+ public LispObject SVREF(int index)
{
try
{
@@ -215,7 +215,7 @@
}
@Override
- public void svset(int index, LispObject newValue) throws ConditionThrowable
+ public void svset(int index, LispObject newValue)
{
try
{
@@ -228,7 +228,7 @@
}
@Override
- public LispObject subseq(int start, int end) throws ConditionThrowable
+ public LispObject subseq(int start, int end)
{
SimpleVector v = new SimpleVector(end - start);
int i = start, j = 0;
@@ -245,14 +245,14 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
for (int i = capacity; i-- > 0;)
data[i] = obj;
}
@Override
- public LispObject deleteEq(LispObject item) throws ConditionThrowable
+ public LispObject deleteEq(LispObject item)
{
final int limit = capacity;
int i = 0;
@@ -269,7 +269,7 @@
}
@Override
- public LispObject deleteEql(LispObject item) throws ConditionThrowable
+ public LispObject deleteEql(LispObject item)
{
final int limit = capacity;
int i = 0;
@@ -286,7 +286,7 @@
}
@Override
- public void shrink(int n) throws ConditionThrowable
+ public void shrink(int n)
{
if (n < capacity)
{
@@ -302,7 +302,7 @@
}
@Override
- public LispObject reverse() throws ConditionThrowable
+ public LispObject reverse()
{
SimpleVector result = new SimpleVector(capacity);
int i, j;
@@ -312,7 +312,7 @@
}
@Override
- public LispObject nreverse() throws ConditionThrowable
+ public LispObject nreverse()
{
int i = 0;
int j = capacity - 1;
@@ -331,7 +331,7 @@
public AbstractVector adjustArray(int newCapacity,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable
+
{
if (initialContents != null)
{
@@ -383,7 +383,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof SimpleVector) {
final SimpleVector sv = (SimpleVector)first;
@@ -408,7 +408,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first instanceof SimpleVector) {
final SimpleVector sv = (SimpleVector)first;
Modified: trunk/abcl/src/org/armedbear/lisp/SimpleWarning.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleWarning.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleWarning.java Fri Nov 6 15:07:54 2009
@@ -35,14 +35,14 @@
public final class SimpleWarning extends Warning
{
- public SimpleWarning(LispObject initArgs) throws ConditionThrowable
+ public SimpleWarning(LispObject initArgs)
{
super(StandardClass.SIMPLE_WARNING);
initialize(initArgs);
}
public SimpleWarning(LispObject formatControl, LispObject formatArguments)
- throws ConditionThrowable
+
{
super(StandardClass.SIMPLE_WARNING);
setFormatControl(formatControl);
@@ -62,7 +62,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_WARNING)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/SingleFloat.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SingleFloat.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SingleFloat.java Fri Nov 6 15:07:54 2009
@@ -86,7 +86,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.FLOAT)
return T;
@@ -168,7 +168,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (obj instanceof SingleFloat)
return value == ((SingleFloat)obj).value;
@@ -223,7 +223,7 @@
return true;
}
- public static double getValue(LispObject obj) throws ConditionThrowable
+ public static double getValue(LispObject obj)
{
if (obj instanceof SingleFloat)
return ((SingleFloat)obj).value;
@@ -275,7 +275,7 @@
}
@Override
- public LispObject add(LispObject obj) throws ConditionThrowable
+ public LispObject add(LispObject obj)
{
if (obj instanceof Fixnum)
return new SingleFloat(value + ((Fixnum)obj).value);
@@ -305,7 +305,7 @@
}
@Override
- public LispObject subtract(LispObject obj) throws ConditionThrowable
+ public LispObject subtract(LispObject obj)
{
if (obj instanceof Fixnum)
return new SingleFloat(value - ((Fixnum)obj).value);
@@ -326,7 +326,7 @@
}
@Override
- public LispObject multiplyBy(LispObject obj) throws ConditionThrowable
+ public LispObject multiplyBy(LispObject obj)
{
if (obj instanceof Fixnum)
return new SingleFloat(value * ((Fixnum)obj).value);
@@ -347,7 +347,7 @@
}
@Override
- public LispObject divideBy(LispObject obj) throws ConditionThrowable
+ public LispObject divideBy(LispObject obj)
{
if (obj instanceof Fixnum)
return new SingleFloat(value / ((Fixnum)obj).value);
@@ -373,7 +373,7 @@
}
@Override
- public boolean isEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return rational().isEqualTo(obj);
@@ -393,13 +393,13 @@
}
@Override
- public boolean isNotEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isNotEqualTo(LispObject obj)
{
return !isEqualTo(obj);
}
@Override
- public boolean isLessThan(LispObject obj) throws ConditionThrowable
+ public boolean isLessThan(LispObject obj)
{
if (obj instanceof Fixnum)
return rational().isLessThan(obj);
@@ -417,7 +417,7 @@
}
@Override
- public boolean isGreaterThan(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThan(LispObject obj)
{
if (obj instanceof Fixnum)
return rational().isGreaterThan(obj);
@@ -435,7 +435,7 @@
}
@Override
- public boolean isLessThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isLessThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return rational().isLessThanOrEqualTo(obj);
@@ -453,7 +453,7 @@
}
@Override
- public boolean isGreaterThanOrEqualTo(LispObject obj) throws ConditionThrowable
+ public boolean isGreaterThanOrEqualTo(LispObject obj)
{
if (obj instanceof Fixnum)
return rational().isGreaterThanOrEqualTo(obj);
@@ -471,7 +471,7 @@
}
@Override
- public LispObject truncate(LispObject obj) throws ConditionThrowable
+ public LispObject truncate(LispObject obj)
{
// "When rationals and floats are combined by a numerical function,
// the rational is first converted to a float of the same format."
@@ -568,7 +568,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
if (value == Float.POSITIVE_INFINITY) {
StringBuffer sb = new StringBuffer("#.");
@@ -603,7 +603,7 @@
return s1;
}
- public LispObject rational() throws ConditionThrowable
+ public LispObject rational()
{
final int bits = Float.floatToRawIntBits(value);
int sign = ((bits >> 31) == 0) ? 1 : -1;
@@ -630,7 +630,7 @@
return number(numerator, denominator);
}
- public static SingleFloat coerceToFloat(LispObject obj) throws ConditionThrowable
+ public static SingleFloat coerceToFloat(LispObject obj)
{
if (obj instanceof Fixnum)
return new SingleFloat(((Fixnum)obj).value);
Modified: trunk/abcl/src/org/armedbear/lisp/SlimeInputStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SlimeInputStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SlimeInputStream.java Fri Nov 6 15:07:54 2009
@@ -64,7 +64,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SLIME_INPUT_STREAM)
return T;
@@ -78,7 +78,7 @@
}
@Override
- public LispObject close(LispObject abort) throws ConditionThrowable
+ public LispObject close(LispObject abort)
{
setOpen(false);
return T;
@@ -131,7 +131,7 @@
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
super._clearInput();
s = "";
@@ -155,7 +155,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final Function fun;
final Stream os;
Modified: trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java Fri Nov 6 15:07:54 2009
@@ -64,7 +64,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SLIME_OUTPUT_STREAM)
return T;
@@ -78,7 +78,7 @@
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
if (elementType == NIL)
writeError();
@@ -87,7 +87,7 @@
@Override
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
if (elementType == NIL)
writeError();
@@ -95,7 +95,7 @@
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
if (elementType == NIL)
writeError();
@@ -103,20 +103,20 @@
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
if (elementType == NIL)
writeError();
super._writeLine(s);
}
- private void writeError() throws ConditionThrowable
+ private void writeError()
{
error(new TypeError("Attempt to write to a string output stream of element type NIL."));
}
@Override
- protected long _getFilePosition() throws ConditionThrowable
+ protected long _getFilePosition()
{
if (elementType == NIL)
return 0;
@@ -124,7 +124,7 @@
}
@Override
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
super._finishOutput ();
if (stringWriter.getBuffer().length() > 0) {
@@ -146,7 +146,7 @@
new Primitive("make-slime-output-stream", PACKAGE_EXT, true, "function")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final Function fun;
if (arg instanceof Symbol)
Modified: trunk/abcl/src/org/armedbear/lisp/SlotClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SlotClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SlotClass.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject result = super.getParts().nreverse();
result = result.push(new Cons("DIRECT-SLOTS", directSlotDefinitions));
@@ -61,7 +61,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
return super.typep(type);
}
@@ -101,7 +101,7 @@
this.defaultInitargs = defaultInitargs;
}
- private LispObject computeDefaultInitargs() throws ConditionThrowable
+ private LispObject computeDefaultInitargs()
{
LispObject result = NIL;
LispObject cpl = getCPL();
@@ -166,7 +166,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof SlotClass)
return ((SlotClass)arg).directSlotDefinitions;
@@ -182,7 +182,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof SlotClass) {
((SlotClass)first).directSlotDefinitions = second;
@@ -200,7 +200,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof SlotClass)
return ((SlotClass)arg).slotDefinitions;
@@ -216,7 +216,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof SlotClass) {
((SlotClass)first).slotDefinitions = second;
@@ -234,7 +234,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof SlotClass)
return ((SlotClass)arg).directDefaultInitargs;
@@ -250,7 +250,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof SlotClass) {
((SlotClass)first).directDefaultInitargs = second;
@@ -266,7 +266,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof SlotClass)
return ((SlotClass)arg).defaultInitargs;
@@ -282,7 +282,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof SlotClass) {
((SlotClass)first).defaultInitargs = second;
@@ -298,7 +298,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
final SlotClass c;
if (arg instanceof SlotClass) {
Modified: trunk/abcl/src/org/armedbear/lisp/SlotDefinition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SlotDefinition.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SlotDefinition.java Fri Nov 6 15:07:54 2009
@@ -82,7 +82,7 @@
}
}
- public static SlotDefinition checkSlotDefination(LispObject obj) throws ConditionThrowable {
+ public static SlotDefinition checkSlotDefination(LispObject obj) {
if (obj instanceof SlotDefinition) return (SlotDefinition)obj;
return (SlotDefinition)type_error(obj, Symbol.SLOT_DEFINITION);
}
@@ -98,7 +98,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
FastStringBuffer sb =
new FastStringBuffer(Symbol.SLOT_DEFINITION.writeToString());
@@ -116,7 +116,7 @@
new Primitive("make-slot-definition", PACKAGE_SYS, true, "")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return new SlotDefinition();
}
@@ -127,7 +127,7 @@
new Primitive(Symbol._SLOT_DEFINITION_NAME, "slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_NAME];
}
@@ -140,7 +140,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_NAME] = second;
return second;
@@ -152,7 +152,7 @@
new Primitive(Symbol._SLOT_DEFINITION_INITFUNCTION, "slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_INITFUNCTION];
}
@@ -165,7 +165,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_INITFUNCTION] = second;
return second;
@@ -178,7 +178,7 @@
"slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_INITFORM];
}
@@ -191,7 +191,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_INITFORM] = second;
return second;
@@ -203,7 +203,7 @@
new Primitive(Symbol._SLOT_DEFINITION_INITARGS, "slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_INITARGS];
}
@@ -216,7 +216,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_INITARGS] = second;
return second;
@@ -229,7 +229,7 @@
"slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_READERS];
}
@@ -242,7 +242,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_READERS] = second;
return second;
@@ -255,7 +255,7 @@
"slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_WRITERS];
}
@@ -268,7 +268,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_WRITERS] = second;
return second;
@@ -281,7 +281,7 @@
"slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_ALLOCATION];
}
@@ -294,7 +294,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_ALLOCATION] = second;
return second;
@@ -307,7 +307,7 @@
"slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_ALLOCATION_CLASS];
}
@@ -320,7 +320,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_ALLOCATION_CLASS] = second;
return second;
@@ -332,7 +332,7 @@
new Primitive("%slot-definition-location", PACKAGE_SYS, true, "slot-definition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkSlotDefination(arg).slots[SlotDefinitionClass.SLOT_INDEX_LOCATION];
}
@@ -344,7 +344,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkSlotDefination(first).slots[SlotDefinitionClass.SLOT_INDEX_LOCATION] = second;
return second;
Modified: trunk/abcl/src/org/armedbear/lisp/SocketStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SocketStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SocketStream.java Fri Nov 6 15:07:54 2009
@@ -58,7 +58,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SOCKET_STREAM)
return T;
@@ -68,7 +68,7 @@
}
@Override
- public LispObject close(LispObject abort) throws ConditionThrowable
+ public LispObject close(LispObject abort)
{
try {
socket.close();
Modified: trunk/abcl/src/org/armedbear/lisp/SpecialBinding.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SpecialBinding.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SpecialBinding.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
* If the binding is invalid, an unbound variable error
* is raised.
*/
- final public LispObject getValue() throws ConditionThrowable
+ final public LispObject getValue()
{
if (value == null)
return Lisp.error(new UnboundVariable(name));
Modified: trunk/abcl/src/org/armedbear/lisp/SpecialOperator.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SpecialOperator.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SpecialOperator.java Fri Nov 6 15:07:54 2009
@@ -71,20 +71,20 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return error(new UndefinedFunction(getLambdaName()));
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return error(new UndefinedFunction(getLambdaName()));
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(getLambdaName()));
}
@@ -92,7 +92,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(getLambdaName()));
}
@@ -100,7 +100,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(getLambdaName()));
}
@@ -109,7 +109,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(getLambdaName()));
}
@@ -118,7 +118,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(getLambdaName()));
}
@@ -128,7 +128,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(getLambdaName()));
}
@@ -138,19 +138,19 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
return error(new UndefinedFunction(getLambdaName()));
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return error(new UndefinedFunction(getLambdaName()));
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
StringBuffer sb = new StringBuffer("#<SPECIAL-OPERATOR ");
sb.append(lambdaName.writeToString());
Modified: trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.cdr() != NIL)
return error(new WrongNumberOfArgumentsException(this));
@@ -57,7 +57,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
switch (args.length())
@@ -87,7 +87,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args == NIL)
return error(new WrongNumberOfArgumentsException(this));
@@ -101,7 +101,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args == NIL)
return error(new WrongNumberOfArgumentsException(this));
@@ -111,7 +111,7 @@
private static final LispObject _let(LispObject args, Environment env,
boolean sequential)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
@@ -176,7 +176,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispObject varList = checkList(args.car());
final LispThread thread = LispThread.currentThread();
@@ -227,7 +227,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
switch (args.length())
{
@@ -247,7 +247,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
final Environment ext = new Environment(env);
@@ -262,7 +262,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispThread thread = LispThread.currentThread();
return progn(args, env, thread);
@@ -275,7 +275,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
return _flet(args, env, false);
}
@@ -287,7 +287,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
return _flet(args, env, true);
}
@@ -295,7 +295,7 @@
private static final LispObject _flet(LispObject args, Environment env,
boolean recursive)
- throws ConditionThrowable
+
{
// First argument is a list of local function definitions.
LispObject defs = checkList(args.car());
@@ -367,7 +367,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() != 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -402,7 +402,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
if (args.length() < 2)
return error(new WrongNumberOfArgumentsException(this));
@@ -430,7 +430,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
return NIL;
}
@@ -442,7 +442,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
final LispObject arg = args.car();
if (arg instanceof Symbol)
@@ -500,7 +500,7 @@
{
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispObject value = Symbol.NIL;
final LispThread thread = LispThread.currentThread();
Modified: trunk/abcl/src/org/armedbear/lisp/StackFrame.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StackFrame.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StackFrame.java Fri Nov 6 15:07:54 2009
@@ -38,7 +38,7 @@
{
@Override
public LispObject typep(LispObject typeSpecifier)
- throws ConditionThrowable
+
{
if (typeSpecifier == Symbol.STACK_FRAME)
return T;
@@ -56,6 +56,6 @@
return this.next;
}
- public abstract LispObject toLispList() throws ConditionThrowable;
- public abstract SimpleString toLispString() throws ConditionThrowable;
+ public abstract LispObject toLispList();
+ public abstract SimpleString toLispString();
}
Modified: trunk/abcl/src/org/armedbear/lisp/StandardClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardClass.java Fri Nov 6 15:07:54 2009
@@ -59,7 +59,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STANDARD_CLASS)
return T;
@@ -68,7 +68,7 @@
return super.typep(type);
}
- public LispObject allocateInstance() throws ConditionThrowable
+ public LispObject allocateInstance()
{
Layout layout = getClassLayout();
if (layout == null)
@@ -83,7 +83,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
FastStringBuffer sb =
new FastStringBuffer(Symbol.STANDARD_CLASS.writeToString());
@@ -264,7 +264,7 @@
addClass(Symbol.SLOT_DEFINITION, SLOT_DEFINITION);
}
- public static void initializeStandardClasses() throws ConditionThrowable
+ public static void initializeStandardClasses()
{
// We need to call setDirectSuperclass() here for classes that have a
// BuiltInClass as a superclass. See comment above (at first mention of
Modified: trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java Fri Nov 6 15:07:54 2009
@@ -99,7 +99,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.COMPILED_FUNCTION)
{
@@ -126,20 +126,20 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return function.execute();
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return function.execute(arg);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return function.execute(first, second);
}
@@ -147,7 +147,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return function.execute(first, second, third);
}
@@ -155,7 +155,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return function.execute(first, second, third, fourth);
}
@@ -164,7 +164,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
return function.execute(first, second, third, fourth,
fifth);
@@ -174,7 +174,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
return function.execute(first, second, third, fourth,
fifth, sixth);
@@ -185,7 +185,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
return function.execute(first, second, third, fourth,
fifth, sixth, seventh);
@@ -196,20 +196,20 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
return function.execute(first, second, third, fourth,
fifth, sixth, seventh, eighth);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
return function.execute(args);
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
LispObject name = getGenericFunctionName();
if (name != null)
@@ -277,7 +277,7 @@
new Primitive("%generic-function-name", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_NAME];
}
@@ -289,7 +289,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).slots[StandardGenericFunctionClass.SLOT_INDEX_NAME] = second;
return second;
@@ -301,7 +301,7 @@
new Primitive("%generic-function-lambda-list", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_LAMBDA_LIST];
}
@@ -313,7 +313,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).slots[StandardGenericFunctionClass.SLOT_INDEX_LAMBDA_LIST] = second;
return second;
@@ -327,7 +327,7 @@
{
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
return checkStandardGenericFunction(arg).function;
}
@@ -341,7 +341,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).function = second;
return second;
@@ -353,7 +353,7 @@
new Primitive("gf-required-args", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_REQUIRED_ARGS];
}
@@ -365,7 +365,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardGenericFunction gf = checkStandardGenericFunction(first);
gf.slots[StandardGenericFunctionClass.SLOT_INDEX_REQUIRED_ARGS] = second;
@@ -379,7 +379,7 @@
new Primitive("generic-function-initial-methods", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_INITIAL_METHODS];
}
@@ -391,7 +391,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).slots[StandardGenericFunctionClass.SLOT_INDEX_INITIAL_METHODS] = second;
return second;
@@ -403,7 +403,7 @@
new Primitive("generic-function-methods", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_METHODS];
}
@@ -415,7 +415,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).slots[StandardGenericFunctionClass.SLOT_INDEX_METHODS] = second;
return second;
@@ -427,7 +427,7 @@
new Primitive("generic-function-method-class", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_METHOD_CLASS];
}
@@ -439,7 +439,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).slots[StandardGenericFunctionClass.SLOT_INDEX_METHOD_CLASS] = second;
return second;
@@ -451,7 +451,7 @@
new Primitive("generic-function-method-combination", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_METHOD_COMBINATION];
}
@@ -463,7 +463,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).slots[StandardGenericFunctionClass.SLOT_INDEX_METHOD_COMBINATION]
= second;
@@ -476,7 +476,7 @@
new Primitive("generic-function-argument-precedence-order", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass
.SLOT_INDEX_ARGUMENT_PRECEDENCE_ORDER];
@@ -489,7 +489,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first)
.slots[StandardGenericFunctionClass.SLOT_INDEX_ARGUMENT_PRECEDENCE_ORDER] = second;
@@ -502,7 +502,7 @@
new Primitive("generic-function-classes-to-emf-table", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg)
.slots[StandardGenericFunctionClass.SLOT_INDEX_CLASSES_TO_EMF_TABLE];
@@ -515,7 +515,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first)
.slots[StandardGenericFunctionClass.SLOT_INDEX_CLASSES_TO_EMF_TABLE] = second;
@@ -528,7 +528,7 @@
new Primitive("generic-function-documentation", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardGenericFunction(arg).slots[StandardGenericFunctionClass.SLOT_INDEX_DOCUMENTATION];
}
@@ -540,7 +540,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardGenericFunction(first).slots[StandardGenericFunctionClass.SLOT_INDEX_DOCUMENTATION]
= second;
@@ -554,7 +554,7 @@
"generic-function")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final StandardGenericFunction gf = checkStandardGenericFunction(arg);
gf.finalizeInternal();
@@ -569,7 +569,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final StandardGenericFunction gf = checkStandardGenericFunction(first);
LispObject args = second;
@@ -594,7 +594,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardGenericFunction gf = checkStandardGenericFunction(first);
LispObject args = second;
@@ -685,7 +685,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardGenericFunction gf = checkStandardGenericFunction(first);
return gf.getArgSpecialization(second);
@@ -699,7 +699,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final StandardGenericFunction gf = checkStandardGenericFunction(first);
LispObject layout = second;
@@ -718,7 +718,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardGenericFunction gf = checkStandardGenericFunction(first);
LispObject layout = second;
@@ -781,7 +781,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardGenericFunction gf = checkStandardGenericFunction(first);
LispObject eqlSpecializerObjects = second;
@@ -805,7 +805,7 @@
}
public static final StandardGenericFunction checkStandardGenericFunction(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof StandardGenericFunction)
return (StandardGenericFunction) obj;
Modified: trunk/abcl/src/org/armedbear/lisp/StandardMethod.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardMethod.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardMethod.java Fri Nov 6 15:07:54 2009
@@ -67,7 +67,7 @@
new Primitive("method-lambda-list", PACKAGE_SYS, true, "method")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardMethod(arg).slots[StandardMethodClass.SLOT_INDEX_LAMBDA_LIST];
}
@@ -80,7 +80,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardMethod(first).slots[StandardMethodClass.SLOT_INDEX_LAMBDA_LIST] = second;
return second;
@@ -92,7 +92,7 @@
new Primitive("%method-qualifiers", PACKAGE_SYS, true, "method")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardMethod(arg).slots[StandardMethodClass.SLOT_INDEX_QUALIFIERS];
}
@@ -105,7 +105,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardMethod(first).slots[StandardMethodClass.SLOT_INDEX_QUALIFIERS] = second;
return second;
@@ -117,7 +117,7 @@
new Primitive("method-documentation", PACKAGE_SYS, true, "method")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardMethod(arg).slots[StandardMethodClass.SLOT_INDEX_DOCUMENTATION];
}
@@ -130,7 +130,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardMethod(first).slots[StandardMethodClass.SLOT_INDEX_DOCUMENTATION] = second;
return second;
@@ -143,7 +143,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
LispObject genericFunction =
slots[StandardMethodClass.SLOT_INDEX_GENERIC_FUNCTION];
@@ -186,7 +186,7 @@
new Primitive("%method-generic-function", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardMethod(arg).slots[StandardMethodClass.SLOT_INDEX_GENERIC_FUNCTION];
}
@@ -198,7 +198,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardMethod(first).slots[StandardMethodClass.SLOT_INDEX_GENERIC_FUNCTION] = second;
return second;
@@ -210,7 +210,7 @@
new Primitive("%method-function", PACKAGE_SYS, true, "method")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardMethod(arg).slots[StandardMethodClass.SLOT_INDEX_FUNCTION];
}
@@ -223,7 +223,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardMethod(first).slots[StandardMethodClass.SLOT_INDEX_FUNCTION] = second;
return second;
@@ -235,7 +235,7 @@
new Primitive("%method-fast-function", PACKAGE_SYS, true, "method")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardMethod(arg).slots[StandardMethodClass.SLOT_INDEX_FAST_FUNCTION];
}
@@ -248,7 +248,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardMethod(first).slots[StandardMethodClass.SLOT_INDEX_FAST_FUNCTION] = second;
return second;
@@ -260,7 +260,7 @@
new Primitive("%method-specializers", PACKAGE_SYS, true, "method")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardMethod(arg).slots[StandardMethodClass.SLOT_INDEX_SPECIALIZERS];
}
@@ -273,7 +273,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardMethod(first).slots[StandardMethodClass.SLOT_INDEX_SPECIALIZERS] = second;
return second;
@@ -296,7 +296,7 @@
list(Symbol.METHOD),
list(StandardClass.STANDARD_METHOD));
- final public static StandardMethod checkStandardMethod(LispObject first) throws ConditionThrowable
+ final public static StandardMethod checkStandardMethod(LispObject first)
{
if (first instanceof StandardMethod)
return (StandardMethod) first;
Modified: trunk/abcl/src/org/armedbear/lisp/StandardObject.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardObject.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardObject.java Fri Nov 6 15:07:54 2009
@@ -60,7 +60,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject parts = NIL;
if (layout != null)
@@ -119,7 +119,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STANDARD_OBJECT)
return T;
@@ -146,7 +146,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
int maxLevel = Integer.MAX_VALUE;
@@ -167,7 +167,7 @@
return unreadableString(typeOf().writeToString());
}
- private Layout updateLayout() throws ConditionThrowable
+ private Layout updateLayout()
{
Debug.assertTrue(layout.isInvalid());
Layout oldLayout = layout;
@@ -242,7 +242,7 @@
// Only handles instance slots (not shared slots).
public LispObject getInstanceSlotValue(LispObject slotName)
- throws ConditionThrowable
+
{
Debug.assertTrue(layout != null);
if (layout.isInvalid())
@@ -260,7 +260,7 @@
// Only handles instance slots (not shared slots).
public void setInstanceSlotValue(LispObject slotName, LispObject newValue)
- throws ConditionThrowable
+
{
Debug.assertTrue(layout != null);
if (layout.isInvalid())
@@ -276,7 +276,7 @@
slots[index] = newValue;
}
- final public static StandardObject checkStandardObject(LispObject first) throws ConditionThrowable
+ final public static StandardObject checkStandardObject(LispObject first)
{
if (first instanceof StandardObject)
return (StandardObject) first;
@@ -289,7 +289,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardObject obj1 = checkStandardObject(first);
final StandardObject obj2 = checkStandardObject(second);
@@ -305,7 +305,7 @@
new Primitive("std-instance-layout", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final StandardObject instance = checkStandardObject(arg);
Layout layout = instance.layout;
@@ -324,7 +324,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStandardObject(first).layout = checkLayout(second);
return second;
@@ -336,7 +336,7 @@
new Primitive("std-instance-class", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStandardObject(arg).layout.lispClass;
}
@@ -349,7 +349,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardObject instance = checkStandardObject(first);
final int index;
@@ -392,7 +392,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
checkStandardObject(first).slots[Fixnum.getValue(second)] = third; // FIXME
return third;
@@ -405,7 +405,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final StandardObject instance = checkStandardObject(first);
Layout layout = instance.layout;
@@ -437,7 +437,7 @@
};
@Override
- public LispObject SLOT_VALUE(LispObject slotName) throws ConditionThrowable
+ public LispObject SLOT_VALUE(LispObject slotName)
{
if (layout.isInvalid())
{
@@ -474,7 +474,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.SLOT_VALUE(second);
}
@@ -482,7 +482,7 @@
@Override
public void setSlotValue(LispObject slotName, LispObject newValue)
- throws ConditionThrowable
+
{
if (layout.isInvalid())
{
@@ -519,7 +519,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
first.setSlotValue(second, third);
return third;
Modified: trunk/abcl/src/org/armedbear/lisp/StandardObjectFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardObjectFunctions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardObjectFunctions.java Fri Nov 6 15:07:54 2009
@@ -40,7 +40,7 @@
new Primitive("std-allocate-instance", PACKAGE_SYS, true, "class")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == StandardClass.STANDARD_CLASS)
return new StandardClass();
Modified: trunk/abcl/src/org/armedbear/lisp/StandardReaderMethod.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardReaderMethod.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardReaderMethod.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
new Primitive("reader-method-slot-name", PACKAGE_MOP, false, "reader-method")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof StandardReaderMethod)
return ((StandardReaderMethod)arg).slots[StandardReaderMethodClass.SLOT_INDEX_SLOT_NAME];
@@ -61,7 +61,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof StandardReaderMethod)
{
Modified: trunk/abcl/src/org/armedbear/lisp/StorageCondition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StorageCondition.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StorageCondition.java Fri Nov 6 15:07:54 2009
@@ -35,11 +35,11 @@
public class StorageCondition extends SeriousCondition
{
- public StorageCondition() throws ConditionThrowable
+ public StorageCondition()
{
}
- public StorageCondition(LispObject initArgs) throws ConditionThrowable
+ public StorageCondition(LispObject initArgs)
{
super(initArgs);
}
@@ -62,7 +62,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STORAGE_CONDITION)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/Stream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Stream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Stream.java Fri Nov 6 15:07:54 2009
@@ -224,32 +224,32 @@
isBinaryStream = true;
}
- public boolean isInputStream() throws ConditionThrowable
+ public boolean isInputStream()
{
return isInputStream;
}
- public boolean isOutputStream() throws ConditionThrowable
+ public boolean isOutputStream()
{
return isOutputStream;
}
- public boolean isCharacterInputStream() throws ConditionThrowable
+ public boolean isCharacterInputStream()
{
return isCharacterStream && isInputStream;
}
- public boolean isBinaryInputStream() throws ConditionThrowable
+ public boolean isBinaryInputStream()
{
return isBinaryStream && isInputStream;
}
- public boolean isCharacterOutputStream() throws ConditionThrowable
+ public boolean isCharacterOutputStream()
{
return isCharacterStream && isOutputStream;
}
- public boolean isBinaryOutputStream() throws ConditionThrowable
+ public boolean isBinaryOutputStream()
{
return isBinaryStream && isOutputStream;
}
@@ -356,7 +356,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.STREAM)
return T;
@@ -365,7 +365,7 @@
return super.typep(typeSpecifier);
}
- public LispObject getElementType() throws ConditionThrowable
+ public LispObject getElementType()
{
return elementType;
}
@@ -401,7 +401,7 @@
public LispObject read(boolean eofError, LispObject eofValue,
boolean recursive, LispThread thread)
- throws ConditionThrowable
+
{
LispObject result = readPreservingWhitespace(eofError, eofValue,
recursive, thread);
@@ -440,7 +440,7 @@
LispObject eofValue,
boolean recursive,
LispThread thread)
- throws ConditionThrowable
+
{
if (recursive)
{
@@ -488,7 +488,7 @@
public LispObject faslRead(boolean eofError, LispObject eofValue,
boolean recursive, LispThread thread)
- throws ConditionThrowable
+
{
try
{
@@ -523,7 +523,7 @@
LispObject eofValue,
boolean recursive,
LispThread thread)
- throws ConditionThrowable, IOException
+ throws IOException
{
if (recursive)
{
@@ -562,7 +562,7 @@
}
private final LispObject processChar(char c, Readtable rt)
- throws ConditionThrowable
+
{
final LispObject handler = rt.getReaderMacroFunction(c);
if (handler instanceof ReaderMacroFunction)
@@ -572,7 +572,7 @@
return readToken(c, rt);
}
- public LispObject readPathname() throws ConditionThrowable
+ public LispObject readPathname()
{
LispObject obj = read(true, NIL, false, LispThread.currentThread());
if (obj instanceof AbstractString)
@@ -582,7 +582,7 @@
return error(new TypeError("#p requires a string or list argument."));
}
- public LispObject faslReadPathname() throws ConditionThrowable
+ public LispObject faslReadPathname()
{
LispObject obj = faslRead(true, NIL, false, LispThread.currentThread());
if (obj instanceof AbstractString)
@@ -592,7 +592,7 @@
return error(new TypeError("#p requires a string or list argument."));
}
- public LispObject readSymbol() throws ConditionThrowable
+ public LispObject readSymbol()
{
final Readtable rt =
(Readtable) Symbol.CURRENT_READTABLE.symbolValue(LispThread.currentThread());
@@ -601,14 +601,14 @@
return new Symbol(sb.toString());
}
- public LispObject readSymbol(Readtable rt) throws ConditionThrowable
+ public LispObject readSymbol(Readtable rt)
{
FastStringBuffer sb = new FastStringBuffer();
_readToken(sb, rt);
return new Symbol(sb.toString());
}
- public LispObject readStructure() throws ConditionThrowable
+ public LispObject readStructure()
{
final LispThread thread = LispThread.currentThread();
LispObject obj = read(true, NIL, true, thread);
@@ -656,7 +656,7 @@
this));
}
- public LispObject faslReadStructure() throws ConditionThrowable
+ public LispObject faslReadStructure()
{
final LispThread thread = LispThread.currentThread();
LispObject obj = faslRead(true, NIL, true, thread);
@@ -705,7 +705,7 @@
}
public LispObject readList(boolean requireProperList, boolean useFaslReadtable)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
Cons first = null;
@@ -784,7 +784,7 @@
}
private static final boolean isTokenDelimiter(char c, Readtable rt)
- throws ConditionThrowable
+
{
switch (c)
{
@@ -802,7 +802,7 @@
}
public LispObject readDispatchChar(char dispChar, boolean useFaslReadtable)
- throws ConditionThrowable
+
{
int numArg = -1;
char c = 0;
@@ -852,7 +852,7 @@
}
public LispObject readCharacterLiteral(Readtable rt, LispThread thread)
- throws ConditionThrowable
+
{
try
{
@@ -892,7 +892,7 @@
}
}
- public void skipBalancedComment() throws ConditionThrowable
+ public void skipBalancedComment()
{
try
{
@@ -925,7 +925,7 @@
}
}
- public LispObject readArray(int rank) throws ConditionThrowable
+ public LispObject readArray(int rank)
{
final LispThread thread = LispThread.currentThread();
LispObject obj = read(true, NIL, true, thread);
@@ -949,7 +949,7 @@
}
}
- public LispObject faslReadArray(int rank) throws ConditionThrowable
+ public LispObject faslReadArray(int rank)
{
final LispThread thread = LispThread.currentThread();
LispObject obj = faslRead(true, NIL, true, thread);
@@ -973,7 +973,7 @@
}
}
- public LispObject readComplex() throws ConditionThrowable
+ public LispObject readComplex()
{
final LispThread thread = LispThread.currentThread();
LispObject obj = read(true, NIL, true, thread);
@@ -1004,7 +1004,7 @@
return error(new ReaderError(sb.toString(), this));
}
- public LispObject faslReadComplex() throws ConditionThrowable
+ public LispObject faslReadComplex()
{
final LispThread thread = LispThread.currentThread();
LispObject obj = faslRead(true, NIL, true, thread);
@@ -1035,7 +1035,7 @@
return error(new ReaderError(sb.toString(), this));
}
- private String readMultipleEscape(Readtable rt) throws ConditionThrowable
+ private String readMultipleEscape(Readtable rt)
{
FastStringBuffer sb = new FastStringBuffer();
try
@@ -1109,7 +1109,7 @@
}
private final LispObject readToken(char c, Readtable rt)
- throws ConditionThrowable
+
{
FastStringBuffer sb = new FastStringBuffer(c);
final LispThread thread = LispThread.currentThread();
@@ -1214,7 +1214,7 @@
}
private final BitSet _readToken(FastStringBuffer sb, Readtable rt)
- throws ConditionThrowable
+
{
BitSet flags = null;
final LispObject readtableCase = rt.getReadtableCase();
@@ -1368,7 +1368,7 @@
}
private static final int getReadBase(LispThread thread)
- throws ConditionThrowable
+
{
final int readBase;
final LispObject readBaseObject = Symbol.READ_BASE.symbolValue(thread);
@@ -1390,7 +1390,7 @@
}
private final LispObject makeNumber(String token, int length, int radix)
- throws ConditionThrowable
+
{
if (length == 0)
return null;
@@ -1453,7 +1453,7 @@
}
private final LispObject makeRatio(String token, int radix)
- throws ConditionThrowable
+
{
final int index = token.indexOf('/');
if (index < 0)
@@ -1479,7 +1479,7 @@
private static final LispObject makeFloat(final String token,
final int length)
- throws ConditionThrowable
+
{
if (length == 0)
return null;
@@ -1555,7 +1555,7 @@
}
}
- public LispObject readRadix(int radix) throws ConditionThrowable
+ public LispObject readRadix(int radix)
{
FastStringBuffer sb = new FastStringBuffer();
final LispThread thread = LispThread.currentThread();
@@ -1589,7 +1589,7 @@
return error(new LispError());
}
- public LispObject faslReadRadix(int radix) throws ConditionThrowable
+ public LispObject faslReadRadix(int radix)
{
FastStringBuffer sb = new FastStringBuffer();
final LispThread thread = LispThread.currentThread();
@@ -1618,7 +1618,7 @@
return error(new LispError());
}
- private char flushWhitespace(Readtable rt) throws ConditionThrowable
+ private char flushWhitespace(Readtable rt)
{
try
{
@@ -1644,7 +1644,7 @@
}
public LispObject readDelimitedList(char delimiter)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject result = NIL;
@@ -1668,7 +1668,7 @@
// => line, missing-newline-p
// recursive-p is ignored
public LispObject readLine(boolean eofError, LispObject eofValue)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
FastStringBuffer sb = new FastStringBuffer();
@@ -1701,7 +1701,7 @@
// read-char &optional stream eof-error-p eof-value recursive-p => char
// recursive-p is ignored
- public LispObject readChar() throws ConditionThrowable
+ public LispObject readChar()
{
try
{
@@ -1718,7 +1718,7 @@
}
public LispObject readChar(boolean eofError, LispObject eofValue)
- throws ConditionThrowable
+
{
try
{
@@ -1741,7 +1741,7 @@
// read-char-no-hang &optional stream eof-error-p eof-value recursive-p => char
// recursive-p is ignored
public LispObject readCharNoHang(boolean eofError, LispObject eofValue)
- throws ConditionThrowable
+
{
try
{
@@ -1755,7 +1755,7 @@
// unread-char character &optional input-stream => nil
- public LispObject unreadChar(LispCharacter c) throws ConditionThrowable
+ public LispObject unreadChar(LispCharacter c)
{
try
{
@@ -1768,33 +1768,33 @@
}
}
- public LispObject finishOutput() throws ConditionThrowable
+ public LispObject finishOutput()
{
_finishOutput();
return NIL;
}
// clear-input &optional input-stream => nil
- public LispObject clearInput() throws ConditionThrowable
+ public LispObject clearInput()
{
_clearInput();
return NIL;
}
- public LispObject getFilePosition() throws ConditionThrowable
+ public LispObject getFilePosition()
{
long pos = _getFilePosition();
return pos >= 0 ? number(pos) : NIL;
}
- public LispObject setFilePosition(LispObject arg) throws ConditionThrowable
+ public LispObject setFilePosition(LispObject arg)
{
return _setFilePosition(arg) ? T : NIL;
}
// close stream &key abort => result
// Must return true if stream was open, otherwise implementation-dependent.
- public LispObject close(LispObject abort) throws ConditionThrowable
+ public LispObject close(LispObject abort)
{
_close();
return T;
@@ -1809,7 +1809,7 @@
// read-byte stream &optional eof-error-p eof-value => byte
// Reads an 8-bit byte.
public LispObject readByte(boolean eofError, LispObject eofValue)
- throws ConditionThrowable
+
{
int n = _readByte();
if (n < 0)
@@ -1822,13 +1822,13 @@
return Fixnum.constants[n];
}
- public LispObject terpri() throws ConditionThrowable
+ public LispObject terpri()
{
_writeChar('\n');
return NIL;
}
- public LispObject freshLine() throws ConditionThrowable
+ public LispObject freshLine()
{
if (charPos == 0)
return NIL;
@@ -1836,14 +1836,14 @@
return T;
}
- public void print(char c) throws ConditionThrowable
+ public void print(char c)
{
_writeChar(c);
}
// PRIN1 produces output suitable for input to READ.
// Binds *PRINT-ESCAPE* to true.
- public void prin1(LispObject obj) throws ConditionThrowable
+ public void prin1(LispObject obj)
{
LispThread thread = LispThread.currentThread();
SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
@@ -1858,7 +1858,7 @@
}
}
- public LispObject listen() throws ConditionThrowable
+ public LispObject listen()
{
if (pastEnd)
return NIL;
@@ -1881,12 +1881,12 @@
}
}
- public LispObject fileLength() throws ConditionThrowable
+ public LispObject fileLength()
{
return type_error(this, Symbol.FILE_STREAM);
}
- public LispObject fileStringLength(LispObject arg) throws ConditionThrowable
+ public LispObject fileStringLength(LispObject arg)
{
if (arg instanceof LispCharacter)
{
@@ -1922,9 +1922,8 @@
/** Reads a character off an underlying stream
*
* @return a character, or -1 at end-of-file
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- protected int _readChar() throws ConditionThrowable, IOException
+ protected int _readChar() throws IOException
{
if (reader == null)
streamNotCharacterInputStream();
@@ -1958,9 +1957,8 @@
/** Puts a character back into the (underlying) stream
*
* @param n
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- protected void _unreadChar(int n) throws ConditionThrowable, IOException
+ protected void _unreadChar(int n) throws IOException
{
if (reader == null)
streamNotCharacterInputStream();
@@ -1979,9 +1977,8 @@
/** Returns a boolean indicating input readily available
*
* @return true if a character is available
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- protected boolean _charReady() throws ConditionThrowable, IOException
+ protected boolean _charReady() throws IOException
{
if (reader == null)
streamNotCharacterInputStream();
@@ -1992,9 +1989,8 @@
* updating charPos while doing so
*
* @param c
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
try
{
@@ -2029,10 +2025,9 @@
* @param chars
* @param start
* @param end
- * @throws org.armedbear.lisp.ConditionThrowable
*/
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
try
{
@@ -2085,9 +2080,8 @@
* updating charPos while doing so
*
* @param s
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
try
{
@@ -2106,9 +2100,8 @@
* a new line and updating charPos while doing so
*
* @param s
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
try
{
@@ -2126,9 +2119,8 @@
/** Reads an 8-bit byte off the underlying stream
*
* @return
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public int _readByte() throws ConditionThrowable
+ public int _readByte()
{
try
{
@@ -2150,9 +2142,8 @@
/** Writes an 8-bit byte off the underlying stream
*
* @param n
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public void _writeByte(int n) throws ConditionThrowable
+ public void _writeByte(int n)
{
try
{
@@ -2171,9 +2162,8 @@
/** Flushes any buffered output in the (underlying) stream
*
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
try
{
@@ -2191,9 +2181,8 @@
/** Reads all input from the underlying stream,
* until _charReady() indicates no more input to be available
*
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
if (reader != null)
{
@@ -2231,9 +2220,8 @@
*
* @return non-negative value as a position spec
* @return negative value for 'unspecified'
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- protected long _getFilePosition() throws ConditionThrowable
+ protected long _getFilePosition()
{
return -1;
}
@@ -2242,18 +2230,16 @@
*
* @param arg File position specifier as described in the CLHS
* @return true on success, false on failure
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- protected boolean _setFilePosition(LispObject arg) throws ConditionThrowable
+ protected boolean _setFilePosition(LispObject arg)
{
return false;
}
/** Closes the stream and underlying streams
*
- * @throws org.armedbear.lisp.ConditionThrowable
*/
- public void _close() throws ConditionThrowable
+ public void _close()
{
try
{
@@ -2273,7 +2259,7 @@
}
}
- public void printStackTrace(Throwable t) throws ConditionThrowable
+ public void printStackTrace(Throwable t)
{
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
@@ -2292,27 +2278,27 @@
}
}
- protected LispObject streamNotInputStream() throws ConditionThrowable
+ protected LispObject streamNotInputStream()
{
return error(new StreamError(this, writeToString() + " is not an input stream."));
}
- protected LispObject streamNotCharacterInputStream() throws ConditionThrowable
+ protected LispObject streamNotCharacterInputStream()
{
return error(new StreamError(this, writeToString() + " is not a character input stream."));
}
- protected LispObject streamNotOutputStream() throws ConditionThrowable
+ protected LispObject streamNotOutputStream()
{
return error(new StreamError(this, writeToString() + " is not an output stream."));
}
- protected LispObject streamNotBinaryOutputStream() throws ConditionThrowable
+ protected LispObject streamNotBinaryOutputStream()
{
return error(new StreamError(this, writeToString() + " is not a binary output stream."));
}
- protected LispObject streamNotCharacterOutputStream() throws ConditionThrowable
+ protected LispObject streamNotCharacterOutputStream()
{
return error(new StreamError(this, writeToString() + " is not a character output stream."));
}
@@ -2325,7 +2311,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
checkStream(second)._writeChar(LispCharacter.getValue(first));
return first;
@@ -2339,7 +2325,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final char c = LispCharacter.getValue(first);
if (second == T)
@@ -2360,7 +2346,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
final AbstractString s = checkString(first);
char[] chars = s.chars();
@@ -2384,7 +2370,7 @@
new Primitive("%finish-output", PACKAGE_SYS, false, "output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return finishOutput(arg);
}
@@ -2395,14 +2381,14 @@
new Primitive("%force-output", PACKAGE_SYS, false, "output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return finishOutput(arg);
}
};
private static final LispObject finishOutput(LispObject arg)
- throws ConditionThrowable
+
{
final LispObject out;
if (arg == T)
@@ -2419,7 +2405,7 @@
new Primitive(Symbol.CLEAR_INPUT, "&optional input-stream")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length > 1)
return error(new WrongNumberOfArgumentsException(this));
@@ -2440,7 +2426,7 @@
new Primitive("%clear-output", PACKAGE_SYS, false, "output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == T) // *TERMINAL-IO*
return NIL;
@@ -2457,7 +2443,7 @@
new Primitive(Symbol.CLOSE, "stream &key abort")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStream(arg).close(NIL);
}
@@ -2465,7 +2451,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final Stream stream = checkStream(first);
if (second == Keyword.ABORT)
@@ -2480,7 +2466,7 @@
new Primitive("out-synonym-of", PACKAGE_SYS, true, "stream-designator")
{
@Override
- public LispObject execute (LispObject arg) throws ConditionThrowable
+ public LispObject execute (LispObject arg)
{
if (arg instanceof Stream)
return arg;
@@ -2499,7 +2485,7 @@
{
@Override
public LispObject execute (LispObject first, LispObject second)
- throws ConditionThrowable
+
{
int n = Fixnum.getValue(first);
if (n < 0 || n > 255)
@@ -2518,14 +2504,14 @@
@Override
public LispObject execute (LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return checkBinaryInputStream(first).readByte((second != NIL),
third);
}
@Override
- public LispObject execute (LispObject[] args) throws ConditionThrowable
+ public LispObject execute (LispObject[] args)
{
int length = args.length;
if (length < 1 || length > 3)
@@ -2544,14 +2530,14 @@
"&optional input-stream eof-error-p eof-value recursive-p")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
final LispObject obj = Symbol.STANDARD_INPUT.symbolValue();
final Stream stream = checkStream(obj);
return stream.readLine(true, NIL);
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == T)
arg = Symbol.TERMINAL_IO.symbolValue();
@@ -2562,7 +2548,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first == T)
first = Symbol.TERMINAL_IO.symbolValue();
@@ -2574,7 +2560,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first == T)
first = Symbol.TERMINAL_IO.symbolValue();
@@ -2586,7 +2572,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
// recursive-p is ignored
if (first == T)
@@ -2607,7 +2593,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
String s = first.getStringValue();
boolean eofError = (second != NIL);
@@ -2641,7 +2627,7 @@
"&optional input-stream eof-error-p eof-value recursive-p")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
final LispThread thread = LispThread.currentThread();
final LispObject obj = Symbol.STANDARD_INPUT.symbolValue(thread);
@@ -2649,7 +2635,7 @@
return stream.read(true, NIL, false, thread);
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispThread thread = LispThread.currentThread();
if (arg == T)
@@ -2661,7 +2647,7 @@
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (first == T)
@@ -2674,7 +2660,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (first == T)
@@ -2687,7 +2673,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (first == T)
@@ -2706,7 +2692,7 @@
"&optional input-stream eof-error-p eof-value recursive-p")
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
int length = args.length;
if (length > 4)
@@ -2729,32 +2715,32 @@
"&optional input-stream eof-error-p eof-value recursive-p")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return checkCharacterInputStream(Symbol.STANDARD_INPUT.symbolValue()).readChar();
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return inSynonymOf(arg).readChar();
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return inSynonymOf(first).readChar(second != NIL, NIL);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return inSynonymOf(first).readChar(second != NIL, third);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return inSynonymOf(first).readChar(second != NIL, third);
}
@@ -2766,7 +2752,7 @@
new Primitive("read-char-no-hang", "&optional input-stream eof-error-p eof-value recursive-p") {
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
int length = args.length;
if (length > 4)
@@ -2786,7 +2772,7 @@
new Primitive("read-delimited-list", "char &optional input-stream recursive-p") {
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
int length = args.length;
if (length < 1 || length > 3)
@@ -2804,13 +2790,13 @@
new Primitive(Symbol.UNREAD_CHAR, "character &optional input-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return getStandardInput().unreadChar(checkCharacter(arg));
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Stream stream = inSynonymOf(second);
return stream.unreadChar(checkCharacter(first));
@@ -2825,7 +2811,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
final AbstractVector v = checkVector(first);
final Stream stream = checkStream(second);
@@ -2845,7 +2831,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
AbstractVector v = checkVector(first);
Stream stream = checkBinaryInputStream(second);
@@ -2873,13 +2859,13 @@
new Primitive("file-position", "stream &optional position-spec")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStream(arg).getFilePosition();
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return checkStream(first).setFilePosition(second);
}
@@ -2890,7 +2876,7 @@
new Primitive("stream-line-number", PACKAGE_SYS, false, "stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Fixnum.getInstance(checkStream(arg).getLineNumber() + 1);
}
@@ -2901,7 +2887,7 @@
new Primitive("stream-offset", PACKAGE_SYS, false, "stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return number(checkStream(arg).getOffset());
}
@@ -2912,7 +2898,7 @@
new Primitive("stream-charpos", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Stream stream = checkCharacterOutputStream(arg);
return Fixnum.getInstance(stream.getCharPos());
@@ -2925,7 +2911,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Stream stream = checkCharacterOutputStream(first);
stream.setCharPos(Fixnum.getValue(second));
Modified: trunk/abcl/src/org/armedbear/lisp/StreamError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StreamError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StreamError.java Fri Nov 6 15:07:54 2009
@@ -37,13 +37,13 @@
{
private final Throwable cause;
- protected StreamError(LispClass cls) throws ConditionThrowable
+ protected StreamError(LispClass cls)
{
super(cls);
cause = null;
}
- public StreamError(String message) throws ConditionThrowable
+ public StreamError(String message)
{
super(StandardClass.STREAM_ERROR);
setFormatControl(message);
@@ -52,14 +52,14 @@
cause = null;
}
- public StreamError(Stream stream) throws ConditionThrowable
+ public StreamError(Stream stream)
{
super(StandardClass.STREAM_ERROR);
setStream(stream != null ? stream : NIL);
cause = null;
}
- public StreamError(String message, Stream stream) throws ConditionThrowable
+ public StreamError(String message, Stream stream)
{
super(StandardClass.STREAM_ERROR);
setFormatControl(message);
@@ -68,7 +68,7 @@
cause = null;
}
- public StreamError(LispObject initArgs) throws ConditionThrowable
+ public StreamError(LispObject initArgs)
{
super(StandardClass.STREAM_ERROR);
initialize(initArgs);
@@ -76,7 +76,7 @@
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
while (initArgs != NIL) {
@@ -90,7 +90,7 @@
}
}
- public StreamError(Stream stream, String message) throws ConditionThrowable
+ public StreamError(Stream stream, String message)
{
super(StandardClass.STREAM_ERROR);
setFormatControl(message);
@@ -99,19 +99,19 @@
cause = null;
}
- public StreamError(Stream stream, Throwable cause) throws ConditionThrowable
+ public StreamError(Stream stream, Throwable cause)
{
super(StandardClass.STREAM_ERROR);
setStream(stream != null ? stream : NIL);
this.cause = cause;
}
- public final LispObject getStream() throws ConditionThrowable
+ public final LispObject getStream()
{
return getInstanceSlotValue(Symbol.STREAM);
}
- protected final void setStream(LispObject stream) throws ConditionThrowable
+ protected final void setStream(LispObject stream)
{
setInstanceSlotValue(Symbol.STREAM, stream);
}
@@ -129,7 +129,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STREAM_ERROR)
return T;
@@ -154,7 +154,7 @@
new Primitive("stream-error-stream", "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof StreamError)
return ((StreamError)arg).getStream();
Modified: trunk/abcl/src/org/armedbear/lisp/StringFunctions.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StringFunctions.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StringFunctions.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
char[] array1 = first.STRING().getStringChars();
char[] array2 = second.STRING().getStringChars();
@@ -85,7 +85,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
char[] array1 = first.STRING().getStringChars();
char[] array2 = second.STRING().getStringChars();
@@ -105,7 +105,7 @@
new Primitive("%string/=", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -145,7 +145,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
char[] array1 = first.STRING().getStringChars();
char[] array2 = second.STRING().getStringChars();
@@ -177,7 +177,7 @@
new Primitive("%string-not-equal", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -221,7 +221,7 @@
new Primitive("%string<", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -265,7 +265,7 @@
new Primitive("%string>", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -307,7 +307,7 @@
new Primitive("%string<=", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -349,7 +349,7 @@
new Primitive("%string>=", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -393,7 +393,7 @@
new Primitive("%string-lessp", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -437,7 +437,7 @@
new Primitive("%string-greaterp", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -479,7 +479,7 @@
new Primitive("%string-not-lessp", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -523,7 +523,7 @@
new Primitive("%string-not-greaterp", PACKAGE_SYS, true)
{
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 6)
return error(new WrongNumberOfArgumentsException(this));
@@ -566,7 +566,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
LispObject s = first.STRING();
final int length = s.length();
@@ -638,7 +638,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
LispObject s = first.STRING();
final int length = s.length();
@@ -686,7 +686,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final AbstractString string = checkString(first);
final int length = string.length();
@@ -715,7 +715,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
final AbstractString string = checkString(first);
final int length = string.length();
@@ -744,7 +744,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
AbstractString string = checkString(first);
final int length = string.length();
@@ -782,7 +782,7 @@
public static final Primitive STRINGP = new Primitive("stringp", "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.STRINGP();
}
@@ -793,7 +793,7 @@
new Primitive("simple-string-p", "object")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.SIMPLE_STRING_P();
}
@@ -808,7 +808,7 @@
@Override
public LispObject execute(LispObject size, LispObject initialElement,
LispObject elementType)
- throws ConditionThrowable
+
{
final int n = Fixnum.getValue(size);
if (n < 0 || n >= ARRAY_DIMENSION_MAX) {
@@ -841,7 +841,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.CHAR(Fixnum.getValue(second));
}
@@ -853,7 +853,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.SCHAR(Fixnum.getValue(second));
}
@@ -866,7 +866,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
checkString(first).setCharAt(Fixnum.getValue(second),
LispCharacter.getValue(third));
@@ -881,7 +881,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first instanceof SimpleString) {
((SimpleString)first).setCharAt(Fixnum.getValue(second),
@@ -899,7 +899,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
char c = LispCharacter.getValue(first);
AbstractString string = checkString(second);
@@ -918,7 +918,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof LispCharacter) {
final char c = ((LispCharacter)first).value;
@@ -940,7 +940,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
// FIXME Don't call getStringValue() here! (Just look at the chars.)
int index = second.getStringValue().indexOf(first.getStringValue());
@@ -954,7 +954,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if(first instanceof AbstractString) {
AbstractString s = (AbstractString) first;
Modified: trunk/abcl/src/org/armedbear/lisp/StringInputStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StringInputStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StringInputStream.java Fri Nov 6 15:07:54 2009
@@ -75,7 +75,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STRING_INPUT_STREAM)
return T;
@@ -105,14 +105,14 @@
new Primitive("make-string-input-stream", "string &optional start end")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new StringInputStream(arg.getStringValue());
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
String s = first.getStringValue();
int start = Fixnum.getValue(second);
@@ -122,7 +122,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
String s = first.getStringValue();
int start = Fixnum.getValue(second);
@@ -138,7 +138,7 @@
new Primitive("string-input-stream-current", PACKAGE_EXT, true, "stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof StringInputStream)
return Fixnum.getInstance(((StringInputStream)arg).getOffset());
Modified: trunk/abcl/src/org/armedbear/lisp/StringOutputStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StringOutputStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StringOutputStream.java Fri Nov 6 15:07:54 2009
@@ -64,7 +64,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STRING_OUTPUT_STREAM)
return T;
@@ -78,14 +78,14 @@
}
@Override
- protected long _getFilePosition() throws ConditionThrowable
+ protected long _getFilePosition()
{
if (elementType == NIL)
return 0;
return stringWriter.getBuffer().length();
}
- public LispObject getString() throws ConditionThrowable
+ public LispObject getString()
{
if (elementType == NIL)
return new NilVector(0);
@@ -108,7 +108,7 @@
"element-type")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new StringOutputStream(arg);
}
@@ -120,7 +120,7 @@
new Primitive("get-output-stream-string", "string-output-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof StringOutputStream)
return ((StringOutputStream)arg).getString();
Modified: trunk/abcl/src/org/armedbear/lisp/StructureClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StructureClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StructureClass.java Fri Nov 6 15:07:54 2009
@@ -58,7 +58,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STRUCTURE_CLASS)
return T;
@@ -68,13 +68,13 @@
}
@Override
- public LispObject getDescription() throws ConditionThrowable
+ public LispObject getDescription()
{
return new SimpleString(writeToString());
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
StringBuffer sb = new StringBuffer("#<STRUCTURE-CLASS ");
sb.append(symbol.writeToString());
@@ -89,7 +89,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
Symbol symbol = checkSymbol(first);
LispClass existingClass = LispClass.findClass(symbol);
Modified: trunk/abcl/src/org/armedbear/lisp/StructureObject.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StructureObject.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StructureObject.java Fri Nov 6 15:07:54 2009
@@ -39,14 +39,14 @@
private final LispObject[] slots;
public StructureObject(Symbol symbol, LispObject[] slots)
- throws ConditionThrowable
+
{
structureClass = (StructureClass) LispClass.findClass(symbol); // Might return null.
this.slots = slots;
}
public StructureObject(Symbol symbol, LispObject obj0)
- throws ConditionThrowable
+
{
structureClass = (StructureClass) LispClass.findClass(symbol); // Might return null.
LispObject[] slots = new LispObject[1];
@@ -55,7 +55,7 @@
}
public StructureObject(Symbol symbol, LispObject obj0, LispObject obj1)
- throws ConditionThrowable
+
{
structureClass = (StructureClass) LispClass.findClass(symbol); // Might return null.
LispObject[] slots = new LispObject[2];
@@ -66,7 +66,7 @@
public StructureObject(Symbol symbol, LispObject obj0, LispObject obj1,
LispObject obj2)
- throws ConditionThrowable
+
{
structureClass = (StructureClass) LispClass.findClass(symbol); // Might return null.
LispObject[] slots = new LispObject[3];
@@ -78,7 +78,7 @@
public StructureObject(Symbol symbol, LispObject obj0, LispObject obj1,
LispObject obj2, LispObject obj3)
- throws ConditionThrowable
+
{
structureClass = (StructureClass) LispClass.findClass(symbol); // Might return null.
LispObject[] slots = new LispObject[4];
@@ -91,7 +91,7 @@
public StructureObject(Symbol symbol, LispObject obj0, LispObject obj1,
LispObject obj2, LispObject obj3, LispObject obj4)
- throws ConditionThrowable
+
{
structureClass = (StructureClass) LispClass.findClass(symbol); // Might return null.
LispObject[] slots = new LispObject[5];
@@ -106,7 +106,7 @@
public StructureObject(Symbol symbol, LispObject obj0, LispObject obj1,
LispObject obj2, LispObject obj3, LispObject obj4,
LispObject obj5)
- throws ConditionThrowable
+
{
structureClass = (StructureClass) LispClass.findClass(symbol); // Might return null.
LispObject[] slots = new LispObject[6];
@@ -140,7 +140,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject result = NIL;
result = result.push(new Cons("class", structureClass));
@@ -157,7 +157,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type instanceof StructureClass)
return memq(type, structureClass.getCPL()) ? T : NIL;
@@ -177,7 +177,7 @@
}
@Override
- public boolean equalp(LispObject obj) throws ConditionThrowable
+ public boolean equalp(LispObject obj)
{
if (this == obj)
return true;
@@ -197,7 +197,7 @@
}
@Override
- public LispObject getSlotValue_0() throws ConditionThrowable
+ public LispObject getSlotValue_0()
{
try
{
@@ -210,7 +210,7 @@
}
@Override
- public LispObject getSlotValue_1() throws ConditionThrowable
+ public LispObject getSlotValue_1()
{
try
{
@@ -223,7 +223,7 @@
}
@Override
- public LispObject getSlotValue_2() throws ConditionThrowable
+ public LispObject getSlotValue_2()
{
try
{
@@ -236,7 +236,7 @@
}
@Override
- public LispObject getSlotValue_3() throws ConditionThrowable
+ public LispObject getSlotValue_3()
{
try
{
@@ -249,7 +249,7 @@
}
@Override
- public LispObject getSlotValue(int index) throws ConditionThrowable
+ public LispObject getSlotValue(int index)
{
try
{
@@ -262,7 +262,7 @@
}
@Override
- public int getFixnumSlotValue(int index) throws ConditionThrowable
+ public int getFixnumSlotValue(int index)
{
try
{
@@ -277,7 +277,7 @@
}
@Override
- public boolean getSlotValueAsBoolean(int index) throws ConditionThrowable
+ public boolean getSlotValueAsBoolean(int index)
{
try
{
@@ -293,7 +293,7 @@
@Override
public void setSlotValue_0(LispObject value)
- throws ConditionThrowable
+
{
try
{
@@ -307,7 +307,7 @@
@Override
public void setSlotValue_1(LispObject value)
- throws ConditionThrowable
+
{
try
{
@@ -321,7 +321,7 @@
@Override
public void setSlotValue_2(LispObject value)
- throws ConditionThrowable
+
{
try
{
@@ -335,7 +335,7 @@
@Override
public void setSlotValue_3(LispObject value)
- throws ConditionThrowable
+
{
try
{
@@ -349,7 +349,7 @@
@Override
public void setSlotValue(int index, LispObject value)
- throws ConditionThrowable
+
{
try
{
@@ -361,7 +361,7 @@
}
}
- private LispObject badIndex(int n) throws ConditionThrowable
+ private LispObject badIndex(int n)
{
FastStringBuffer sb = new FastStringBuffer("Invalid slot index ");
sb.append(Fixnum.getInstance(n).writeToString());
@@ -392,7 +392,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
try
{
@@ -481,7 +481,7 @@
new Primitive("structure-length", PACKAGE_SYS, true, "instance")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof StructureObject)
return Fixnum.getInstance(((StructureObject)arg).slots.length);
@@ -495,7 +495,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof StructureObject)
try
@@ -518,7 +518,7 @@
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
if (first instanceof StructureObject)
@@ -542,21 +542,21 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return new StructureObject(checkSymbol(first), second);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
return new StructureObject(checkSymbol(first), second, third);
}
@Override
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
return new StructureObject(checkSymbol(first), second, third, fourth);
}
@@ -564,7 +564,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
return new StructureObject(checkSymbol(first), second, third, fourth,
fifth);
@@ -573,7 +573,7 @@
public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
return new StructureObject(checkSymbol(first), second, third, fourth,
fifth, sixth);
@@ -583,7 +583,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
return new StructureObject(checkSymbol(first), second, third, fourth,
fifth, sixth, seventh);
@@ -596,7 +596,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return new StructureObject(checkSymbol(first), second.copyToArray());
}
@@ -607,7 +607,7 @@
new Primitive(Symbol.COPY_STRUCTURE, "structure")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof StructureObject)
return new StructureObject((StructureObject)arg);
Modified: trunk/abcl/src/org/armedbear/lisp/StyleWarning.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StyleWarning.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StyleWarning.java Fri Nov 6 15:07:54 2009
@@ -35,7 +35,7 @@
public final class StyleWarning extends Warning
{
- public StyleWarning(LispObject initArgs) throws ConditionThrowable
+ public StyleWarning(LispObject initArgs)
{
super(StandardClass.STYLE_WARNING);
initialize(initArgs);
@@ -54,7 +54,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.STYLE_WARNING)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/Symbol.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Symbol.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Symbol.java Fri Nov 6 15:07:54 2009
@@ -113,7 +113,7 @@
}
@Override
- public LispObject getDescription() throws ConditionThrowable
+ public LispObject getDescription()
{
final LispThread thread = LispThread.currentThread();
SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
@@ -142,7 +142,7 @@
}
@Override
- public LispObject getParts() throws ConditionThrowable
+ public LispObject getParts()
{
LispObject parts = NIL;
parts = parts.push(new Cons("name", name));
@@ -156,7 +156,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SYMBOL)
return T;
@@ -315,13 +315,12 @@
* A lisp error is thrown if the symbol is unbound.
*
* @return The associated value
- * @throws org.armedbear.lisp.ConditionThrowable
*
* @see LispThread#lookupSpecial
* @see Symbol#getSymbolValue()
*
*/
- public final LispObject symbolValue() throws ConditionThrowable
+ public final LispObject symbolValue()
{
return symbolValue(LispThread.currentThread());
}
@@ -332,13 +331,12 @@
* A lisp error is thrown if the symbol is unbound.
*
* @return The associated value
- * @throws org.armedbear.lisp.ConditionThrowable
*
* @see LispThread#lookupSpecial
* @see Symbol#getSymbolValue()
*
*/
- public final LispObject symbolValue(LispThread thread) throws ConditionThrowable
+ public final LispObject symbolValue(LispThread thread)
{
LispObject val = thread.lookupSpecial(this);
if (val != null)
@@ -393,7 +391,7 @@
}
@Override
- public final LispObject getSymbolFunctionOrDie() throws ConditionThrowable
+ public final LispObject getSymbolFunctionOrDie()
{
if (function == null)
return error(new UndefinedFunction(this));
@@ -406,7 +404,7 @@
}
public final LispObject getSymbolSetfFunctionOrDie()
- throws ConditionThrowable
+
{
LispObject obj = get(this, Symbol.SETF_FUNCTION, null);
if (obj == null)
@@ -423,7 +421,7 @@
/** See LispObject.getStringValue() */
@Override
- public String getStringValue() throws ConditionThrowable
+ public String getStringValue()
{
return name.getStringValue();
}
@@ -445,7 +443,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final String n = name.getStringValue();
final LispThread thread = LispThread.currentThread();
@@ -639,7 +637,7 @@
private static final boolean needsEscape(String s,
LispObject readtableCase,
LispThread thread)
- throws ConditionThrowable
+
{
boolean escape = false;
final int length = s.length();
@@ -771,7 +769,7 @@
}
@Override
- final public LispObject execute() throws ConditionThrowable
+ final public LispObject execute()
{
LispObject fun;
if ((fun = function) == null)
@@ -781,7 +779,7 @@
}
@Override
- final public LispObject execute(LispObject arg) throws ConditionThrowable
+ final public LispObject execute(LispObject arg)
{
LispObject fun;
if ((fun = function) == null)
@@ -792,7 +790,7 @@
@Override
final public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
LispObject fun;
if ((fun = function) == null)
@@ -804,7 +802,7 @@
@Override
final public LispObject execute(LispObject first, LispObject second,
LispObject third)
- throws ConditionThrowable
+
{
LispObject fun;
if ((fun = function) == null)
@@ -816,7 +814,7 @@
@Override
final public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth)
- throws ConditionThrowable
+
{
LispObject fun;
if ((fun = function) == null)
@@ -829,7 +827,7 @@
final public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth)
- throws ConditionThrowable
+
{
LispObject fun;
if ((fun = function) == null)
@@ -844,7 +842,7 @@
final public LispObject execute(LispObject first, LispObject second,
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth)
- throws ConditionThrowable
+
{
LispObject fun;
if ((fun = function) == null)
@@ -860,7 +858,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh)
- throws ConditionThrowable
+
{
LispObject fun;
if ((fun = function) == null)
@@ -876,7 +874,7 @@
LispObject third, LispObject fourth,
LispObject fifth, LispObject sixth,
LispObject seventh, LispObject eighth)
- throws ConditionThrowable
+
{
LispObject fun;
if ((fun = function) == null)
@@ -888,7 +886,7 @@
}
@Override
- final public LispObject execute(LispObject[] args) throws ConditionThrowable
+ final public LispObject execute(LispObject[] args)
{
LispObject fun;
if ((fun = function) == null) {
@@ -902,7 +900,7 @@
}
private final LispObject undefinedFunction(LispObject args)
- throws ConditionThrowable
+
{
return LispThread.currentThread().execute(Symbol.UNDEFINED_FUNCTION_CALLED,
this, args);
Modified: trunk/abcl/src/org/armedbear/lisp/SynonymStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SynonymStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SynonymStream.java Fri Nov 6 15:07:54 2009
@@ -43,37 +43,37 @@
}
@Override
- public boolean isInputStream() throws ConditionThrowable
+ public boolean isInputStream()
{
return checkStream(symbol.symbolValue()).isInputStream();
}
@Override
- public boolean isOutputStream() throws ConditionThrowable
+ public boolean isOutputStream()
{
return checkStream(symbol.symbolValue()).isOutputStream();
}
@Override
- public boolean isCharacterInputStream() throws ConditionThrowable
+ public boolean isCharacterInputStream()
{
return checkStream(symbol.symbolValue()).isCharacterInputStream();
}
@Override
- public boolean isBinaryInputStream() throws ConditionThrowable
+ public boolean isBinaryInputStream()
{
return checkStream(symbol.symbolValue()).isBinaryInputStream();
}
@Override
- public boolean isCharacterOutputStream() throws ConditionThrowable
+ public boolean isCharacterOutputStream()
{
return checkStream(symbol.symbolValue()).isCharacterOutputStream();
}
@Override
- public boolean isBinaryOutputStream() throws ConditionThrowable
+ public boolean isBinaryOutputStream()
{
return checkStream(symbol.symbolValue()).isBinaryOutputStream();
}
@@ -91,7 +91,7 @@
}
@Override
- public LispObject typep(LispObject typeSpecifier) throws ConditionThrowable
+ public LispObject typep(LispObject typeSpecifier)
{
if (typeSpecifier == Symbol.SYNONYM_STREAM)
return T;
@@ -101,118 +101,118 @@
}
@Override
- public LispObject getElementType() throws ConditionThrowable
+ public LispObject getElementType()
{
return checkStream(symbol.symbolValue()).getElementType();
}
@Override
- public LispObject listen() throws ConditionThrowable
+ public LispObject listen()
{
return checkStream(symbol.symbolValue()).listen();
}
@Override
- public LispObject fileLength() throws ConditionThrowable
+ public LispObject fileLength()
{
return checkStream(symbol.symbolValue()).fileLength();
}
@Override
- public LispObject fileStringLength(LispObject arg) throws ConditionThrowable
+ public LispObject fileStringLength(LispObject arg)
{
return checkStream(symbol.symbolValue()).fileStringLength(arg);
}
@Override
- protected int _readChar() throws ConditionThrowable, java.io.IOException
+ protected int _readChar() throws java.io.IOException
{
return checkStream(symbol.symbolValue())._readChar();
}
@Override
- protected void _unreadChar(int n) throws ConditionThrowable, java.io.IOException
+ protected void _unreadChar(int n) throws java.io.IOException
{
checkStream(symbol.symbolValue())._unreadChar(n);
}
@Override
- protected boolean _charReady() throws ConditionThrowable, java.io.IOException
+ protected boolean _charReady() throws java.io.IOException
{
return checkStream(symbol.symbolValue())._charReady();
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
checkStream(symbol.symbolValue())._writeChar(c);
}
@Override
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
checkStream(symbol.symbolValue())._writeChars(chars, start, end);
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
checkStream(symbol.symbolValue())._writeString(s);
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
checkStream(symbol.symbolValue())._writeLine(s);
}
// Reads an 8-bit byte.
@Override
- public int _readByte() throws ConditionThrowable
+ public int _readByte()
{
return checkStream(symbol.symbolValue())._readByte();
}
// Writes an 8-bit byte.
@Override
- public void _writeByte(int n) throws ConditionThrowable
+ public void _writeByte(int n)
{
checkStream(symbol.symbolValue())._writeByte(n);
}
@Override
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
checkStream(symbol.symbolValue())._finishOutput();
}
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
checkStream(symbol.symbolValue())._clearInput();
}
@Override
- protected long _getFilePosition() throws ConditionThrowable
+ protected long _getFilePosition()
{
return checkStream(symbol.symbolValue())._getFilePosition();
}
@Override
- protected boolean _setFilePosition(LispObject arg) throws ConditionThrowable
+ protected boolean _setFilePosition(LispObject arg)
{
return checkStream(symbol.symbolValue())._setFilePosition(arg);
}
@Override
- public void _close() throws ConditionThrowable
+ public void _close()
{
checkStream(symbol.symbolValue())._close();
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
StringBuffer sb = new StringBuffer("SYNONYM-STREAM ");
sb.append(symbol.writeToString());
@@ -224,7 +224,7 @@
new Primitive("make-synonym-stream", "symbol")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return new SynonymStream(checkSymbol(arg));
}
@@ -235,7 +235,7 @@
new Primitive("synonym-stream-symbol", "synonym-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SynonymStream)
return ((SynonymStream)arg).symbol;
Modified: trunk/abcl/src/org/armedbear/lisp/ThreadDestroyed.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ThreadDestroyed.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ThreadDestroyed.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
}
@Override
- public LispObject getCondition() throws ConditionThrowable
+ public LispObject getCondition()
{
return new ControlError("Thread destroyed.");
}
Modified: trunk/abcl/src/org/armedbear/lisp/Throw.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Throw.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Throw.java Fri Nov 6 15:07:54 2009
@@ -40,21 +40,21 @@
private final LispObject[] values;
public Throw(LispObject tag, LispObject result, LispThread thread)
- throws ConditionThrowable
+
{
this.tag = tag;
this.result = result;
values = thread._values;
}
- public LispObject getResult(LispThread thread) throws ConditionThrowable
+ public LispObject getResult(LispThread thread)
{
thread._values = values;
return result;
}
@Override
- public LispObject getCondition() throws ConditionThrowable
+ public LispObject getCondition()
{
try {
return new ControlError("Attempt to throw to the nonexistent tag " +
Modified: trunk/abcl/src/org/armedbear/lisp/Time.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Time.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Time.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
new Primitive("%time", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Cons.setCount(0);
long realStart = System.currentTimeMillis();
@@ -80,7 +80,7 @@
new Primitive("get-internal-real-time", "")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return number(System.currentTimeMillis());
}
@@ -91,7 +91,7 @@
new Primitive("get-internal-run-time", "")
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return number(System.currentTimeMillis());
}
@@ -113,7 +113,7 @@
new Primitive("default-time-zone", PACKAGE_SYS, false)
{
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
TimeZone tz = TimeZone.getDefault();
//int offset = tz.getOffset(System.currentTimeMillis());
Modified: trunk/abcl/src/org/armedbear/lisp/TwoWayStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/TwoWayStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/TwoWayStream.java Fri Nov 6 15:07:54 2009
@@ -53,7 +53,7 @@
}
@Override
- public LispObject getElementType() throws ConditionThrowable
+ public LispObject getElementType()
{
LispObject itype = in.getElementType();
LispObject otype = out.getElementType();
@@ -73,25 +73,25 @@
}
@Override
- public boolean isCharacterInputStream() throws ConditionThrowable
+ public boolean isCharacterInputStream()
{
return in.isCharacterInputStream();
}
@Override
- public boolean isBinaryInputStream() throws ConditionThrowable
+ public boolean isBinaryInputStream()
{
return in.isBinaryInputStream();
}
@Override
- public boolean isCharacterOutputStream() throws ConditionThrowable
+ public boolean isCharacterOutputStream()
{
return out.isCharacterOutputStream();
}
@Override
- public boolean isBinaryOutputStream() throws ConditionThrowable
+ public boolean isBinaryOutputStream()
{
return out.isBinaryOutputStream();
}
@@ -109,7 +109,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.TWO_WAY_STREAM)
return T;
@@ -120,88 +120,88 @@
// Returns -1 at end of file.
@Override
- protected int _readChar() throws ConditionThrowable, java.io.IOException
+ protected int _readChar() throws java.io.IOException
{
return in._readChar();
}
@Override
- protected void _unreadChar(int n) throws ConditionThrowable, java.io.IOException
+ protected void _unreadChar(int n) throws java.io.IOException
{
in._unreadChar(n);
}
@Override
- protected boolean _charReady() throws ConditionThrowable, java.io.IOException
+ protected boolean _charReady() throws java.io.IOException
{
return in._charReady();
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
out._writeChar(c);
}
@Override
public void _writeChars(char[] chars, int start, int end)
- throws ConditionThrowable
+
{
out._writeChars(chars, start, end);
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
out._writeString(s);
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
out._writeLine(s);
}
// Reads an 8-bit byte.
@Override
- public int _readByte() throws ConditionThrowable
+ public int _readByte()
{
return in._readByte();
}
// Writes an 8-bit byte.
@Override
- public void _writeByte(int n) throws ConditionThrowable
+ public void _writeByte(int n)
{
out._writeByte(n);
}
@Override
- public void _finishOutput() throws ConditionThrowable
+ public void _finishOutput()
{
out._finishOutput();
}
@Override
- public void _clearInput() throws ConditionThrowable
+ public void _clearInput()
{
in._clearInput();
}
@Override
- public LispObject listen() throws ConditionThrowable
+ public LispObject listen()
{
return in.listen();
}
@Override
- public LispObject freshLine() throws ConditionThrowable
+ public LispObject freshLine()
{
return out.freshLine();
}
@Override
- public LispObject close(LispObject abort) throws ConditionThrowable
+ public LispObject close(LispObject abort)
{
// "The effect of CLOSE on a constructed stream is to close the
// argument stream only. There is no effect on the constituents of
@@ -211,7 +211,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
return unreadableString(Symbol.TWO_WAY_STREAM);
}
@@ -222,7 +222,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final Stream in = checkStream(first);
final Stream out = checkStream(second);
@@ -241,7 +241,7 @@
new Primitive(Symbol.TWO_WAY_STREAM_INPUT_STREAM, "two-way-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof TwoWayStream)
return ((TwoWayStream)arg).in;
@@ -254,7 +254,7 @@
new Primitive(Symbol.TWO_WAY_STREAM_OUTPUT_STREAM, "two-way-stream")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof TwoWayStream)
return ((TwoWayStream)arg).out;
Modified: trunk/abcl/src/org/armedbear/lisp/TypeError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/TypeError.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/TypeError.java Fri Nov 6 15:07:54 2009
@@ -35,32 +35,32 @@
public class TypeError extends LispError
{
- public TypeError() throws ConditionThrowable
+ public TypeError()
{
super(StandardClass.TYPE_ERROR);
}
- protected TypeError(LispClass cls) throws ConditionThrowable
+ protected TypeError(LispClass cls)
{
super(cls);
}
public TypeError(LispObject datum, LispObject expectedType)
- throws ConditionThrowable
+
{
super(StandardClass.TYPE_ERROR);
setDatum(datum);
setExpectedType(expectedType);
}
- public TypeError(LispObject initArgs) throws ConditionThrowable
+ public TypeError(LispObject initArgs)
{
super(StandardClass.TYPE_ERROR);
initialize(initArgs);
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
LispObject datum = null;
@@ -85,7 +85,7 @@
setExpectedType(expectedType);
}
- public TypeError(String message) throws ConditionThrowable
+ public TypeError(String message)
{
super(StandardClass.TYPE_ERROR);
setFormatControl(message);
@@ -94,7 +94,7 @@
}
public TypeError(String message, LispObject datum, LispObject expectedType)
- throws ConditionThrowable
+
{
super(StandardClass.TYPE_ERROR);
setFormatControl(message);
@@ -115,7 +115,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.TYPE_ERROR)
return T;
@@ -172,23 +172,23 @@
}
}
- public final LispObject getDatum() throws ConditionThrowable
+ public final LispObject getDatum()
{
return getInstanceSlotValue(Symbol.DATUM);
}
- private final void setDatum(LispObject datum) throws ConditionThrowable
+ private final void setDatum(LispObject datum)
{
setInstanceSlotValue(Symbol.DATUM, datum);
}
- public final LispObject getExpectedType() throws ConditionThrowable
+ public final LispObject getExpectedType()
{
return getInstanceSlotValue(Symbol.EXPECTED_TYPE);
}
private final void setExpectedType(LispObject expectedType)
- throws ConditionThrowable
+
{
setInstanceSlotValue(Symbol.EXPECTED_TYPE, expectedType);
}
@@ -198,7 +198,7 @@
new Primitive(Symbol.TYPE_ERROR_DATUM, "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final StandardObject obj;
if (arg instanceof StandardObject) {
@@ -216,7 +216,7 @@
new Primitive(Symbol.TYPE_ERROR_EXPECTED_TYPE, "condition")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final StandardObject obj;
if (arg instanceof StandardObject) {
Modified: trunk/abcl/src/org/armedbear/lisp/UnboundSlot.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/UnboundSlot.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/UnboundSlot.java Fri Nov 6 15:07:54 2009
@@ -35,14 +35,14 @@
public final class UnboundSlot extends CellError
{
- public UnboundSlot(LispObject initArgs) throws ConditionThrowable
+ public UnboundSlot(LispObject initArgs)
{
super(StandardClass.UNBOUND_SLOT);
initialize(initArgs);
}
@Override
- protected void initialize(LispObject initArgs) throws ConditionThrowable
+ protected void initialize(LispObject initArgs)
{
super.initialize(initArgs);
while (initArgs != NIL) {
@@ -56,18 +56,18 @@
}
}
- public LispObject getInstance() throws ConditionThrowable
+ public LispObject getInstance()
{
return getInstanceSlotValue(Symbol.INSTANCE);
}
- private void setInstance(LispObject instance) throws ConditionThrowable
+ private void setInstance(LispObject instance)
{
setInstanceSlotValue(Symbol.INSTANCE, instance);
}
@Override
- public String getMessage() throws ConditionThrowable
+ public String getMessage()
{
final LispThread thread = LispThread.currentThread();
SpecialBinding lastSpecialBinding = thread.lastSpecialBinding;
@@ -98,7 +98,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.UNBOUND_SLOT)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/UnboundVariable.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/UnboundVariable.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/UnboundVariable.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class UnboundVariable extends CellError
{
// obj is either the unbound variable itself or an initArgs list.
- public UnboundVariable(LispObject obj) throws ConditionThrowable
+ public UnboundVariable(LispObject obj)
{
super(StandardClass.UNBOUND_VARIABLE);
if (obj instanceof Cons)
@@ -78,7 +78,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.UNBOUND_VARIABLE)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/UndefinedFunction.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/UndefinedFunction.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/UndefinedFunction.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class UndefinedFunction extends CellError
{
// obj is either the name of the undefined function or an initArgs list.
- public UndefinedFunction(LispObject obj) throws ConditionThrowable
+ public UndefinedFunction(LispObject obj)
{
super(StandardClass.UNDEFINED_FUNCTION);
if (obj instanceof Cons)
@@ -58,7 +58,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.UNDEFINED_FUNCTION)
return T;
@@ -68,7 +68,7 @@
}
@Override
- public String getMessage() throws ConditionThrowable
+ public String getMessage()
{
FastStringBuffer sb = new FastStringBuffer("The function ");
sb.append(getCellName().writeToString());
Modified: trunk/abcl/src/org/armedbear/lisp/UpcaseStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/UpcaseStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/UpcaseStream.java Fri Nov 6 15:07:54 2009
@@ -35,25 +35,25 @@
public final class UpcaseStream extends CaseFrobStream
{
- public UpcaseStream(Stream target) throws ConditionThrowable
+ public UpcaseStream(Stream target)
{
super(target);
}
@Override
- public void _writeChar(char c) throws ConditionThrowable
+ public void _writeChar(char c)
{
target._writeChar(LispCharacter.toUpperCase(c));
}
@Override
- public void _writeString(String s) throws ConditionThrowable
+ public void _writeString(String s)
{
target._writeString(s.toUpperCase());
}
@Override
- public void _writeLine(String s) throws ConditionThrowable
+ public void _writeLine(String s)
{
target._writeLine(s.toUpperCase());
}
Modified: trunk/abcl/src/org/armedbear/lisp/Utilities.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Utilities.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Utilities.java Fri Nov 6 15:07:54 2009
@@ -85,14 +85,14 @@
return false;
}
- public static File getFile(Pathname pathname) throws ConditionThrowable
+ public static File getFile(Pathname pathname)
{
return getFile(pathname,
coerceToPathname(Symbol.DEFAULT_PATHNAME_DEFAULTS.symbolValue()));
}
public static File getFile(Pathname pathname, Pathname defaultPathname)
- throws ConditionThrowable
+
{
Pathname merged =
Pathname.mergePathnames(pathname, defaultPathname, NIL);
@@ -106,7 +106,7 @@
}
public static Pathname getDirectoryPathname(File file)
- throws ConditionThrowable
+
{
try {
String namestring = file.getCanonicalPath();
@@ -126,7 +126,7 @@
public static byte[] getZippedZipEntryAsByteArray(ZipFile zipfile,
String entryName,
String subEntryName)
- throws ConditionThrowable
+
{
ZipEntry entry = zipfile.getEntry(entryName);
@@ -170,7 +170,7 @@
public static InputStream getZippedZipEntryAsInputStream(ZipFile zipfile,
String entryName,
String subEntryName)
- throws ConditionThrowable
+
{
return
new ByteArrayInputStream(Utilities
Modified: trunk/abcl/src/org/armedbear/lisp/Warning.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Warning.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Warning.java Fri Nov 6 15:07:54 2009
@@ -35,11 +35,11 @@
public class Warning extends Condition
{
- protected Warning() throws ConditionThrowable
+ protected Warning()
{
}
- public Warning(LispObject initArgs) throws ConditionThrowable
+ public Warning(LispObject initArgs)
{
super(initArgs);
}
@@ -57,7 +57,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.WARNING)
return T;
Modified: trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java Fri Nov 6 15:07:54 2009
@@ -38,7 +38,7 @@
private final Operator operator;
public WrongNumberOfArgumentsException(Operator operator)
- throws ConditionThrowable
+
{
// This is really just an ordinary PROGRAM-ERROR, broken out into its
// own Java class as a convenience for the implementation.
Modified: trunk/abcl/src/org/armedbear/lisp/ZeroRankArray.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ZeroRankArray.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ZeroRankArray.java Fri Nov 6 15:07:54 2009
@@ -64,7 +64,7 @@
}
@Override
- public LispObject typep(LispObject type) throws ConditionThrowable
+ public LispObject typep(LispObject type)
{
if (type == Symbol.SIMPLE_ARRAY)
return adjustable ? NIL : T;
@@ -84,7 +84,7 @@
}
@Override
- public int getDimension(int n) throws ConditionThrowable
+ public int getDimension(int n)
{
error(new TypeError("Bad array dimension (" + n + ") for array of rank 0."));
// Not reached.
@@ -104,7 +104,7 @@
}
@Override
- public LispObject AREF(int index) throws ConditionThrowable
+ public LispObject AREF(int index)
{
if (index == 0)
return data;
@@ -113,7 +113,7 @@
}
@Override
- public void aset(int index, LispObject obj) throws ConditionThrowable
+ public void aset(int index, LispObject obj)
{
if (obj.typep(elementType) == NIL)
error(new TypeError(obj, elementType));
@@ -124,7 +124,7 @@
}
@Override
- public void fill(LispObject obj) throws ConditionThrowable
+ public void fill(LispObject obj)
{
if (obj.typep(elementType) == NIL)
error(new TypeError(obj, elementType));
@@ -132,7 +132,7 @@
}
@Override
- public String writeToString() throws ConditionThrowable
+ public String writeToString()
{
final LispThread thread = LispThread.currentThread();
boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL);
@@ -167,7 +167,7 @@
public AbstractArray adjustArray(int[] dims,
LispObject initialElement,
LispObject initialContents)
- throws ConditionThrowable {
+ {
if (isAdjustable()) {
// initial element doesn't matter:
// we're not creating new elements
@@ -185,7 +185,7 @@
public AbstractArray adjustArray(int[] dims,
AbstractArray displacedTo,
int displacement)
- throws ConditionThrowable {
+ {
error(new TypeError("Displacement not supported for array of rank 0."));
return null;
}
Modified: trunk/abcl/src/org/armedbear/lisp/adjust_array.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/adjust_array.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/adjust_array.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 10)
return error(new WrongNumberOfArgumentsException(this));
Modified: trunk/abcl/src/org/armedbear/lisp/arglist.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/arglist.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/arglist.java Fri Nov 6 15:07:54 2009
@@ -36,7 +36,7 @@
public final class arglist extends Lisp
{
private static final Operator getOperator(LispObject obj)
- throws ConditionThrowable
+
{
if (obj instanceof Operator)
return (Operator) obj;
@@ -67,7 +67,7 @@
new Primitive("arglist", PACKAGE_EXT, true, "extended-function-designator")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
LispThread thread = LispThread.currentThread();
Operator operator = getOperator(arg);
@@ -108,7 +108,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Operator operator = null;
if (first instanceof Operator) {
Modified: trunk/abcl/src/org/armedbear/lisp/ash.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ash.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ash.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.ash(second);
}
Modified: trunk/abcl/src/org/armedbear/lisp/assq.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/assq.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/assq.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject item, LispObject alist)
- throws ConditionThrowable
+
{
return assq(item, alist);
}
Modified: trunk/abcl/src/org/armedbear/lisp/assql.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/assql.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/assql.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject item, LispObject alist)
- throws ConditionThrowable
+
{
while (alist != NIL) {
LispObject cons = alist.car();
Modified: trunk/abcl/src/org/armedbear/lisp/ceiling.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ceiling.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ceiling.java Fri Nov 6 15:07:54 2009
@@ -42,14 +42,14 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return execute(arg, Fixnum.ONE);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
LispObject quotient = first.truncate(second);
final LispThread thread = LispThread.currentThread();
Modified: trunk/abcl/src/org/armedbear/lisp/cell_error_name.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/cell_error_name.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/cell_error_name.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final StandardObject obj;
if (arg instanceof StandardObject) {
Modified: trunk/abcl/src/org/armedbear/lisp/copy_list.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/copy_list.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/copy_list.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == NIL)
return NIL;
Modified: trunk/abcl/src/org/armedbear/lisp/create_new_file.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/create_new_file.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/create_new_file.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final String namestring = arg.getStringValue();
try {
Modified: trunk/abcl/src/org/armedbear/lisp/cxr.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/cxr.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/cxr.java Fri Nov 6 15:07:54 2009
@@ -41,7 +41,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
first.setCar(second);
return second;
@@ -54,7 +54,7 @@
{
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
first.setCdr(second);
return second;
@@ -65,7 +65,7 @@
private static final Primitive CAR = new Primitive(Symbol.CAR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car();
}
@@ -75,7 +75,7 @@
private static final Primitive CDR = new Primitive(Symbol.CDR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cdr();
}
@@ -85,7 +85,7 @@
private static final Primitive CAAR = new Primitive(Symbol.CAAR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car().car();
}
@@ -95,7 +95,7 @@
private static final Primitive CADR = new Primitive(Symbol.CADR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cadr();
}
@@ -105,7 +105,7 @@
private static final Primitive CDAR = new Primitive(Symbol.CDAR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car().cdr();
}
@@ -115,7 +115,7 @@
private static final Primitive CDDR = new Primitive(Symbol.CDDR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cdr().cdr();
}
@@ -125,7 +125,7 @@
private static final Primitive CADDR = new Primitive(Symbol.CADDR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.caddr();
}
@@ -135,7 +135,7 @@
private static final Primitive CAADR = new Primitive(Symbol.CAADR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cdr().car().car();
}
@@ -145,7 +145,7 @@
private static final Primitive CAAAR = new Primitive(Symbol.CAAAR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car().car().car();
}
@@ -155,7 +155,7 @@
private static final Primitive CDAAR = new Primitive(Symbol.CDAAR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car().car().cdr();
}
@@ -165,7 +165,7 @@
private static final Primitive CDDAR = new Primitive(Symbol.CDDAR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car().cdr().cdr();
}
@@ -175,7 +175,7 @@
private static final Primitive CDDDR = new Primitive(Symbol.CDDDR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cdr().cdr().cdr();
}
@@ -185,7 +185,7 @@
private static final Primitive CADAR = new Primitive(Symbol.CADAR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car().cdr().car();
}
@@ -195,7 +195,7 @@
private static final Primitive CDADR = new Primitive(Symbol.CDADR, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cdr().car().cdr();
}
@@ -205,7 +205,7 @@
private static final Primitive FIRST = new Primitive(Symbol.FIRST, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.car();
}
@@ -215,7 +215,7 @@
private static final Primitive SECOND = new Primitive(Symbol.SECOND, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cadr();
}
@@ -225,7 +225,7 @@
private static final Primitive THIRD = new Primitive(Symbol.THIRD, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.caddr();
}
@@ -235,7 +235,7 @@
private static final Primitive FOURTH = new Primitive(Symbol.FOURTH, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cdr().cdr().cadr();
}
@@ -245,7 +245,7 @@
private static final Primitive REST = new Primitive(Symbol.REST, "list")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.cdr();
}
Modified: trunk/abcl/src/org/armedbear/lisp/delete_file.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/delete_file.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/delete_file.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
// ### delete-file filespec => t
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
// Don't follow symlinks! We want to delete the symlink itself, not
// the linked-to file.
Modified: trunk/abcl/src/org/armedbear/lisp/disassemble_class_bytes.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/disassemble_class_bytes.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/disassemble_class_bytes.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof JavaObject) {
byte[] bytes = (byte[]) ((JavaObject)arg).getObject();
Modified: trunk/abcl/src/org/armedbear/lisp/dolist.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/dolist.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/dolist.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispObject bodyForm = args.cdr();
args = args.car();
Modified: trunk/abcl/src/org/armedbear/lisp/dotimes.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/dotimes.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/dotimes.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
@Override
public LispObject execute(LispObject args, Environment env)
- throws ConditionThrowable
+
{
LispObject bodyForm = args.cdr();
args = args.car();
Modified: trunk/abcl/src/org/armedbear/lisp/file_author.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/file_author.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/file_author.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname pathname = coerceToPathname(arg);
if (pathname.isWild())
Modified: trunk/abcl/src/org/armedbear/lisp/file_error_pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/file_error_pathname.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/file_error_pathname.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg instanceof FileError ? ((FileError)arg).getPathname() : NIL;
}
Modified: trunk/abcl/src/org/armedbear/lisp/file_length.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/file_length.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/file_length.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
// ### file-length
// file-length stream => length
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStream(arg).fileLength();
}
Modified: trunk/abcl/src/org/armedbear/lisp/file_string_length.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/file_string_length.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/file_string_length.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return checkStream(first).fileStringLength(second);
}
Modified: trunk/abcl/src/org/armedbear/lisp/file_write_date.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/file_write_date.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/file_write_date.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname pathname = coerceToPathname(arg);
if (pathname.isWild())
Modified: trunk/abcl/src/org/armedbear/lisp/float_sign.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/float_sign.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/float_sign.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof SingleFloat) {
float f = ((SingleFloat)arg).value;
@@ -59,7 +59,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (!first.floatp())
return type_error(first, Symbol.FLOAT);
Modified: trunk/abcl/src/org/armedbear/lisp/floor.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/floor.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/floor.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject number)
- throws ConditionThrowable
+
{
LispObject quotient = number.truncate(Fixnum.ONE);
final LispThread thread = LispThread.currentThread();
@@ -61,7 +61,7 @@
@Override
public LispObject execute(LispObject number, LispObject divisor)
- throws ConditionThrowable
+
{
LispObject quotient = number.truncate(divisor);
final LispThread thread = LispThread.currentThread();
Modified: trunk/abcl/src/org/armedbear/lisp/ftruncate.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/ftruncate.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/ftruncate.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
final LispThread thread = LispThread.currentThread();
if (arg.zerop()) {
@@ -99,7 +99,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
if (first.zerop()) {
Modified: trunk/abcl/src/org/armedbear/lisp/function_info.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/function_info.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/function_info.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
new Primitive("function-info", PACKAGE_SYS, false)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
LispObject info = FUNCTION_TABLE.get(arg);
return info != null ? info : NIL;
@@ -56,7 +56,7 @@
{
@Override
public LispObject execute(LispObject name, LispObject info)
- throws ConditionThrowable
+
{
if (info == NIL)
FUNCTION_TABLE.remhash(name);
@@ -73,7 +73,7 @@
{
@Override
public LispObject execute(LispObject name, LispObject indicator)
- throws ConditionThrowable
+
{
// info is an alist
LispObject info = FUNCTION_TABLE.get(name);
@@ -102,7 +102,7 @@
@Override
public LispObject execute(LispObject name, LispObject indicator,
LispObject value)
- throws ConditionThrowable
+
{
// info is an alist
LispObject info = FUNCTION_TABLE.get(name);
Modified: trunk/abcl/src/org/armedbear/lisp/get_properties.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/get_properties.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/get_properties.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final LispThread thread = LispThread.currentThread();
LispObject plist = first;
Modified: trunk/abcl/src/org/armedbear/lisp/input_stream_p.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/input_stream_p.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/input_stream_p.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStream(arg).isInputStream() ? T : NIL;
}
Modified: trunk/abcl/src/org/armedbear/lisp/interactive_stream_p.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/interactive_stream_p.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/interactive_stream_p.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Stream)
return ((Stream)arg).isInteractive() ? T : NIL;
Modified: trunk/abcl/src/org/armedbear/lisp/jclass_name.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/jclass_name.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/jclass_name.java Fri Nov 6 15:07:54 2009
@@ -48,7 +48,7 @@
// referenced by CLASS-REF.
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof AbstractString) {
String s = arg.getStringValue();
@@ -71,7 +71,7 @@
// matches NAME.
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
String className = null;
if (first instanceof AbstractString) {
Modified: trunk/abcl/src/org/armedbear/lisp/jclass_of.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/jclass_of.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/jclass_of.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
final String className;
if (arg instanceof AbstractString)
@@ -62,7 +62,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
final String className;
if (first instanceof AbstractString)
Modified: trunk/abcl/src/org/armedbear/lisp/jmethod_return_type.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/jmethod_return_type.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/jmethod_return_type.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
@Override
public LispObject execute(LispObject arg)
- throws ConditionThrowable
+
{
if (arg instanceof JavaObject) {
Object method = ((JavaObject)arg).getObject();
Modified: trunk/abcl/src/org/armedbear/lisp/last.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/last.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/last.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg == NIL)
return NIL;
@@ -62,7 +62,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
LispObject list = checkList(first);
if (second instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/listen.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/listen.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/listen.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
Stream stream =
checkCharacterInputStream(Symbol.STANDARD_INPUT.symbolValue());
@@ -50,7 +50,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return inSynonymOf(arg).listen();
}
Modified: trunk/abcl/src/org/armedbear/lisp/logand.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logand.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logand.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Fixnum || arg instanceof Bignum)
return arg;
@@ -59,13 +59,13 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.LOGAND(second);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = Fixnum.MINUS_ONE;
for (int i = 0; i < args.length; i++)
Modified: trunk/abcl/src/org/armedbear/lisp/logandc1.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logandc1.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logandc1.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Fixnum) {
if (second instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/logandc2.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logandc2.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logandc2.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Fixnum) {
if (second instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/logbitp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logbitp.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logbitp.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
int index = -1;
if (first instanceof Fixnum) {
Modified: trunk/abcl/src/org/armedbear/lisp/logcount.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logcount.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logcount.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
// FIXME Optimize fixnum case!
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
BigInteger n;
if (arg instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/logeqv.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logeqv.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logeqv.java Fri Nov 6 15:07:54 2009
@@ -52,7 +52,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Fixnum)
return arg;
@@ -62,7 +62,7 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
BigInteger result = null;
for (int i = 0; i < args.length; i++) {
Modified: trunk/abcl/src/org/armedbear/lisp/logior.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logior.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logior.java Fri Nov 6 15:07:54 2009
@@ -48,7 +48,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Fixnum || arg instanceof Bignum)
return arg;
@@ -57,13 +57,13 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.LOGIOR(second);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = Fixnum.ZERO;
for (int i = 0; i < args.length; i++)
Modified: trunk/abcl/src/org/armedbear/lisp/lognand.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/lognand.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/lognand.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Fixnum) {
if (second instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/lognor.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/lognor.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/lognor.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Fixnum) {
if (second instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/lognot.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/lognot.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/lognot.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.LOGNOT();
}
Modified: trunk/abcl/src/org/armedbear/lisp/logorc1.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logorc1.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logorc1.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Fixnum) {
if (second instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/logorc2.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logorc2.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logorc2.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Fixnum) {
if (second instanceof Fixnum)
Modified: trunk/abcl/src/org/armedbear/lisp/logtest.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logtest.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logtest.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
if (first instanceof Fixnum && second instanceof Fixnum) {
return (((Fixnum)first).value & ((Fixnum)second).value) == 0 ? NIL : T;
Modified: trunk/abcl/src/org/armedbear/lisp/logxor.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/logxor.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/logxor.java Fri Nov 6 15:07:54 2009
@@ -48,7 +48,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Fixnum || arg instanceof Bignum)
return arg;
@@ -57,13 +57,13 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.LOGXOR(second);
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
LispObject result = Fixnum.ZERO;
for (int i = 0; i < args.length; i++)
Modified: trunk/abcl/src/org/armedbear/lisp/machine_type.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/machine_type.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/machine_type.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
String s = System.getProperty("os.arch");
if (s == null)
Modified: trunk/abcl/src/org/armedbear/lisp/machine_version.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/machine_version.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/machine_version.java Fri Nov 6 15:07:54 2009
@@ -47,7 +47,7 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
String osName = System.getProperty("os.name");
if (osName != null && osName.toLowerCase().startsWith("linux")) {
Modified: trunk/abcl/src/org/armedbear/lisp/make_array.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/make_array.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/make_array.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length != 9)
return error(new WrongNumberOfArgumentsException(this));
Modified: trunk/abcl/src/org/armedbear/lisp/make_condition.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/make_condition.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/make_condition.java Fri Nov 6 15:07:54 2009
@@ -44,7 +44,7 @@
// %make-condition type slot-initializations => condition
@Override
public LispObject execute(LispObject type, LispObject initArgs)
- throws ConditionThrowable
+
{
final Symbol symbol;
if (type instanceof Symbol)
Modified: trunk/abcl/src/org/armedbear/lisp/make_server_socket.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/make_server_socket.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/make_server_socket.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
@Override
public LispObject execute(LispObject first)
- throws ConditionThrowable
+
{
int port = Fixnum.getValue(first);
try {
Modified: trunk/abcl/src/org/armedbear/lisp/make_socket.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/make_socket.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/make_socket.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
String host = first.getStringValue();
int port = Fixnum.getValue(second);
Modified: trunk/abcl/src/org/armedbear/lisp/mod.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/mod.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/mod.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject number, LispObject divisor)
- throws ConditionThrowable
+
{
return number.MOD(divisor);
}
Modified: trunk/abcl/src/org/armedbear/lisp/open_stream_p.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/open_stream_p.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/open_stream_p.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStream(arg).isOpen() ? T : NIL;
}
Modified: trunk/abcl/src/org/armedbear/lisp/output_stream_p.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/output_stream_p.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/output_stream_p.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStream(arg).isOutputStream() ? T : NIL;
}
Modified: trunk/abcl/src/org/armedbear/lisp/package_error_package.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/package_error_package.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/package_error_package.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof PackageError)
return ((PackageError)arg).getPackage();
Modified: trunk/abcl/src/org/armedbear/lisp/peek_char.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/peek_char.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/peek_char.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
int length = args.length;
if (length > 5)
Modified: trunk/abcl/src/org/armedbear/lisp/probe_file.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/probe_file.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/probe_file.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
new Primitive("probe-file", "pathspec")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Pathname.truename(arg, false);
}
@@ -55,7 +55,7 @@
new Primitive("truename", "filespec")
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return Pathname.truename(arg, true);
}
@@ -67,7 +67,7 @@
new Primitive("probe-directory", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname pathname = coerceToPathname(arg);
if (pathname.isWild())
@@ -83,7 +83,7 @@
new Primitive("file-directory-p", PACKAGE_EXT, true)
{
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
Pathname pathname = coerceToPathname(arg);
if (pathname.isWild())
Modified: trunk/abcl/src/org/armedbear/lisp/rem.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/rem.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/rem.java Fri Nov 6 15:07:54 2009
@@ -43,7 +43,7 @@
@Override
public LispObject execute(LispObject number, LispObject divisor)
- throws ConditionThrowable
+
{
number.truncate(divisor);
final LispThread thread = LispThread.currentThread();
Modified: trunk/abcl/src/org/armedbear/lisp/room.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/room.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/room.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject[] args) throws ConditionThrowable
+ public LispObject execute(LispObject[] args)
{
if (args.length > 1)
return error(new WrongNumberOfArgumentsException(this));
Modified: trunk/abcl/src/org/armedbear/lisp/server_socket_close.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/server_socket_close.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/server_socket_close.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
@Override
public LispObject execute(LispObject first)
- throws ConditionThrowable
+
{
try {
ServerSocket serverSocket = (ServerSocket) JavaObject.getObject(first);
Modified: trunk/abcl/src/org/armedbear/lisp/simple_list_remove_duplicates.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/simple_list_remove_duplicates.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/simple_list_remove_duplicates.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject list) throws ConditionThrowable
+ public LispObject execute(LispObject list)
{
LispObject result = NIL;
while (list != NIL) {
Modified: trunk/abcl/src/org/armedbear/lisp/socket_accept.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/socket_accept.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/socket_accept.java Fri Nov 6 15:07:54 2009
@@ -46,7 +46,7 @@
@Override
public LispObject execute(LispObject first)
- throws ConditionThrowable
+
{
ServerSocket serverSocket =
(ServerSocket) ((JavaObject)first).getObject();
Modified: trunk/abcl/src/org/armedbear/lisp/socket_close.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/socket_close.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/socket_close.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
@Override
public LispObject execute(LispObject first)
- throws ConditionThrowable
+
{
Socket socket = (Socket) JavaObject.getObject(first);
try {
Modified: trunk/abcl/src/org/armedbear/lisp/socket_stream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/socket_stream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/socket_stream.java Fri Nov 6 15:07:54 2009
@@ -45,7 +45,7 @@
@Override
public LispObject execute(LispObject first, LispObject second, LispObject third)
- throws ConditionThrowable
+
{
Socket socket = (Socket) ((JavaObject)first).getObject();
LispObject elementType = second; // Checked by caller.
Modified: trunk/abcl/src/org/armedbear/lisp/software_type.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/software_type.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/software_type.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return new SimpleString(System.getProperty("os.name"));
}
Modified: trunk/abcl/src/org/armedbear/lisp/software_version.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/software_version.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/software_version.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute() throws ConditionThrowable
+ public LispObject execute()
{
return new SimpleString(System.getProperty("os.version"));
}
Modified: trunk/abcl/src/org/armedbear/lisp/stream_element_type.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/stream_element_type.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/stream_element_type.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return checkStream(arg).getElementType();
}
Modified: trunk/abcl/src/org/armedbear/lisp/stream_external_format.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/stream_external_format.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/stream_external_format.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof Stream)
return Keyword.DEFAULT;
Modified: trunk/abcl/src/org/armedbear/lisp/truncate.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/truncate.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/truncate.java Fri Nov 6 15:07:54 2009
@@ -42,14 +42,14 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
return arg.truncate(Fixnum.ONE);
}
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
return first.truncate(second);
}
Modified: trunk/abcl/src/org/armedbear/lisp/unbound_slot_instance.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/unbound_slot_instance.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/unbound_slot_instance.java Fri Nov 6 15:07:54 2009
@@ -42,7 +42,7 @@
}
@Override
- public LispObject execute(LispObject arg) throws ConditionThrowable
+ public LispObject execute(LispObject arg)
{
if (arg instanceof UnboundSlot)
return ((UnboundSlot)arg).getInstance();
Modified: trunk/abcl/src/org/armedbear/lisp/zip.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/zip.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/zip.java Fri Nov 6 15:07:54 2009
@@ -50,7 +50,7 @@
@Override
public LispObject execute(LispObject first, LispObject second)
- throws ConditionThrowable
+
{
Pathname zipfilePathname = coerceToPathname(first);
byte[] buffer = new byte[4096];
More information about the armedbear-cvs
mailing list