[armedbear-cvs] r12252 - trunk/abcl/src/org/armedbear/lisp
Erik Huelsmann
ehuelsmann at common-lisp.net
Thu Nov 5 21:52:12 UTC 2009
Author: ehuelsmann
Date: Thu Nov 5 16:52:10 2009
New Revision: 12252
Log:
Annotate dubious uses of ConditionThrowable with FIXME's.
Modified:
trunk/abcl/src/org/armedbear/lisp/AbstractBitVector.java
trunk/abcl/src/org/armedbear/lisp/AbstractString.java
trunk/abcl/src/org/armedbear/lisp/Autoload.java
trunk/abcl/src/org/armedbear/lisp/ComplexString.java
trunk/abcl/src/org/armedbear/lisp/EqualHashTable.java
trunk/abcl/src/org/armedbear/lisp/EqualpHashTable.java
trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.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/JavaStackFrame.java
trunk/abcl/src/org/armedbear/lisp/LispThread.java
trunk/abcl/src/org/armedbear/lisp/Pathname.java
trunk/abcl/src/org/armedbear/lisp/Profiler.java
trunk/abcl/src/org/armedbear/lisp/SpecialOperator.java
trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java
trunk/abcl/src/org/armedbear/lisp/Stream.java
trunk/abcl/src/org/armedbear/lisp/Symbol.java
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 Thu Nov 5 16:52:10 2009
@@ -168,6 +168,7 @@
for (int i = 0; i < limit; i++)
hashCode = hashCode * 31 + getBit(i);
}
+ // ### fixme exception
catch (ConditionThrowable t) {
// Shouldn't happen.
Debug.trace(t);
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 Thu Nov 5 16:52:10 2009
@@ -128,6 +128,7 @@
}
return sb.toString();
} catch(ConditionThrowable t) {
+ // ### FIXME exception
throw new Error(t); //Should never happen
}
}
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 Thu Nov 5 16:52:10 2009
@@ -83,6 +83,7 @@
pkg.export(symbol);
}
catch (ConditionThrowable t) {
+ // ### FIXME exception
Debug.assertTrue(false);
}
}
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 Thu Nov 5 16:52:10 2009
@@ -532,6 +532,7 @@
}
catch (ConditionThrowable t)
{
+ // ### FIXME exception
Debug.trace(t);
}
hashCode += (hashCode << 10);
@@ -557,6 +558,7 @@
}
catch (ConditionThrowable t)
{
+ // ### FIXME exception
Debug.trace(t);
}
hashCode += (hashCode << 10);
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 Thu Nov 5 16:52:10 2009
@@ -61,6 +61,7 @@
if (key == e.key || key.equal(e.key))
return e.value;
}
+ // ### FIXME exception
catch (ConditionThrowable t)
{
Debug.trace(t);
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 Thu Nov 5 16:52:10 2009
@@ -59,6 +59,7 @@
if (key.equalp(e.key))
return e.value;
}
+ // ### FIXME exception
catch (ConditionThrowable t)
{
Debug.trace(t);
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 Thu Nov 5 16:52:10 2009
@@ -78,6 +78,7 @@
string.ensureCapacity(fp + limit);
}
catch (ConditionThrowable t) {
+ // ### FIXME exception
// Shouldn't happen.
Debug.trace(t);
}
@@ -86,6 +87,7 @@
string.setCharAt(fp, cbuf[i]);
}
catch (ConditionThrowable t) {
+ // ### FIXME exception
// Shouldn't happen.
Debug.trace(t);
}
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 Thu Nov 5 16:52:10 2009
@@ -164,6 +164,7 @@
Load.loadSystemFile("boot.lisp", false, false, false);
}
catch (ConditionThrowable c) {
+ // ### FIXME exception
reportError(c, LispThread.currentThread());
}
catch (Throwable t) {
@@ -184,6 +185,7 @@
Load.loadSystemFile("j.lisp");
}
catch (ConditionThrowable c) {
+ // ### FIXME exception
reportError(c, LispThread.currentThread());
}
catch (Throwable t) {
@@ -276,6 +278,7 @@
evaluate(args[i + 1]);
}
catch (ConditionThrowable c) {
+ // ### FIXME exception
final String separator =
System.getProperty("line.separator");
FastStringBuffer sb = new FastStringBuffer();
@@ -311,6 +314,7 @@
Load.loadSystemFile(args[i + 1]);
}
catch (ConditionThrowable c) {
+ // ### FIXME exception
System.err.println("Caught condition: " +
c.getCondition().writeToString() +
" while loading: " +
@@ -384,6 +388,7 @@
out._writeLine("Stack overflow");
}
catch (ConditionThrowable c) {
+ // ### FIXME exception
reportError(c, thread);
}
catch (Throwable t) {
@@ -490,6 +495,7 @@
thread.lastSpecialBinding = lastSpecialBinding;
}
}
+ // ### FIXME conditionthrowable
throw new ConditionThrowable(condition);
}
};
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 Thu Nov 5 16:52:10 2009
@@ -85,6 +85,7 @@
f.execute(args);
}
catch (ConditionThrowable t) {
+ // ### FIXME exception
t.printStackTrace();
}
}
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 Thu Nov 5 16:52:10 2009
@@ -106,6 +106,7 @@
LispThread.currentThread());
return (method.getReturnType() == void.class ? null : result.javaInstance());
}
+ // ### FIXME exception
catch (ConditionThrowable t)
{
t.printStackTrace();
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 Thu Nov 5 16:52:10 2009
@@ -763,6 +763,7 @@
} catch (Exception e) {
ConditionThrowable t = new ConditionThrowable("Exception reading property");
t.initCause(e);
+ // ### FIXME conditionthrowable -> error()
throw t;
}
}
@@ -793,6 +794,7 @@
pd.getWriteMethod().invoke(obj, jValue);
return value;
} catch (Exception e) {
+ // ### FIXME conditionthrowable -> error()
ConditionThrowable t = new ConditionThrowable("Exception writing property " + propertyName.writeToString() + " in object " + obj + " to " + value.writeToString());
t.initCause(e);
throw t;
@@ -808,6 +810,7 @@
return pd;
}
}
+ // ### FIXME conditionthrowable -> error()
throw new ConditionThrowable("Property " + prop + " not found in " + obj);
}
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 Thu Nov 5 16:52:10 2009
@@ -59,6 +59,7 @@
result = unreadableString(JAVA_STACK_FRAME + " "
+ toLispString().toString());
} catch (ConditionThrowable t) {
+ // ### FIXME exception
Debug.trace("Implementation error: ");
Debug.trace(t);
result = unreadableString(JAVA_STACK_FRAME);
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 Thu Nov 5 16:52:10 2009
@@ -111,6 +111,7 @@
if (name != NIL)
javaThread.setName(name.getStringValue());
} catch (ConditionThrowable ex) {
+ // ### FIXME exception
Debug.trace("Failed to set thread name:");
Debug.trace(ex);
}
@@ -794,6 +795,7 @@
stream.print(')');
}
catch (ConditionThrowable t) {
+ // ### FIXME exception
Debug.trace(t);
}
} else {
@@ -1063,6 +1065,7 @@
PACKAGE_EXT.export(Symbol.intern("INTERRUPT-THREAD", PACKAGE_THREADS));
PACKAGE_EXT.export(Symbol.intern("CURRENT-THREAD", PACKAGE_THREADS));
}
+ // ### FIXME exception
catch (ConditionThrowable ct) { }
}
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 Thu Nov 5 16:52:10 2009
@@ -571,6 +571,7 @@
return sb.toString();
}
catch (ConditionThrowable t) {
+ // ### FIXME exception
return unreadableString("PATHNAME");
}
}
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 Thu Nov 5 16:52:10 2009
@@ -93,6 +93,7 @@
thread.incrementCallCounts();
Thread.sleep(sleep);
}
+ //### FIXME exception
catch (InterruptedException e) {
Debug.trace(e);
}
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 Thu Nov 5 16:52:10 2009
@@ -65,6 +65,7 @@
setLambdaList(new SimpleString(arglist));
}
catch (ConditionThrowable t) {
+ // ### FIXME exception
Debug.assertTrue(false);
}
}
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 Thu Nov 5 16:52:10 2009
@@ -88,6 +88,7 @@
}
catch (ConditionThrowable t)
{
+ // ### FIXME exception
Debug.assertTrue(false);
}
}
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 Thu Nov 5 16:52:10 2009
@@ -326,6 +326,7 @@
if (encIsCp)
encoding = "Cp" + encoding;
}
+ // ### FIXME exception
catch (ConditionThrowable ct) { }
eolChar = (eolStyle == EolStyle.CR) ? '\r' : '\n';
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 Thu Nov 5 16:52:10 2009
@@ -50,6 +50,7 @@
}
catch (ConditionThrowable t)
{
+ // ### FIXME exception
Debug.trace(t); // Shouldn't happen.
return null;
}
More information about the armedbear-cvs
mailing list