Changeset 12288

Timestamp:

11/29/09 22:00:12 (14 years ago)

Author:

vvoutilainen

Message:

Don't extend Lisp in LispObject, static import Lisp wherever
necessary. Patch by Douglas R. Miles.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• AbstractArray.java (modified) (1 diff)
• AbstractBitVector.java (modified) (1 diff)
• AbstractString.java (modified) (1 diff)
• AbstractVector.java (modified) (1 diff)
• ArithmeticError.java (modified) (1 diff)
• Autoload.java (modified) (1 diff)
• AutoloadMacro.java (modified) (1 diff)
• BasicVector_UnsignedByte16.java (modified) (1 diff)
• BasicVector_UnsignedByte32.java (modified) (1 diff)
• BasicVector_UnsignedByte8.java (modified) (1 diff)
• Bignum.java (modified) (1 diff)
• BroadcastStream.java (modified) (1 diff)
• BuiltInClass.java (modified) (1 diff)
• ByteArrayOutputStream.java (modified) (1 diff)
• CaseFrobStream.java (modified) (1 diff)
• CellError.java (modified) (1 diff)
• CharacterFunctions.java (modified) (1 diff)
• Closure.java (modified) (1 diff)
• CompiledClosure.java (modified) (1 diff)
• CompilerError.java (modified) (1 diff)
• CompilerUnsupportedFeatureError.java (modified) (1 diff)
• Complex.java (modified) (1 diff)
• ComplexArray.java (modified) (1 diff)
• ComplexArray_UnsignedByte32.java (modified) (1 diff)
• ComplexArray_UnsignedByte8.java (modified) (1 diff)
• ComplexBitVector.java (modified) (1 diff)
• ComplexString.java (modified) (1 diff)
• ComplexVector.java (modified) (1 diff)
• ComplexVector_UnsignedByte32.java (modified) (1 diff)
• ComplexVector_UnsignedByte8.java (modified) (1 diff)
• ConcatenatedStream.java (modified) (1 diff)
• Condition.java (modified) (1 diff)
• Cons.java (modified) (1 diff)
• ControlError.java (modified) (1 diff)
• Debug.java (modified) (1 diff)
• DispatchMacroFunction.java (modified) (1 diff)
• DivisionByZero.java (modified) (1 diff)
• Do.java (modified) (1 diff)
• DoubleFloat.java (modified) (1 diff)
• EchoStream.java (modified) (1 diff)
• EndOfFile.java (modified) (1 diff)
• Environment.java (modified) (1 diff)
• Extensions.java (modified) (1 diff)
• FaslReader.java (modified) (1 diff)
• FileError.java (modified) (1 diff)
• FileStream.java (modified) (1 diff)
• FillPointerOutputStream.java (modified) (1 diff)
• Fixnum.java (modified) (1 diff)
• FloatFunctions.java (modified) (1 diff)
• FloatingPointInexact.java (modified) (1 diff)
• FloatingPointInvalidOperation.java (modified) (1 diff)
• FloatingPointOverflow.java (modified) (1 diff)
• FloatingPointUnderflow.java (modified) (1 diff)
• ForwardReferencedClass.java (modified) (1 diff)
• Function.java (modified) (1 diff)
• GenericFunction.java (modified) (1 diff)
• HashTable.java (modified) (1 diff)
• HashTableFunctions.java (modified) (1 diff)
• IllegalMonitorState.java (modified) (1 diff)
• Interpreter.java (modified) (5 diffs)
• JHandler.java (modified) (2 diffs)
• JProxy.java (modified) (2 diffs)
• Java.java (modified) (2 diffs)
• JavaClass.java (modified) (1 diff)
• JavaException.java (modified) (1 diff)
• JavaObject.java (modified) (1 diff)
• JavaStackFrame.java (modified) (2 diffs)
• Keyword.java (modified) (1 diff)
• Layout.java (modified) (1 diff)
• Lisp.java (modified) (5 diffs)
• LispCharacter.java (modified) (1 diff)
• LispClass.java (modified) (1 diff)
• LispError.java (modified) (1 diff)
• LispObject.java (modified) (1 diff)
• LispReader.java (modified) (1 diff)
• LispStackFrame.java (modified) (1 diff)
• LispThread.java (modified) (2 diffs)
• Load.java (modified) (2 diffs)
• LogicalPathname.java (modified) (1 diff)
• MacroObject.java (modified) (1 diff)
• MathFunctions.java (modified) (1 diff)
• Nil.java (modified) (1 diff)
• NilVector.java (modified) (1 diff)
• Operator.java (modified) (1 diff)
• Package.java (modified) (1 diff)
• PackageError.java (modified) (1 diff)
• PackageFunctions.java (modified) (1 diff)
• Packages.java (modified) (2 diffs)
• ParseError.java (modified) (1 diff)
• Pathname.java (modified) (1 diff)
• Primitives.java (modified) (1 diff)
• PrintNotReadable.java (modified) (1 diff)
• Profiler.java (modified) (1 diff)
• ProgramError.java (modified) (1 diff)
• RandomState.java (modified) (1 diff)
• Ratio.java (modified) (1 diff)
• ReaderError.java (modified) (1 diff)
• ReaderMacroFunction.java (modified) (1 diff)
• Readtable.java (modified) (1 diff)
• RuntimeClass.java (modified) (1 diff)
• SeriousCondition.java (modified) (1 diff)
• ShellCommand.java (modified) (2 diffs)
• SimpleArray_T.java (modified) (1 diff)
• SimpleArray_UnsignedByte16.java (modified) (1 diff)
• SimpleArray_UnsignedByte32.java (modified) (1 diff)
• SimpleArray_UnsignedByte8.java (modified) (1 diff)
• SimpleBitVector.java (modified) (1 diff)
• SimpleCondition.java (modified) (1 diff)
• SimpleError.java (modified) (1 diff)
• SimpleString.java (modified) (1 diff)
• SimpleTypeError.java (modified) (1 diff)
• SimpleVector.java (modified) (1 diff)
• SimpleWarning.java (modified) (1 diff)
• SingleFloat.java (modified) (1 diff)
• Site.java (modified) (1 diff)
• SiteName.java (modified) (1 diff)
• SlimeInputStream.java (modified) (1 diff)
• SlimeOutputStream.java (modified) (1 diff)
• SlotClass.java (modified) (1 diff)
• SlotDefinition.java (modified) (1 diff)
• SlotDefinitionClass.java (modified) (1 diff)
• SocketStream.java (modified) (1 diff)
• SpecialOperator.java (modified) (1 diff)
• SpecialOperators.java (modified) (2 diffs)
• StackFrame.java (modified) (1 diff)
• StandardClass.java (modified) (1 diff)
• StandardGenericFunction.java (modified) (1 diff)
• StandardGenericFunctionClass.java (modified) (1 diff)
• StandardMethod.java (modified) (1 diff)
• StandardMethodClass.java (modified) (1 diff)
• StandardObject.java (modified) (1 diff)
• StandardObjectFunctions.java (modified) (1 diff)
• StandardReaderMethod.java (modified) (1 diff)
• StandardReaderMethodClass.java (modified) (1 diff)
• StorageCondition.java (modified) (1 diff)
• Stream.java (modified) (4 diffs)
• StreamError.java (modified) (1 diff)
• StringFunctions.java (modified) (1 diff)
• StringInputStream.java (modified) (1 diff)
• StringOutputStream.java (modified) (1 diff)
• StructureClass.java (modified) (1 diff)
• StructureObject.java (modified) (1 diff)
• StyleWarning.java (modified) (1 diff)
• Symbol.java (modified) (1 diff)
• SynonymStream.java (modified) (1 diff)
• Time.java (modified) (1 diff)
• TwoWayStream.java (modified) (1 diff)
• TypeError.java (modified) (1 diff)
• UnboundSlot.java (modified) (1 diff)
• UnboundVariable.java (modified) (1 diff)
• UndefinedFunction.java (modified) (1 diff)
• Utilities.java (modified) (2 diffs)
• Warning.java (modified) (1 diff)
• WrongNumberOfArgumentsException.java (modified) (1 diff)
• ZeroRankArray.java (modified) (1 diff)
• adjust_array.java (modified) (1 diff)
• arglist.java (modified) (1 diff)
• assq.java (modified) (2 diffs)
• assql.java (modified) (1 diff)
• cell_error_name.java (modified) (1 diff)
• copy_list.java (modified) (1 diff)
• create_new_file.java (modified) (1 diff)
• cxr.java (modified) (1 diff)
• delete_file.java (modified) (1 diff)
• disassemble_class_bytes.java (modified) (1 diff)
• dolist.java (modified) (1 diff)
• dotimes.java (modified) (1 diff)
• file_author.java (modified) (1 diff)
• file_error_pathname.java (modified) (1 diff)
• file_length.java (modified) (1 diff)
• file_string_length.java (modified) (1 diff)
• file_write_date.java (modified) (1 diff)
• float_sign.java (modified) (1 diff)
• function_info.java (modified) (1 diff)
• gc.java (modified) (1 diff)
• get_properties.java (modified) (1 diff)
• input_stream_p.java (modified) (1 diff)
• interactive_stream_p.java (modified) (1 diff)
• jclass_name.java (modified) (1 diff)
• jclass_of.java (modified) (1 diff)
• jmethod_return_type.java (modified) (1 diff)
• last.java (modified) (1 diff)
• listen.java (modified) (1 diff)
• logand.java (modified) (1 diff)
• logandc1.java (modified) (1 diff)
• logandc2.java (modified) (1 diff)
• logbitp.java (modified) (1 diff)
• logcount.java (modified) (1 diff)
• logeqv.java (modified) (1 diff)
• logior.java (modified) (1 diff)
• lognand.java (modified) (1 diff)
• lognor.java (modified) (1 diff)
• logorc1.java (modified) (1 diff)
• logorc2.java (modified) (1 diff)
• logtest.java (modified) (1 diff)
• logxor.java (modified) (1 diff)
• machine_version.java (modified) (1 diff)
• make_array.java (modified) (1 diff)
• make_condition.java (modified) (1 diff)
• make_server_socket.java (modified) (1 diff)
• make_socket.java (modified) (1 diff)
• open_stream_p.java (modified) (1 diff)
• output_stream_p.java (modified) (1 diff)
• package_error_package.java (modified) (1 diff)
• peek_char.java (modified) (1 diff)
• probe_file.java (modified) (1 diff)
• room.java (modified) (1 diff)
• server_socket_close.java (modified) (1 diff)
• simple_list_remove_duplicates.java (modified) (1 diff)
• socket_accept.java (modified) (1 diff)
• socket_close.java (modified) (1 diff)
• socket_stream.java (modified) (1 diff)
• stream_element_type.java (modified) (1 diff)
• stream_external_format.java (modified) (1 diff)
• unbound_slot_instance.java (modified) (1 diff)
• zip.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/AbstractArray.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class AbstractArray extends LispObject

trunk/abcl/src/org/armedbear/lisp/AbstractBitVector.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class AbstractBitVector extends AbstractVector

trunk/abcl/src/org/armedbear/lisp/AbstractString.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class AbstractString extends AbstractVector

trunk/abcl/src/org/armedbear/lisp/AbstractVector.java

@@ -32 +32 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class AbstractVector extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class ArithmeticError extends LispError

trunk/abcl/src/org/armedbear/lisp/Autoload.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class Autoload extends Function

trunk/abcl/src/org/armedbear/lisp/AutoloadMacro.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class AutoloadMacro extends Autoload

trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte16.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // A basic vector is a specialized vector that is not displaced to another

trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte32.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // A basic vector is a specialized vector that is not displaced to another

trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte8.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // A basic vector is a specialized vector that is not displaced to another

trunk/abcl/src/org/armedbear/lisp/Bignum.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class BroadcastStream extends Stream

trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class BuiltInClass extends LispClass

trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ByteArrayOutputStream extends Stream

trunk/abcl/src/org/armedbear/lisp/CaseFrobStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class CaseFrobStream extends Stream

trunk/abcl/src/org/armedbear/lisp/CellError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class CellError extends LispError

trunk/abcl/src/org/armedbear/lisp/CharacterFunctions.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class CharacterFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class CharacterFunctions extends LispTrampolinesFile
 {
     // ### char=

trunk/abcl/src/org/armedbear/lisp/Closure.java

@@ -34 +34 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.util.ArrayList;

trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class CompiledClosure extends Closure

trunk/abcl/src/org/armedbear/lisp/CompilerError.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public class CompilerError extends Condition
 {

trunk/abcl/src/org/armedbear/lisp/CompilerUnsupportedFeatureError.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public class CompilerUnsupportedFeatureError extends Condition
 {

trunk/abcl/src/org/armedbear/lisp/Complex.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class Complex extends LispObject

trunk/abcl/src/org/armedbear/lisp/ComplexArray.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ComplexArray extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte32.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ComplexArray_UnsignedByte32 extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ComplexArray_UnsignedByte8 extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/ComplexBitVector.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ComplexBitVector extends AbstractBitVector

trunk/abcl/src/org/armedbear/lisp/ComplexString.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class ComplexString extends AbstractString
 {

trunk/abcl/src/org/armedbear/lisp/ComplexVector.java

@@ -34 +34 @@
 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.

trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte32.java

@@ -34 +34 @@
 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.

trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte8.java

@@ -34 +34 @@
 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.

trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ConcatenatedStream extends Stream

trunk/abcl/src/org/armedbear/lisp/Condition.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public class Condition extends StandardObject
 {

trunk/abcl/src/org/armedbear/lisp/Cons.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class Cons extends LispObject

trunk/abcl/src/org/armedbear/lisp/ControlError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ControlError extends LispError

trunk/abcl/src/org/armedbear/lisp/Debug.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class Debug extends Lisp
+public final class Debug
 {
     public static final void assertTrue(boolean b)

trunk/abcl/src/org/armedbear/lisp/DispatchMacroFunction.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class DispatchMacroFunction extends Function

trunk/abcl/src/org/armedbear/lisp/DivisionByZero.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class DivisionByZero extends ArithmeticError

trunk/abcl/src/org/armedbear/lisp/Do.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class Do extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class Do extends LispTrampolinesFile
 {
   // ### do

trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/EchoStream.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class EchoStream extends Stream
 {

trunk/abcl/src/org/armedbear/lisp/EndOfFile.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class EndOfFile extends StreamError

trunk/abcl/src/org/armedbear/lisp/Environment.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class Environment extends LispObject
 {

trunk/abcl/src/org/armedbear/lisp/Extensions.java

@@ -34 +34 @@
 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*

trunk/abcl/src/org/armedbear/lisp/FaslReader.java

@@ -34 +34 @@
 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

trunk/abcl/src/org/armedbear/lisp/FileError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class FileError extends LispError

trunk/abcl/src/org/armedbear/lisp/FileStream.java

@@ -34 +34 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.File;

trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class FillPointerOutputStream extends Stream

trunk/abcl/src/org/armedbear/lisp/Fixnum.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.math.BigInteger;
 

trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java

@@ -34 +34 @@
 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>

trunk/abcl/src/org/armedbear/lisp/FloatingPointInexact.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class FloatingPointInexact extends ArithmeticError
 {

trunk/abcl/src/org/armedbear/lisp/FloatingPointInvalidOperation.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class FloatingPointInvalidOperation extends ArithmeticError
 {

trunk/abcl/src/org/armedbear/lisp/FloatingPointOverflow.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class FloatingPointOverflow extends ArithmeticError
 {

trunk/abcl/src/org/armedbear/lisp/FloatingPointUnderflow.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class FloatingPointUnderflow extends ArithmeticError
 {

trunk/abcl/src/org/armedbear/lisp/ForwardReferencedClass.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class ForwardReferencedClass extends LispClass

trunk/abcl/src/org/armedbear/lisp/Function.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class Function extends Operator

trunk/abcl/src/org/armedbear/lisp/GenericFunction.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public abstract class GenericFunction extends StandardObject
 {

trunk/abcl/src/org/armedbear/lisp/HashTable.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class HashTable extends LispObject

trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.java

@@ -34 +34 @@
 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 =

trunk/abcl/src/org/armedbear/lisp/IllegalMonitorState.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class IllegalMonitorState extends ProgramError
 {

trunk/abcl/src/org/armedbear/lisp/Interpreter.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.BufferedReader;
 import java.io.File;
@@ -41 +43 @@
 import java.io.OutputStream;
 
-public final class Interpreter extends Lisp
+public final class Interpreter extends LispTrampolinesFile
 {
     // There can only be one interpreter.
@@ -154 +156 @@
     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()));
     }
@@ -335 +337 @@
                     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());
@@ -539 +541 @@
         thread.bindSpecial(Symbol.DEBUGGER_HOOK, _DEBUGGER_HOOK_FUNCTION);
         try {
-            return eval(obj, new Environment(), thread);
+            return Lisp.eval(obj, new Environment(), thread);
         }
         finally {

trunk/abcl/src/org/armedbear/lisp/JHandler.java

@@ -34 +34 @@
 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 =
@@ -81 +83 @@
                 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);
             }

trunk/abcl/src/org/armedbear/lisp/JProxy.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -41 +43 @@
 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>();

trunk/abcl/src/org/armedbear/lisp/Java.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -47 +49 @@
 import java.util.Map;
 
-public final class Java extends Lisp
+public final class Java extends LispTrampolinesFile
 {
     private static final Map<Class,Symbol> registeredExceptions =

trunk/abcl/src/org/armedbear/lisp/JavaClass.java

@@ -21 +21 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.util.HashMap;

trunk/abcl/src/org/armedbear/lisp/JavaException.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.PrintWriter;

trunk/abcl/src/org/armedbear/lisp/JavaObject.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.lang.reflect.*;

trunk/abcl/src/org/armedbear/lisp/JavaStackFrame.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class JavaStackFrame 
@@ -70 +72 @@
    }
 
-  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()

trunk/abcl/src/org/armedbear/lisp/Keyword.java

@@ -34 +34 @@
 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

trunk/abcl/src/org/armedbear/lisp/Layout.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class Layout extends LispObject

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -47 +47 @@
 import java.util.zip.ZipFile;
 
-public abstract class Lisp
+public final class Lisp
 {
   public static final boolean debug = true;
@@ -381 +381 @@
   }
 
-  protected static volatile boolean interrupted;
+  public static volatile boolean interrupted;
 
   public static synchronized final void setInterrupted(boolean b)
@@ -491 +491 @@
 
   // Also used in JProxy.java.
-  protected static final LispObject evalCall(LispObject function,
+  public static final LispObject evalCall(LispObject function,
                                              LispObject args,
                                              Environment env,
@@ -819 +819 @@
   }
 
-  protected static final void bindArg(LispObject ownSpecials,
+  public static final void bindArg(LispObject ownSpecials,
                                       Symbol sym, LispObject value,
                                       Environment env, LispThread thread)
@@ -1835 +1835 @@
   }
 
-  public LispObject assq(LispObject item, LispObject alist)
+  public static LispObject assq(LispObject item, LispObject alist)
 
   {

trunk/abcl/src/org/armedbear/lisp/LispCharacter.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 import java.util.HashMap;
 import java.util.Map;

trunk/abcl/src/org/armedbear/lisp/LispClass.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public abstract class LispClass extends StandardObject
 {

trunk/abcl/src/org/armedbear/lisp/LispError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class LispError extends SeriousCondition

trunk/abcl/src/org/armedbear/lisp/LispObject.java

@@ -34 +34 @@
 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()

trunk/abcl/src/org/armedbear/lisp/LispReader.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class LispReader extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class LispReader extends LispTrampolinesFile
 {
     // ### read-comment

trunk/abcl/src/org/armedbear/lisp/LispStackFrame.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class LispStackFrame 

trunk/abcl/src/org/armedbear/lisp/LispThread.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
@@ -1097 +1099 @@
         //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));
     }
 

trunk/abcl/src/org/armedbear/lisp/Load.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -65 +67 @@
  */
 
-public final class Load extends Lisp
+public final class Load extends LispTrampolinesFile
 {
     public static final LispObject load(String filename)

trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.util.HashMap;

trunk/abcl/src/org/armedbear/lisp/MacroObject.java

@@ -34 +34 @@
 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;
 

trunk/abcl/src/org/armedbear/lisp/MathFunctions.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class MathFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class MathFunctions extends LispTrampolinesFile
 {
     // ### sin

trunk/abcl/src/org/armedbear/lisp/Nil.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class Nil extends Symbol
 {

trunk/abcl/src/org/armedbear/lisp/NilVector.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class NilVector extends AbstractString
 {

trunk/abcl/src/org/armedbear/lisp/Operator.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class Operator extends LispObject

trunk/abcl/src/org/armedbear/lisp/Package.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.util.ArrayList;
 import java.util.HashMap;

trunk/abcl/src/org/armedbear/lisp/PackageError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class PackageError extends LispError

trunk/abcl/src/org/armedbear/lisp/PackageFunctions.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class PackageFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class PackageFunctions extends LispTrampolinesFile
 {
     // ### packagep

trunk/abcl/src/org/armedbear/lisp/Packages.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -39 +41 @@
 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>();

trunk/abcl/src/org/armedbear/lisp/ParseError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ParseError extends LispError

trunk/abcl/src/org/armedbear/lisp/Pathname.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.File;

trunk/abcl/src/org/armedbear/lisp/Primitives.java

@@ -34 +34 @@
 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
 {
   // ### *

trunk/abcl/src/org/armedbear/lisp/PrintNotReadable.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class PrintNotReadable extends LispError

trunk/abcl/src/org/armedbear/lisp/Profiler.java

@@ -34 +34 @@
 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;

trunk/abcl/src/org/armedbear/lisp/ProgramError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class ProgramError extends LispError

trunk/abcl/src/org/armedbear/lisp/RandomState.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.File;

trunk/abcl/src/org/armedbear/lisp/Ratio.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/ReaderError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ReaderError extends StreamError

trunk/abcl/src/org/armedbear/lisp/ReaderMacroFunction.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public abstract class ReaderMacroFunction extends Function

trunk/abcl/src/org/armedbear/lisp/Readtable.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 import java.util.Iterator;
 

trunk/abcl/src/org/armedbear/lisp/RuntimeClass.java

@@ -34 +34 @@
 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>();

trunk/abcl/src/org/armedbear/lisp/SeriousCondition.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class SeriousCondition extends Condition

trunk/abcl/src/org/armedbear/lisp/ShellCommand.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -41 +43 @@
 import java.util.List;
 
-public final class ShellCommand extends Lisp implements Runnable
+public final class ShellCommand extends LispTrampolinesFile implements Runnable
 {
     private final String command;

trunk/abcl/src/org/armedbear/lisp/SimpleArray_T.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class SimpleArray_T extends AbstractArray
 {

trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class SimpleArray_UnsignedByte16 extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class SimpleArray_UnsignedByte32 extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte8.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class SimpleArray_UnsignedByte8 extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java

@@ -34 +34 @@
 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-

trunk/abcl/src/org/armedbear/lisp/SimpleCondition.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class SimpleCondition extends Condition

trunk/abcl/src/org/armedbear/lisp/SimpleError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class SimpleError extends LispError

trunk/abcl/src/org/armedbear/lisp/SimpleString.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class SimpleString extends AbstractString
 {

trunk/abcl/src/org/armedbear/lisp/SimpleTypeError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class SimpleTypeError extends TypeError

trunk/abcl/src/org/armedbear/lisp/SimpleVector.java

@@ -34 +34 @@
 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

trunk/abcl/src/org/armedbear/lisp/SimpleWarning.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class SimpleWarning extends Warning

trunk/abcl/src/org/armedbear/lisp/SingleFloat.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.math.BigInteger;
 

trunk/abcl/src/org/armedbear/lisp/Site.java

@@ -34 +34 @@
 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;

trunk/abcl/src/org/armedbear/lisp/SiteName.java

@@ -34 +34 @@
 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()

trunk/abcl/src/org/armedbear/lisp/SlimeInputStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class SlimeInputStream extends Stream

trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.StringWriter;

trunk/abcl/src/org/armedbear/lisp/SlotClass.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class SlotClass extends LispClass

trunk/abcl/src/org/armedbear/lisp/SlotDefinition.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class SlotDefinition extends StandardObject
 {

trunk/abcl/src/org/armedbear/lisp/SlotDefinitionClass.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class SlotDefinitionClass extends StandardClass
 {

trunk/abcl/src/org/armedbear/lisp/SocketStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.net.Socket;

trunk/abcl/src/org/armedbear/lisp/SpecialOperator.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class SpecialOperator extends Operator

trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java

@@ -34 +34 @@
 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
@@ -503 +505 @@
 
       {
-        LispObject value = Symbol.NIL;
+        LispObject value = Nil.NIL;
         final LispThread thread = LispThread.currentThread();
         while (args != NIL)

trunk/abcl/src/org/armedbear/lisp/StackFrame.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public abstract class StackFrame 
   extends LispObject

trunk/abcl/src/org/armedbear/lisp/StandardClass.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class StandardClass extends SlotClass

trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.util.HashMap;
 

trunk/abcl/src/org/armedbear/lisp/StandardGenericFunctionClass.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class StandardGenericFunctionClass extends StandardClass

trunk/abcl/src/org/armedbear/lisp/StandardMethod.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class StandardMethod extends StandardObject

trunk/abcl/src/org/armedbear/lisp/StandardMethodClass.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class StandardMethodClass extends StandardClass
 {

trunk/abcl/src/org/armedbear/lisp/StandardObject.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public class StandardObject extends LispObject
 {

trunk/abcl/src/org/armedbear/lisp/StandardObjectFunctions.java

@@ -34 +34 @@
 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

trunk/abcl/src/org/armedbear/lisp/StandardReaderMethod.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class StandardReaderMethod extends StandardMethod

trunk/abcl/src/org/armedbear/lisp/StandardReaderMethodClass.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class StandardReaderMethodClass extends StandardClass

trunk/abcl/src/org/armedbear/lisp/StorageCondition.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class StorageCondition extends SeriousCondition

trunk/abcl/src/org/armedbear/lisp/Stream.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -91 +93 @@
   }
 
-  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 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 keywordCodePage = internKeyword("CODE-PAGE");
+  static final private Symbol keywordID = internKeyword("ID");
+
+  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;
@@ -106 +108 @@
   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;
@@ -291 +293 @@
             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;

trunk/abcl/src/org/armedbear/lisp/StreamError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class StreamError extends LispError

trunk/abcl/src/org/armedbear/lisp/StringFunctions.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class StringFunctions extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class StringFunctions extends LispTrampolinesFile
 {
     // ### %string=

trunk/abcl/src/org/armedbear/lisp/StringInputStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.StringReader;

trunk/abcl/src/org/armedbear/lisp/StringOutputStream.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.StringWriter;

trunk/abcl/src/org/armedbear/lisp/StructureClass.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class StructureClass extends SlotClass

trunk/abcl/src/org/armedbear/lisp/StructureObject.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class StructureObject extends LispObject

trunk/abcl/src/org/armedbear/lisp/StyleWarning.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class StyleWarning extends Warning
 {

trunk/abcl/src/org/armedbear/lisp/Symbol.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class Symbol extends LispObject

trunk/abcl/src/org/armedbear/lisp/SynonymStream.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class SynonymStream extends Stream
 {

trunk/abcl/src/org/armedbear/lisp/Time.java

@@ -34 +34 @@
 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
 {
 

trunk/abcl/src/org/armedbear/lisp/TwoWayStream.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public class TwoWayStream extends Stream
 {

trunk/abcl/src/org/armedbear/lisp/TypeError.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public class TypeError extends LispError

trunk/abcl/src/org/armedbear/lisp/UnboundSlot.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class UnboundSlot extends CellError

trunk/abcl/src/org/armedbear/lisp/UnboundVariable.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class UnboundVariable extends CellError

trunk/abcl/src/org/armedbear/lisp/UndefinedFunction.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class UndefinedFunction extends CellError

trunk/abcl/src/org/armedbear/lisp/Utilities.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -43 +45 @@
 import java.util.zip.ZipInputStream;
 
-public final class Utilities extends Lisp
+public final class Utilities extends LispTrampolinesFile
 {
     public static final boolean isPlatformUnix;

trunk/abcl/src/org/armedbear/lisp/Warning.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public class Warning extends Condition
 {

trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class WrongNumberOfArgumentsException extends ProgramError
 {

trunk/abcl/src/org/armedbear/lisp/ZeroRankArray.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class ZeroRankArray extends AbstractArray

trunk/abcl/src/org/armedbear/lisp/adjust_array.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### %adjust-array array new-dimensions element-type initial-element

trunk/abcl/src/org/armedbear/lisp/arglist.java

@@ -34 +34 @@
 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)

trunk/abcl/src/org/armedbear/lisp/assq.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### assq item alist => entry
 public final class assq extends Primitive
@@ -46 +48 @@
 
     {
-        return assq(item, alist);
+        return Lisp.assq(item, alist);
     }
 

trunk/abcl/src/org/armedbear/lisp/assql.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### assql item alist => entry
 public final class assql extends Primitive

trunk/abcl/src/org/armedbear/lisp/cell_error_name.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### cell-error-name
 public final class cell_error_name extends Primitive

trunk/abcl/src/org/armedbear/lisp/copy_list.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### copy-list list => copy
 public final class copy_list extends Primitive

trunk/abcl/src/org/armedbear/lisp/create_new_file.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.File;
 import java.io.IOException;

trunk/abcl/src/org/armedbear/lisp/cxr.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public final class cxr extends Lisp
+import static org.armedbear.lisp.Lisp.*;
+
+public final class cxr extends LispTrampolinesFile
 {
   // ### set-car

trunk/abcl/src/org/armedbear/lisp/delete_file.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.File;

trunk/abcl/src/org/armedbear/lisp/disassemble_class_bytes.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.File;

trunk/abcl/src/org/armedbear/lisp/dolist.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### dolist

trunk/abcl/src/org/armedbear/lisp/dotimes.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class dotimes extends SpecialOperator

trunk/abcl/src/org/armedbear/lisp/file_author.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.File;
 

trunk/abcl/src/org/armedbear/lisp/file_error_pathname.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### file-error-pathname
 public final class file_error_pathname extends Primitive

trunk/abcl/src/org/armedbear/lisp/file_length.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 public final class file_length extends Primitive
 {

trunk/abcl/src/org/armedbear/lisp/file_string_length.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### file-string-length
 public final class file_string_length extends Primitive

trunk/abcl/src/org/armedbear/lisp/file_write_date.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.io.File;
 

trunk/abcl/src/org/armedbear/lisp/float_sign.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### float-sign

trunk/abcl/src/org/armedbear/lisp/function_info.java

@@ -34 +34 @@
 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 =

trunk/abcl/src/org/armedbear/lisp/gc.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### gc

trunk/abcl/src/org/armedbear/lisp/get_properties.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### get-properties

trunk/abcl/src/org/armedbear/lisp/input_stream_p.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### input-stream-p
 public final class input_stream_p extends Primitive

trunk/abcl/src/org/armedbear/lisp/interactive_stream_p.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### interactive-stream-p
 public final class interactive_stream_p extends Primitive

trunk/abcl/src/org/armedbear/lisp/jclass_name.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### jclass-name class-ref &optional name

trunk/abcl/src/org/armedbear/lisp/jclass_of.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### jclass-of object &optional name

trunk/abcl/src/org/armedbear/lisp/jmethod_return_type.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.lang.reflect.Method;
 

trunk/abcl/src/org/armedbear/lisp/last.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### last list &optional n => tail

trunk/abcl/src/org/armedbear/lisp/listen.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### listen
 public final class listen extends Primitive

trunk/abcl/src/org/armedbear/lisp/logand.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logandc1.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logandc2.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logbitp.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logcount.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.math.BigInteger;
 

trunk/abcl/src/org/armedbear/lisp/logeqv.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logior.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### logior &rest integers => result-integer

trunk/abcl/src/org/armedbear/lisp/lognand.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/lognor.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logorc1.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logorc2.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logtest.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.math.BigInteger;

trunk/abcl/src/org/armedbear/lisp/logxor.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### logxor &rest integers => result-integer

trunk/abcl/src/org/armedbear/lisp/machine_version.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.BufferedReader;

trunk/abcl/src/org/armedbear/lisp/make_array.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### %make-array dimensions element-type initial-element initial-element-p

trunk/abcl/src/org/armedbear/lisp/make_condition.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 public final class make_condition extends Primitive

trunk/abcl/src/org/armedbear/lisp/make_server_socket.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.net.ServerSocket;
 

trunk/abcl/src/org/armedbear/lisp/make_socket.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.net.Socket;
 

trunk/abcl/src/org/armedbear/lisp/open_stream_p.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### open-stream-p
 public final class open_stream_p extends Primitive

trunk/abcl/src/org/armedbear/lisp/output_stream_p.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### output-stream-p
 public final class output_stream_p extends Primitive

trunk/abcl/src/org/armedbear/lisp/package_error_package.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### package-error-package
 public final class package_error_package extends Primitive

trunk/abcl/src/org/armedbear/lisp/peek_char.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### peek-char

trunk/abcl/src/org/armedbear/lisp/probe_file.java

@@ -34 +34 @@
 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

trunk/abcl/src/org/armedbear/lisp/room.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 // ### room

trunk/abcl/src/org/armedbear/lisp/server_socket_close.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.net.ServerSocket;
 

trunk/abcl/src/org/armedbear/lisp/simple_list_remove_duplicates.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### simple-list-remove-duplicates
 public final class simple_list_remove_duplicates extends Primitive

trunk/abcl/src/org/armedbear/lisp/socket_accept.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.net.ServerSocket;
 import java.net.Socket;

trunk/abcl/src/org/armedbear/lisp/socket_close.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.net.Socket;
 

trunk/abcl/src/org/armedbear/lisp/socket_stream.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 import java.net.Socket;
 

trunk/abcl/src/org/armedbear/lisp/stream_element_type.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### stream-element-type
 public final class stream_element_type extends Primitive

trunk/abcl/src/org/armedbear/lisp/stream_external_format.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### stream-external-format
 public final class stream_external_format extends Primitive

trunk/abcl/src/org/armedbear/lisp/unbound_slot_instance.java

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import static org.armedbear.lisp.Lisp.*;
+
 // ### unbound-slot-instance
 public final class unbound_slot_instance extends Primitive

trunk/abcl/src/org/armedbear/lisp/zip.java

@@ -33 +33 @@
 
 package org.armedbear.lisp;
+
+import static org.armedbear.lisp.Lisp.*;
 
 import java.io.File;