[armedbear-cvs] r12288 - trunk/abcl/src/org/armedbear/lisp
Ville Voutilainen
vvoutilainen at common-lisp.net
Sun Nov 29 22:00:15 UTC 2009
Author: vvoutilainen
Date: Sun Nov 29 17:00:12 2009
New Revision: 12288
Log:
Don't extend Lisp in LispObject, static import Lisp wherever
necessary. Patch by Douglas R. Miles.
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/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/Cons.java
trunk/abcl/src/org/armedbear/lisp/ControlError.java
trunk/abcl/src/org/armedbear/lisp/Debug.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/EchoStream.java
trunk/abcl/src/org/armedbear/lisp/EndOfFile.java
trunk/abcl/src/org/armedbear/lisp/Environment.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/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/Keyword.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/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/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/Site.java
trunk/abcl/src/org/armedbear/lisp/SiteName.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/SlotDefinitionClass.java
trunk/abcl/src/org/armedbear/lisp/SocketStream.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/StandardGenericFunctionClass.java
trunk/abcl/src/org/armedbear/lisp/StandardMethod.java
trunk/abcl/src/org/armedbear/lisp/StandardMethodClass.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/StandardReaderMethodClass.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/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/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/assq.java
trunk/abcl/src/org/armedbear/lisp/assql.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/function_info.java
trunk/abcl/src/org/armedbear/lisp/gc.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/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_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/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/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/stream_element_type.java
trunk/abcl/src/org/armedbear/lisp/stream_external_format.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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class AbstractArray extends LispObject
{
@Override
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class AbstractBitVector extends AbstractVector
{
protected static final int LONG_MASK = 0x3f;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class AbstractString extends AbstractVector
{
@Override
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 Sun Nov 29 17:00:12 2009
@@ -32,6 +32,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class AbstractVector extends AbstractArray
{
@Override
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class ArithmeticError extends LispError
{
protected ArithmeticError(LispClass cls)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class Autoload extends Function
{
protected final String fileName;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class AutoloadMacro extends Autoload
{
private AutoloadMacro(Symbol 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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// A basic vector is a specialized vector that is not displaced to another
// array, has no fill pointer, and is not expressly adjustable.
public final class BasicVector_UnsignedByte16 extends AbstractVector
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// A basic vector is a specialized vector that is not displaced to another
// array, has no fill pointer, and is not expressly adjustable.
public final class BasicVector_UnsignedByte32 extends AbstractVector
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// A basic vector is a specialized vector that is not displaced to another
// array, has no fill pointer, and is not expressly adjustable.
public final class BasicVector_UnsignedByte8 extends AbstractVector
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class Bignum extends LispInteger
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class BroadcastStream extends Stream
{
private final Stream[] streams;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class BuiltInClass extends LispClass
{
private BuiltInClass(Symbol symbol)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ByteArrayOutputStream extends Stream
{
private final java.io.ByteArrayOutputStream byteArrayOutputStream;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class CaseFrobStream extends Stream
{
protected final Stream target;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class CellError extends LispError
{
protected CellError(LispClass cls)
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class CharacterFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class CharacterFunctions extends LispTrampolinesFile
{
// ### char=
private static final Primitive CHAR_EQUALS =
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 Sun Nov 29 17:00:12 2009
@@ -34,6 +34,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.ArrayList;
public class Closure extends Function
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class CompiledClosure extends Closure
implements Cloneable
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class CompilerError extends Condition
{
public CompilerError(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class CompilerUnsupportedFeatureError extends Condition
{
public CompilerUnsupportedFeatureError(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class Complex extends LispObject
{
public final LispObject realpart;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ComplexArray extends AbstractArray
{
private final int[] dimv;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ComplexArray_UnsignedByte32 extends AbstractArray
{
private final int[] dimv;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ComplexArray_UnsignedByte8 extends AbstractArray
{
private final int[] dimv;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ComplexBitVector extends AbstractBitVector
{
private int fillPointer = -1; // -1 indicates no fill pointer.
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ComplexString extends AbstractString
{
private int capacity;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// A vector that is displaced to another array, has a fill pointer, and/or is
// expressly adjustable. It can hold elements of any type.
public final class ComplexVector extends AbstractVector
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// A specialized vector of element type (UNSIGNED-BYTE 32) that is displaced to
// another array, has a fill pointer, and/or is expressly adjustable.
public final class ComplexVector_UnsignedByte32 extends AbstractVector
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// A specialized vector of element type (UNSIGNED-BYTE 8) that is displaced to
// another array, has a fill pointer, and/or is expressly adjustable.
public final class ComplexVector_UnsignedByte8 extends AbstractVector
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ConcatenatedStream extends Stream
{
private LispObject 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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class Condition extends StandardObject
{
protected String message;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class Cons extends LispObject
{
public LispObject car;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ControlError extends LispError
{
public ControlError(LispObject initArgs)
Modified: trunk/abcl/src/org/armedbear/lisp/Debug.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Debug.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Debug.java Sun Nov 29 17:00:12 2009
@@ -33,7 +33,7 @@
package org.armedbear.lisp;
-public final class Debug extends Lisp
+public final class Debug
{
public static final void assertTrue(boolean b)
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class DispatchMacroFunction extends Function
{
public DispatchMacroFunction(String name)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class DivisionByZero extends ArithmeticError
{
public DivisionByZero()
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class Do extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class Do extends LispTrampolinesFile
{
// ### do
private static final SpecialOperator DO =
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class DoubleFloat extends LispObject
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class EchoStream extends Stream
{
private final Stream in;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class EndOfFile extends StreamError
{
public EndOfFile(Stream stream)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class Environment extends LispObject
{
private Binding vars;
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 Sun Nov 29 17:00:12 2009
@@ -33,10 +33,12 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.IOException;
-public final class Extensions extends Lisp
+public final class Extensions extends LispTrampolinesFile
{
// ### *ed-functions*
public static final Symbol _ED_FUNCTIONS_ =
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class FaslReader extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class FaslReader extends LispTrampolinesFile
{
// ### fasl-read-comment
public static final ReaderMacroFunction FASL_READ_COMMENT =
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class FileError extends LispError
{
// initArgs is either a normal initArgs list or a pathname.
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 Sun Nov 29 17:00:12 2009
@@ -34,6 +34,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class FillPointerOutputStream extends Stream
{
private ComplexString string;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class Fixnum extends LispInteger
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 Sun Nov 29 17:00:12 2009
@@ -33,9 +33,11 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
-public final class FloatFunctions extends Lisp
+public final class FloatFunctions extends LispTrampolinesFile
{
// ### set-floating-point-modes &key traps => <no values>
private static final Primitive SET_FLOATING_POINT_MODES =
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class FloatingPointInexact extends ArithmeticError
{
public FloatingPointInexact(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class FloatingPointInvalidOperation extends ArithmeticError
{
public FloatingPointInvalidOperation(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class FloatingPointOverflow extends ArithmeticError
{
public FloatingPointOverflow(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class FloatingPointUnderflow extends ArithmeticError
{
public FloatingPointUnderflow(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class ForwardReferencedClass extends LispClass
{
public ForwardReferencedClass(Symbol name)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class Function extends Operator
{
private LispObject propertyList = NIL;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class GenericFunction extends StandardObject
{
protected GenericFunction(LispClass cls, int length)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class HashTable extends LispObject
{
private static final int DEFAULT_SIZE = 16;
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class HashTableFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class HashTableFunctions extends LispTrampolinesFile
{
private static final LispObject FUNCTION_EQ =
Symbol.EQ.getSymbolFunction();
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class IllegalMonitorState extends ProgramError
{
public IllegalMonitorState()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -40,7 +42,7 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
-public final class Interpreter extends Lisp
+public final class Interpreter extends LispTrampolinesFile
{
// There can only be one interpreter.
public static Interpreter interpreter;
@@ -153,7 +155,7 @@
// Interface.
public LispObject eval(String s)
{
- return eval(new StringInputStream(s).read(true, NIL, false,
+ return Lisp.eval(new StringInputStream(s).read(true, NIL, false,
LispThread.currentThread()));
}
@@ -334,7 +336,7 @@
break;
out.setCharPos(0);
Symbol.MINUS.setSymbolValue(object);
- LispObject result = eval(object, new Environment(), thread);
+ LispObject result = Lisp.eval(object, new Environment(), thread);
Debug.assertTrue(result != null);
Symbol.STAR_STAR_STAR.setSymbolValue(Symbol.STAR_STAR.getSymbolValue());
Symbol.STAR_STAR.setSymbolValue(Symbol.STAR.getSymbolValue());
@@ -538,7 +540,7 @@
final SpecialBindingsMark mark = thread.markSpecialBindings();
thread.bindSpecial(Symbol.DEBUGGER_HOOK, _DEBUGGER_HOOK_FUNCTION);
try {
- return eval(obj, new Environment(), thread);
+ return Lisp.eval(obj, new Environment(), thread);
}
finally {
thread.resetSpecialBindings(mark);
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 Sun Nov 29 17:00:12 2009
@@ -33,11 +33,13 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.HashMap;
import java.util.Map;
import java.util.WeakHashMap;
-public final class JHandler extends Lisp
+public final class JHandler extends LispTrampolinesFile
{
private static final Map<Object,Map<String,Entry>> table =
new WeakHashMap<Object,Map<String,Entry>>();
@@ -80,7 +82,7 @@
}
LispObject lispAsVector = new SimpleVector(lispAs);
LispObject[] args = new LispObject[] //FIXME: count -> seq_num
- { data, new JavaObject(o), lispAiVector, lispAsVector, Keyword.internKeyword(s), count };
+ { data, new JavaObject(o), lispAiVector, lispAsVector, internKeyword(s), count };
f.execute(args);
}
}
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
@@ -40,7 +42,7 @@
import java.util.Map;
import java.util.WeakHashMap;
-public final class JProxy extends Lisp
+public final class JProxy extends LispTrampolinesFile
{
private static final Map<Object,Entry> table = new WeakHashMap<Object,Entry>();
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -46,7 +48,7 @@
import java.util.HashMap;
import java.util.Map;
-public final class Java extends Lisp
+public final class Java extends LispTrampolinesFile
{
private static final Map<Class,Symbol> registeredExceptions =
new HashMap<Class,Symbol>();
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 Sun Nov 29 17:00:12 2009
@@ -21,6 +21,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.PrintWriter;
import java.io.StringWriter;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.lang.reflect.*;
import java.math.BigInteger;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class JavaStackFrame
extends StackFrame
{
@@ -69,11 +71,11 @@
return super.typep(typeSpecifier);
}
- static final Symbol CLASS = Packages.internKeyword("CLASS");
- static final Symbol METHOD = Packages.internKeyword("METHOD");
- static final Symbol FILE = Packages.internKeyword("FILE");
- static final Symbol LINE = Packages.internKeyword("LINE");
- static final Symbol NATIVE_METHOD = Packages.internKeyword("NATIVE-METHOD");
+ static final Symbol CLASS = internKeyword("CLASS");
+ static final Symbol METHOD = internKeyword("METHOD");
+ static final Symbol FILE = internKeyword("FILE");
+ static final Symbol LINE = internKeyword("LINE");
+ static final Symbol NATIVE_METHOD = internKeyword("NATIVE-METHOD");
public LispObject toLispList()
{
Modified: trunk/abcl/src/org/armedbear/lisp/Keyword.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Keyword.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Keyword.java Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class Keyword extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class Keyword extends LispTrampolinesFile
{
public static final Symbol
ABCL = internKeyword("ABCL"),
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class Layout extends LispObject
{
public final LispClass lispClass;
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 Sun Nov 29 17:00:12 2009
@@ -46,7 +46,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-public abstract class Lisp
+public final class Lisp
{
public static final boolean debug = true;
@@ -380,7 +380,7 @@
return error(new TypeError(datum, expectedType));
}
- protected static volatile boolean interrupted;
+ public static volatile boolean interrupted;
public static synchronized final void setInterrupted(boolean b)
{
@@ -490,7 +490,7 @@
public static final int CALL_REGISTERS_MAX = 8;
// Also used in JProxy.java.
- protected static final LispObject evalCall(LispObject function,
+ public static final LispObject evalCall(LispObject function,
LispObject args,
Environment env,
LispThread thread)
@@ -818,7 +818,7 @@
return false;
}
- protected static final void bindArg(LispObject ownSpecials,
+ public static final void bindArg(LispObject ownSpecials,
Symbol sym, LispObject value,
Environment env, LispThread thread)
@@ -1834,7 +1834,7 @@
return null;
}
- public LispObject assq(LispObject item, LispObject alist)
+ public static LispObject assq(LispObject item, LispObject alist)
{
while (alist instanceof Cons)
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 Sun Nov 29 17:00:12 2009
@@ -32,6 +32,8 @@
*/
package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
import java.util.HashMap;
import java.util.Map;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class LispClass extends StandardObject
{
private static final EqHashTable map = new EqHashTable(256, NIL, 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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class LispError extends SeriousCondition
{
public LispError()
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 Sun Nov 29 17:00:12 2009
@@ -33,9 +33,10 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
import java.util.WeakHashMap;
-public class LispObject extends Lisp
+public class LispObject //extends Lisp
{
public LispObject typeOf()
{
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class LispReader extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class LispReader extends LispTrampolinesFile
{
// ### read-comment
public static final ReaderMacroFunction READ_COMMENT =
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class LispStackFrame
extends StackFrame
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -1096,14 +1098,14 @@
static {
//FIXME: this block has been added for pre-0.16 compatibility
// and can be removed the latest at release 0.22
- PACKAGE_EXT.export(Symbol.intern("MAKE-THREAD", PACKAGE_THREADS));
- PACKAGE_EXT.export(Symbol.intern("THREADP", PACKAGE_THREADS));
- PACKAGE_EXT.export(Symbol.intern("THREAD-ALIVE-P", PACKAGE_THREADS));
- PACKAGE_EXT.export(Symbol.intern("THREAD-NAME", PACKAGE_THREADS));
- PACKAGE_EXT.export(Symbol.intern("MAPCAR-THREADS", PACKAGE_THREADS));
- PACKAGE_EXT.export(Symbol.intern("DESTROY-THREAD", PACKAGE_THREADS));
- PACKAGE_EXT.export(Symbol.intern("INTERRUPT-THREAD", PACKAGE_THREADS));
- PACKAGE_EXT.export(Symbol.intern("CURRENT-THREAD", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("MAKE-THREAD", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("THREADP", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("THREAD-ALIVE-P", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("THREAD-NAME", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("MAPCAR-THREADS", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("DESTROY-THREAD", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("INTERRUPT-THREAD", PACKAGE_THREADS));
+ PACKAGE_EXT.export(intern("CURRENT-THREAD", PACKAGE_THREADS));
}
// ### use-fast-calls
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -64,7 +66,7 @@
* ._ file with FASL loading instructions.
*/
-public final class Load extends Lisp
+public final class Load extends LispTrampolinesFile
{
public static final LispObject load(String filename)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.HashMap;
import java.util.StringTokenizer;
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 Sun Nov 29 17:00:12 2009
@@ -33,9 +33,11 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class MacroObject extends Function
{
- private final LispObject name;
+ protected final LispObject name;
public final LispObject expander;
public MacroObject(LispObject name, LispObject expander)
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class MathFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class MathFunctions extends LispTrampolinesFile
{
// ### sin
private static final Primitive SIN = new Primitive("sin", "radians")
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class Nil extends Symbol
{
final static Nil NIL = new Nil(PACKAGE_CL);
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class NilVector extends AbstractString
{
private int capacity;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class Operator extends LispObject
{
protected LispObject 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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class PackageError extends LispError
{
public PackageError(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class PackageFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class PackageFunctions extends LispTrampolinesFile
{
// ### packagep
// packagep object => generalized-boolean
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 Sun Nov 29 17:00:12 2009
@@ -33,12 +33,14 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-public final class Packages extends Lisp
+public final class Packages extends LispTrampolinesFile
{
private static final ArrayList<Package> packages = new ArrayList<Package>();
private static final HashMap<String,Package> map = new HashMap<String,Package>();
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ParseError extends LispError
{
public ParseError(String message)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.IOException;
import java.net.URL;
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 Sun Nov 29 17:00:12 2009
@@ -33,10 +33,12 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
import java.util.ArrayList;
-public final class Primitives extends Lisp
+public final class Primitives extends LispTrampolinesFile
{
// ### *
public static final Primitive MULTIPLY =
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class PrintNotReadable extends LispError
{
public PrintNotReadable(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public class Profiler extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public class Profiler extends LispTrampolinesFile
{
private static int sleep = 1;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class ProgramError extends LispError
{
protected ProgramError(LispClass cls)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class Ratio extends LispObject
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ReaderError extends StreamError
{
public ReaderError(String message)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class ReaderMacroFunction extends Function
{
public ReaderMacroFunction(String name)
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 Sun Nov 29 17:00:12 2009
@@ -32,6 +32,8 @@
*/
package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
import java.util.Iterator;
public class Readtable extends LispObject
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 Sun Nov 29 17:00:12 2009
@@ -33,11 +33,13 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.util.Map;
import java.util.HashMap;
-public class RuntimeClass extends Lisp
+public class RuntimeClass extends LispTrampolinesFile
{
private static Map<String,RuntimeClass> classes = new HashMap<String,RuntimeClass>();
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class SeriousCondition extends Condition
{
public SeriousCondition()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -40,7 +42,7 @@
import java.util.ArrayList;
import java.util.List;
-public final class ShellCommand extends Lisp implements Runnable
+public final class ShellCommand extends LispTrampolinesFile implements Runnable
{
private final String command;
private final String directory;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleArray_T extends AbstractArray
{
private final int[] dimv;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleArray_UnsignedByte16 extends AbstractArray
{
private final int[] dimv;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleArray_UnsignedByte32 extends AbstractArray
{
private final int[] dimv;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleArray_UnsignedByte8 extends AbstractArray
{
private final int[] dimv;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// "The type of a bit vector that is not displaced to another array, has no
// fill pointer, and is not expressly adjustable is a subtype of type SIMPLE-
// BIT-VECTOR."
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class SimpleCondition extends Condition
{
public SimpleCondition()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleError extends LispError
{
public SimpleError(LispObject formatControl, LispObject formatArguments)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleString extends AbstractString
{
private int capacity;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleTypeError extends TypeError
{
public SimpleTypeError(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// "The type of a vector that is not displaced to another array, has no fill
// pointer, is not expressly adjustable and is able to hold elements of any
// type is a subtype of type SIMPLE-VECTOR."
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SimpleWarning extends Warning
{
public SimpleWarning(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class SingleFloat extends LispObject
Modified: trunk/abcl/src/org/armedbear/lisp/Site.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Site.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/Site.java Sun Nov 29 17:00:12 2009
@@ -33,11 +33,13 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.net.URL;
import java.net.URLDecoder;
-public final class Site extends Lisp
+public final class Site extends LispTrampolinesFile
{
private static final String LISP_HOME;
Modified: trunk/abcl/src/org/armedbear/lisp/SiteName.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SiteName.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SiteName.java Sun Nov 29 17:00:12 2009
@@ -33,9 +33,11 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.InetAddress;
-public final class SiteName extends Lisp
+public final class SiteName extends LispTrampolinesFile
{
private static LispObject getHostName()
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class SlimeInputStream extends Stream
{
String s;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.StringWriter;
public final class SlimeOutputStream extends Stream
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class SlotClass extends LispClass
{
private LispObject directSlotDefinitions = NIL;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SlotDefinition extends StandardObject
{
public SlotDefinition()
Modified: trunk/abcl/src/org/armedbear/lisp/SlotDefinitionClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SlotDefinitionClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/SlotDefinitionClass.java Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SlotDefinitionClass extends StandardClass
{
public static final int SLOT_INDEX_NAME = 0;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.Socket;
public final class SocketStream extends TwoWayStream
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class SpecialOperator extends Operator
{
private int callCount;
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 Sun Nov 29 17:00:12 2009
@@ -33,9 +33,11 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.ArrayList;
import java.util.LinkedList;
-public final class SpecialOperators extends Lisp
+public final class SpecialOperators extends LispTrampolinesFile
{
// ### quote
private static final SpecialOperator QUOTE =
@@ -502,7 +504,7 @@
public LispObject execute(LispObject args, Environment env)
{
- LispObject value = Symbol.NIL;
+ LispObject value = Nil.NIL;
final LispThread thread = LispThread.currentThread();
while (args != NIL)
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public abstract class StackFrame
extends LispObject
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class StandardClass extends SlotClass
{
public StandardClass()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.util.HashMap;
public final class StandardGenericFunction extends StandardObject
Modified: trunk/abcl/src/org/armedbear/lisp/StandardGenericFunctionClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardGenericFunctionClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardGenericFunctionClass.java Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class StandardGenericFunctionClass extends StandardClass
{
public static final int SLOT_INDEX_NAME = 0;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class StandardMethod extends StandardObject
{
public StandardMethod()
Modified: trunk/abcl/src/org/armedbear/lisp/StandardMethodClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardMethodClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardMethodClass.java Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class StandardMethodClass extends StandardClass
{
public static final int SLOT_INDEX_GENERIC_FUNCTION = 0;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class StandardObject extends LispObject
{
protected Layout layout;
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public class StandardObjectFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public class StandardObjectFunctions extends LispTrampolinesFile
{
// ### std-allocate-instance class => instance
private static final Primitive STD_ALLOCATE_INSTANCE =
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class StandardReaderMethod extends StandardMethod
{
public StandardReaderMethod()
Modified: trunk/abcl/src/org/armedbear/lisp/StandardReaderMethodClass.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/StandardReaderMethodClass.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/StandardReaderMethodClass.java Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class StandardReaderMethodClass extends StandardClass
{
// From StandardMethodClass.java:
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class StorageCondition extends SeriousCondition
{
public StorageCondition()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
@@ -90,22 +92,22 @@
LF
}
- static final protected Symbol keywordDefault = Packages.internKeyword("DEFAULT");
+ static final protected Symbol keywordDefault = internKeyword("DEFAULT");
- static final private Symbol keywordCodePage = Packages.internKeyword("CODE-PAGE");
- static final private Symbol keywordID = Packages.internKeyword("ID");
+ static final private Symbol keywordCodePage = internKeyword("CODE-PAGE");
+ static final private Symbol keywordID = internKeyword("ID");
- static final private Symbol keywordEolStyle = Packages.internKeyword("EOL-STYLE");
- static final private Symbol keywordCR = Packages.internKeyword("CR");
- static final private Symbol keywordLF = Packages.internKeyword("LF");
- static final private Symbol keywordCRLF = Packages.internKeyword("CRLF");
- static final private Symbol keywordRAW = Packages.internKeyword("RAW");
+ static final private Symbol keywordEolStyle = internKeyword("EOL-STYLE");
+ static final private Symbol keywordCR = internKeyword("CR");
+ static final private Symbol keywordLF = internKeyword("LF");
+ static final private Symbol keywordCRLF = internKeyword("CRLF");
+ static final private Symbol keywordRAW = internKeyword("RAW");
public final static EolStyle platformEolStyle = Utilities.isPlatformWindows ? EolStyle.CRLF : EolStyle.LF;
protected EolStyle eolStyle = platformEolStyle;
protected char eolChar = (eolStyle == EolStyle.CR) ? '\r' : '\n';
- protected LispObject externalFormat = LispObject.NIL;
+ protected LispObject externalFormat = NIL;
protected String encoding = null;
protected char lastChar = 0;
@@ -290,10 +292,10 @@
if (enc == keywordCodePage) {
encIsCp = true;
- enc = LispObject.getf(format.cdr(), keywordID, null);
+ enc = getf(format.cdr(), keywordID, null);
}
- LispObject eol = LispObject.getf(format.cdr(), keywordEolStyle, keywordRAW);
+ LispObject eol = getf(format.cdr(), keywordEolStyle, keywordRAW);
if (eol == keywordCR)
eolStyle = EolStyle.CR;
else if (eol == keywordLF)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class StreamError extends LispError
{
private final Throwable cause;
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class StringFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class StringFunctions extends LispTrampolinesFile
{
// ### %string=
// Case sensitive.
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.StringReader;
public final class StringInputStream extends Stream
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.StringWriter;
public final class StringOutputStream extends Stream
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class StructureClass extends SlotClass
{
private StructureClass(Symbol 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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class StructureObject extends LispObject
{
private final StructureClass structureClass;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class StyleWarning extends Warning
{
public StyleWarning(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class Symbol extends LispObject
{
// Bit flags.
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class SynonymStream extends Stream
{
private final Symbol symbol;
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 Sun Nov 29 17:00:12 2009
@@ -33,11 +33,13 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.lang.reflect.Method;
import java.util.Date;
import java.util.TimeZone;
-public final class Time extends Lisp
+public final class Time extends LispTrampolinesFile
{
// ### %time
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class TwoWayStream extends Stream
{
public final Stream in;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class TypeError extends LispError
{
public TypeError()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class UnboundSlot extends CellError
{
public UnboundSlot(LispObject initArgs)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class UnboundVariable extends CellError
{
// obj is either the unbound variable itself or an initArgs list.
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class UndefinedFunction extends CellError
{
// obj is either the name of the undefined function or an initArgs list.
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -42,7 +44,7 @@
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
-public final class Utilities extends Lisp
+public final class Utilities extends LispTrampolinesFile
{
public static final boolean isPlatformUnix;
public static final boolean isPlatformWindows;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public class Warning extends Condition
{
protected Warning()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class WrongNumberOfArgumentsException extends ProgramError
{
private final Operator operator;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class ZeroRankArray extends AbstractArray
{
private final LispObject elementType;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### %adjust-array array new-dimensions element-type initial-element
// initial-element-p initial-contents initial-contents-p fill-pointer
// displaced-to displaced-index-offset => new-array
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class arglist extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class arglist extends LispTrampolinesFile
{
private static final Operator getOperator(LispObject obj)
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### assq item alist => entry
public final class assq extends Primitive
{
@@ -45,7 +47,7 @@
public LispObject execute(LispObject item, LispObject alist)
{
- return assq(item, alist);
+ return Lisp.assq(item, alist);
}
private static final Primitive ASSQ = new assq();
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### assql item alist => entry
public final class assql extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### cell-error-name
public final class cell_error_name extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### copy-list list => copy
public final class copy_list extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.IOException;
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class cxr extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class cxr extends LispTrampolinesFile
{
// ### set-car
private static final Primitive SET_CAR =
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.IOException;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### dolist
public final class dolist extends SpecialOperator
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class dotimes extends SpecialOperator
{
private dotimes()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
// ### file-author
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### file-error-pathname
public final class file_error_pathname extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class file_length extends Primitive
{
private file_length()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### file-string-length
public final class file_string_length extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
// ### file-write-date
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### float-sign
public final class float_sign extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,7 +33,9 @@
package org.armedbear.lisp;
-public final class function_info extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class function_info extends LispTrampolinesFile
{
private static EqualHashTable FUNCTION_TABLE =
new EqualHashTable(64, NIL, NIL);
Modified: trunk/abcl/src/org/armedbear/lisp/gc.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/gc.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/gc.java Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### gc
public final class gc extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### get-properties
public final class get_properties extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### input-stream-p
public final class input_stream_p extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### interactive-stream-p
public final class interactive_stream_p extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### jclass-name class-ref &optional name
public final class jclass_name extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### jclass-of object &optional name
public final class jclass_of extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.lang.reflect.Method;
// ### jmethod-return-type method => class
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### last list &optional n => tail
public final class last extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### listen
public final class listen extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logand &rest integers => result-integer
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class logandc1 extends Primitive
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logandc2
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logbitp index integer => generalized-boolean
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logcount integer => number-of-on-bits
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logeqv
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### logior &rest integers => result-integer
public final class logior extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class lognand extends Primitive
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
public final class lognor extends Primitive
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logorc1
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logorc2
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.math.BigInteger;
// ### logtest integer-1 integer-2 => generalized-boolean
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### logxor &rest integers => result-integer
public final class logxor extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.IOException;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### %make-array dimensions element-type initial-element initial-element-p
// initial-contents adjustable fill-pointer displaced-to displaced-index-offset
// => new-array
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
public final class make_condition extends Primitive
{
private make_condition()
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.ServerSocket;
// ### %make-server-socket
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.Socket;
// ### %make-socket
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### open-stream-p
public final class open_stream_p extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### output-stream-p
public final class output_stream_p extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### package-error-package
public final class package_error_package extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### peek-char
public final class peek_char extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,9 +33,11 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
-public final class probe_file extends Lisp
+public final class probe_file extends LispTrampolinesFile
{
// ### probe-file
// probe-file pathspec => truename
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### room
public final class room extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.ServerSocket;
// ### %server-socket-close
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### simple-list-remove-duplicates
public final class simple_list_remove_duplicates extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.ServerSocket;
import java.net.Socket;
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.Socket;
// ### %socket-close
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.net.Socket;
// ### %socket-stream
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### stream-element-type
public final class stream_element_type extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### stream-external-format
public final class stream_external_format extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
// ### unbound-slot-instance
public final class unbound_slot_instance extends Primitive
{
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 Sun Nov 29 17:00:12 2009
@@ -33,6 +33,8 @@
package org.armedbear.lisp;
+import static org.armedbear.lisp.Lisp.*;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
More information about the armedbear-cvs
mailing list