[armedbear-cvs] r12513 - in trunk/abcl/src/org/armedbear/lisp: . java java/awt java/swing scripting util
Erik Huelsmann
ehuelsmann at common-lisp.net
Tue Mar 2 22:35:39 UTC 2010
Author: ehuelsmann
Date: Tue Mar 2 17:35:36 2010
New Revision: 12513
Log:
Remove 'private' keyword to eliminate the Java requirement
for the compiler to generate synthetic accessors: functions that
don't appear in the source but do appear in the class file.
Patch by: Douglas Miles <dmiles _at_ users.sf.net>
Modified:
trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java
trunk/abcl/src/org/armedbear/lisp/AutoloadMacro.java
trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java
trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java
trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java
trunk/abcl/src/org/armedbear/lisp/Closure.java
trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java
trunk/abcl/src/org/armedbear/lisp/Do.java
trunk/abcl/src/org/armedbear/lisp/Environment.java
trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java
trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java
trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.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/JavaObject.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/LispThread.java
trunk/abcl/src/org/armedbear/lisp/Load.java
trunk/abcl/src/org/armedbear/lisp/MathFunctions.java
trunk/abcl/src/org/armedbear/lisp/Pathname.java
trunk/abcl/src/org/armedbear/lisp/Primitives.java
trunk/abcl/src/org/armedbear/lisp/Profiler.java
trunk/abcl/src/org/armedbear/lisp/Readtable.java
trunk/abcl/src/org/armedbear/lisp/RuntimeClass.java
trunk/abcl/src/org/armedbear/lisp/ShellCommand.java
trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java
trunk/abcl/src/org/armedbear/lisp/SimpleVector.java
trunk/abcl/src/org/armedbear/lisp/SiteName.java
trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java
trunk/abcl/src/org/armedbear/lisp/SlotClass.java
trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java
trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java
trunk/abcl/src/org/armedbear/lisp/StandardObject.java
trunk/abcl/src/org/armedbear/lisp/Stream.java
trunk/abcl/src/org/armedbear/lisp/StringFunctions.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/SynonymStream.java
trunk/abcl/src/org/armedbear/lisp/arglist.java
trunk/abcl/src/org/armedbear/lisp/function_info.java
trunk/abcl/src/org/armedbear/lisp/java/DialogPromptStream.java
trunk/abcl/src/org/armedbear/lisp/java/awt/AwtDialogPromptStream.java
trunk/abcl/src/org/armedbear/lisp/java/swing/SwingDialogPromptStream.java
trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java
trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java
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 Tue Mar 2 17:35:36 2010
@@ -100,7 +100,7 @@
return super.typep(type);
}
- private final LispObject getOperation()
+ final LispObject getOperation()
{
return getInstanceSlotValue(Symbol.OPERATION);
}
@@ -111,7 +111,7 @@
setInstanceSlotValue(Symbol.OPERATION, operation);
}
- private final LispObject getOperands()
+ final LispObject getOperands()
{
return getInstanceSlotValue(Symbol.OPERANDS);
}
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 Tue Mar 2 17:35:36 2010
@@ -47,7 +47,7 @@
super(symbol, fileName, null);
}
- private static void installAutoloadMacro(Symbol symbol, String fileName)
+ static void installAutoloadMacro(Symbol symbol, String fileName)
{
AutoloadMacro am = new AutoloadMacro(symbol, fileName);
Modified: trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java Tue Mar 2 17:35:36 2010
@@ -46,7 +46,7 @@
/** List of symbols that need to be saved upon instantiation of a
* proxy and restored while loading the actual function.
*/
- final static private Symbol[] symsToSave =
+ final static Symbol[] symsToSave =
new Symbol[]
{
AUTOLOADING_CACHE, // allow loading local preloaded functions
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 Tue Mar 2 17:35:36 2010
@@ -37,9 +37,9 @@
public final class BroadcastStream extends Stream
{
- private final Stream[] streams;
+ final Stream[] streams;
- private BroadcastStream(Stream[] streams)
+ BroadcastStream(Stream[] streams)
{
super(Symbol.BROADCAST_STREAM);
this.streams = streams;
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 Tue Mar 2 17:35:36 2010
@@ -44,7 +44,7 @@
this(UNSIGNED_BYTE_8); //Declared in Stream.java
}
- private ByteArrayOutputStream(LispObject elementType)
+ ByteArrayOutputStream(LispObject elementType)
{
super(Symbol.SYSTEM_STREAM);
this.elementType = elementType;
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 Tue Mar 2 17:35:36 2010
@@ -1026,12 +1026,12 @@
public static class Parameter
{
- private final Symbol var;
- private final LispObject initForm;
- private final LispObject initVal;
- private final LispObject svar;
+ final Symbol var;
+ final LispObject initForm;
+ final LispObject initVal;
+ final LispObject svar;
private final int type;
- private final Symbol keyword;
+ final Symbol keyword;
public Parameter(Symbol var)
{
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 Tue Mar 2 17:35:36 2010
@@ -37,9 +37,9 @@
public final class ConcatenatedStream extends Stream
{
- private LispObject streams;
+ LispObject streams;
- private ConcatenatedStream(LispObject streams)
+ ConcatenatedStream(LispObject streams)
{
super(Symbol.CONCATENATED_STREAM);
this.streams = streams;
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 Tue Mar 2 17:35:36 2010
@@ -66,7 +66,7 @@
}
};
- private static final LispObject _do(LispObject args, Environment env,
+ static final LispObject _do(LispObject args, Environment env,
boolean sequential)
{
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 Tue Mar 2 17:35:36 2010
@@ -37,8 +37,8 @@
public final class Environment extends LispObject
{
- private Binding vars;
- private FunctionBinding lastFunctionBinding;
+ Binding vars;
+ FunctionBinding lastFunctionBinding;
private Binding blocks;
private Binding tags;
public boolean inactive; //default value: false == active
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 Tue Mar 2 17:35:36 2010
@@ -37,9 +37,9 @@
public final class FillPointerOutputStream extends Stream
{
- private ComplexString string;
+ ComplexString string;
- private FillPointerOutputStream(ComplexString string)
+ FillPointerOutputStream(ComplexString string)
{
super(Symbol.SYSTEM_STREAM);
elementType = Symbol.CHARACTER;
@@ -69,7 +69,7 @@
}
};
- private class Writer extends java.io.Writer
+ class Writer extends java.io.Writer
{
@Override
public void write(char cbuf[], int off, int len)
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 Tue Mar 2 17:35:36 2010
@@ -198,8 +198,8 @@
}
};
- private static final Fixnum FIXNUM_24 = Fixnum.getInstance(24);
- private static final Fixnum FIXNUM_53 = Fixnum.getInstance(53);
+ static final Fixnum FIXNUM_24 = Fixnum.getInstance(24);
+ static final Fixnum FIXNUM_53 = Fixnum.getInstance(53);
// ### float-digits
// float-digits float => float-digits
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 Tue Mar 2 17:35:36 2010
@@ -37,13 +37,13 @@
public final class HashTableFunctions
{
- private static final LispObject FUNCTION_EQ =
+ static final LispObject FUNCTION_EQ =
Symbol.EQ.getSymbolFunction();
- private static final LispObject FUNCTION_EQL =
+ static final LispObject FUNCTION_EQL =
Symbol.EQL.getSymbolFunction();
- private static final LispObject FUNCTION_EQUAL =
+ static final LispObject FUNCTION_EQUAL =
Symbol.EQUAL.getSymbolFunction();
- private static final LispObject FUNCTION_EQUALP =
+ static final LispObject FUNCTION_EQUALP =
Symbol.EQUALP.getSymbolFunction();
// ### %make-hash-table
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 Tue Mar 2 17:35:36 2010
@@ -41,7 +41,7 @@
public final class JHandler
{
- private static final Map<Object,Map<String,Entry>> table =
+ static final Map<Object,Map<String,Entry>> table =
new WeakHashMap<Object,Map<String,Entry>>();
public static void callLisp (String s, Object o)
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 Tue Mar 2 17:35:36 2010
@@ -44,7 +44,7 @@
public final class JProxy
{
- private static final Map<Object,Entry> table = new WeakHashMap<Object,Entry>();
+ static final Map<Object,Entry> table = new WeakHashMap<Object,Entry>();
// ### %jnew-proxy interface &rest method-names-and-defs
private static final Primitive _JNEW_PROXY =
@@ -135,7 +135,7 @@
/**
* A weak map associating each proxy instance with a "Lisp-this" object.
*/
- private static final Map<Object, LispObject> proxyMap = new WeakHashMap<Object, LispObject>();
+ static final Map<Object, LispObject> proxyMap = new WeakHashMap<Object, LispObject>();
public static class LispInvocationHandler implements InvocationHandler {
@@ -238,7 +238,7 @@
}
};
- private static LispObject toLispObject(Object obj) {
+ static LispObject toLispObject(Object obj) {
return (obj instanceof LispObject) ? (LispObject) obj : new JavaObject(obj);
}
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 Tue Mar 2 17:35:36 2010
@@ -49,12 +49,12 @@
public final class Java
{
- private static final Map<Class,Symbol> registeredExceptions =
+ static final Map<Class,Symbol> registeredExceptions =
new HashMap<Class,Symbol>();
private static final LispClass java_exception = LispClass.findClass(Symbol.JAVA_EXCEPTION);
- private static boolean isJavaException(LispClass lc)
+ static boolean isJavaException(LispClass lc)
{
return lc.subclassp(java_exception);
}
@@ -93,7 +93,7 @@
}
};
- private static Symbol getCondition(Class cl)
+ static Symbol getCondition(Class cl)
{
Class o = classForName("java.lang.Object");
for (Class c = cl ; c != o ; c = c.getSuperclass()) {
@@ -146,7 +146,7 @@
// derived from the instance.
//
- private static final LispObject jfield(Primitive fun, LispObject[] args, boolean translate)
+ static final LispObject jfield(Primitive fun, LispObject[] args, boolean translate)
{
if (args.length < 2 || args.length > 4)
@@ -347,7 +347,7 @@
}
};
- private static final LispObject jstatic(Primitive fun, LispObject[] args, boolean translate)
+ static final LispObject jstatic(Primitive fun, LispObject[] args, boolean translate)
{
if (args.length < 2)
@@ -511,7 +511,7 @@
}
};
- private static final LispObject jarray_ref(Primitive fun, LispObject[] args, boolean translate)
+ static final LispObject jarray_ref(Primitive fun, LispObject[] args, boolean translate)
{
if (args.length < 2)
@@ -623,7 +623,7 @@
}
};
- private static LispObject jcall(Primitive fun, LispObject[] args, boolean translate)
+ static LispObject jcall(Primitive fun, LispObject[] args, boolean translate)
{
if (args.length < 2)
@@ -764,7 +764,7 @@
return findMethod(methods, methodName, javaArgs);
}
- private static Constructor findConstructor(Class<?> c, LispObject[] args) throws NoSuchMethodException {
+ static Constructor findConstructor(Class<?> c, LispObject[] args) throws NoSuchMethodException {
int argCount = args.length - 1;
Object[] javaArgs = translateMethodArguments(args, 1);
Constructor[] ctors = c.getConstructors();
@@ -1015,7 +1015,7 @@
}
};
- private static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws IntrospectionException {
+ static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws IntrospectionException {
String prop = ((AbstractString) propertyName).getStringValue();
BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
for(PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {
@@ -1028,7 +1028,7 @@
return null; // not reached
}
- private static Class classForName(String className)
+ static Class classForName(String className)
{
try {
return Class.forName(className);
@@ -1046,7 +1046,7 @@
}
// Supports Java primitive types too.
- private static Class javaClass(LispObject obj)
+ static Class javaClass(LispObject obj)
{
if (obj instanceof AbstractString || obj instanceof Symbol) {
String s = javaString(obj);
@@ -1092,7 +1092,7 @@
return null;
}
- private static final String getMessage(Throwable t)
+ static final String getMessage(Throwable t)
{
String message = t.getMessage();
if (message == null || message.length() == 0)
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 Tue Mar 2 17:35:36 2010
@@ -42,7 +42,7 @@
import java.util.*;
public final class JavaObject extends LispObject {
- private final Object obj;
+ final Object obj;
private final Class<?> intendedClass;
public JavaObject(Object obj) {
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 Tue Mar 2 17:35:36 2010
@@ -40,8 +40,8 @@
private final LispClass lispClass;
public final EqHashTable slotTable;
- private final LispObject[] slotNames;
- private final LispObject sharedSlots;
+ final LispObject[] slotNames;
+ final LispObject sharedSlots;
private boolean invalid;
@@ -74,7 +74,7 @@
}
// Copy constructor.
- private Layout(Layout oldLayout)
+ Layout(Layout oldLayout)
{
lispClass = oldLayout.getLispClass();
slotNames = oldLayout.slotNames;
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 Tue Mar 2 17:35:36 2010
@@ -2028,7 +2028,7 @@
}
// The compiler's object table.
- private static final Hashtable<String,LispObject> objectTable =
+ static final Hashtable<String,LispObject> objectTable =
new Hashtable<String,LispObject>();
public static final LispObject recall(String key)
@@ -2620,7 +2620,7 @@
exportSpecial("*COMPILE-FILE-ENVIRONMENT*", PACKAGE_SYS, NIL);
public static final LispObject UNBOUND_VALUE = new unboundValue();
- private static class unboundValue extends LispObject
+ static class unboundValue extends LispObject
{
@Override
public String writeToString()
@@ -2630,7 +2630,7 @@
}
public static final LispObject NULL_VALUE = new nullValue();
- private static class nullValue extends LispObject
+ static class nullValue extends LispObject
{
@Override
public String writeToString()
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 Tue Mar 2 17:35:36 2010
@@ -129,7 +129,7 @@
return new SimpleString(value);
}
- private boolean isStandardChar()
+ boolean isStandardChar()
{
if (value >= ' ' && value < 127)
return true;
@@ -682,7 +682,7 @@
}
}
- private static final char[] UPPER_CASE_CHARS = new char[128];
+ static final char[] UPPER_CASE_CHARS = new char[128];
static
{
@@ -697,7 +697,7 @@
return Character.toLowerCase(c);
}
- private static final char[] LOWER_CASE_CHARS = new char[128];
+ static final char[] LOWER_CASE_CHARS = new char[128];
static
{
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 Tue Mar 2 17:35:36 2010
@@ -41,11 +41,11 @@
public final class LispThread extends LispObject
{
- private static boolean use_fast_calls = false;
+ static boolean use_fast_calls = false;
// use a concurrent hashmap: we may want to add threads
// while at the same time iterating the hash
- final private static ConcurrentHashMap<Thread,LispThread> map =
+ final static ConcurrentHashMap<Thread,LispThread> map =
new ConcurrentHashMap<Thread,LispThread>();
private static ThreadLocal<LispThread> threads = new ThreadLocal<LispThread>(){
@@ -66,20 +66,20 @@
return threads.get();
}
- private final Thread javaThread;
+ final Thread javaThread;
private boolean destroyed;
- private final LispObject name;
+ final LispObject name;
public LispObject[] _values;
private boolean threadInterrupted;
private LispObject pending = NIL;
- private LispThread(Thread javaThread)
+ LispThread(Thread javaThread)
{
this.javaThread = javaThread;
name = new SimpleString(javaThread.getName());
}
- private LispThread(final Function fun, LispObject name)
+ LispThread(final Function fun, LispObject name)
{
Runnable r = new Runnable() {
public void run()
@@ -141,17 +141,17 @@
return destroyed;
}
- private final synchronized boolean isInterrupted()
+ final synchronized boolean isInterrupted()
{
return threadInterrupted;
}
- private final synchronized void setDestroyed(boolean b)
+ final synchronized void setDestroyed(boolean b)
{
destroyed = b;
}
- private final synchronized void interrupt(LispObject function, LispObject args)
+ final synchronized void interrupt(LispObject function, LispObject args)
{
pending = new Cons(args, pending);
pending = new Cons(function, pending);
@@ -159,7 +159,7 @@
javaThread.interrupt();
}
- private final synchronized void processThreadInterrupts()
+ final synchronized void processThreadInterrupts()
{
while (pending != NIL) {
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 Tue Mar 2 17:35:36 2010
@@ -324,7 +324,7 @@
// ### *fasl-version*
// internal symbol
- private static final Symbol _FASL_VERSION_ =
+ static final Symbol _FASL_VERSION_ =
exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(35));
// ### *fasl-external-format*
@@ -530,7 +530,7 @@
}
}
- private static final LispObject faslLoadStream(LispThread thread)
+ static final LispObject faslLoadStream(LispThread thread)
{
Stream in = (Stream) _LOAD_STREAM_.symbolValue(thread);
final Environment env = new Environment();
@@ -589,7 +589,7 @@
}
}
- private static final LispObject load(LispObject filespec,
+ static final LispObject load(LispObject filespec,
LispObject verbose,
LispObject print,
LispObject ifDoesNotExist,
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 Tue Mar 2 17:35:36 2010
@@ -47,7 +47,7 @@
}
};
- private static LispObject sin(LispObject arg)
+ static LispObject sin(LispObject arg)
{
if (arg instanceof DoubleFloat)
return new DoubleFloat(Math.sin(((DoubleFloat)arg).value));
@@ -74,7 +74,7 @@
}
};
- private static LispObject cos(LispObject arg)
+ static LispObject cos(LispObject arg)
{
if (arg instanceof DoubleFloat)
return new DoubleFloat(Math.cos(((DoubleFloat)arg).value));
@@ -114,7 +114,7 @@
}
};
- private static LispObject asin(LispObject arg)
+ static LispObject asin(LispObject arg)
{
if (arg instanceof SingleFloat) {
float f = ((SingleFloat)arg).value;
@@ -155,7 +155,7 @@
}
};
- private static LispObject acos(LispObject arg)
+ static LispObject acos(LispObject arg)
{
if (arg instanceof DoubleFloat) {
double d = ((DoubleFloat)arg).value;
@@ -225,7 +225,7 @@
}
};
- private static LispObject atan(LispObject arg)
+ static LispObject atan(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).imagpart;
@@ -259,7 +259,7 @@
}
};
- private static LispObject sinh(LispObject arg)
+ static LispObject sinh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -297,7 +297,7 @@
}
};
- private static LispObject cosh(LispObject arg)
+ static LispObject cosh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -352,7 +352,7 @@
}
};
- private static LispObject asinh(LispObject arg)
+ static LispObject asinh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -385,7 +385,7 @@
}
};
- private static LispObject acosh(LispObject arg)
+ static LispObject acosh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -422,7 +422,7 @@
}
};
- private static LispObject atanh(LispObject arg)
+ static LispObject atanh(LispObject arg)
{
if (arg instanceof Complex) {
LispObject im = ((Complex)arg).getImaginaryPart();
@@ -454,7 +454,7 @@
}
};
- private static LispObject cis(LispObject arg)
+ static LispObject cis(LispObject arg)
{
if (arg.realp())
return Complex.getInstance(cos(arg), sin(arg));
@@ -471,7 +471,7 @@
}
};
- private static LispObject exp(LispObject arg)
+ static LispObject exp(LispObject arg)
{
if (arg.realp()) {
if (arg instanceof DoubleFloat) {
@@ -499,7 +499,7 @@
}
};
- private static final LispObject sqrt(LispObject obj)
+ static final LispObject sqrt(LispObject obj)
{
if (obj instanceof DoubleFloat) {
if (obj.minusp())
@@ -552,7 +552,7 @@
}
};
- private static final LispObject log(LispObject obj)
+ static final LispObject log(LispObject obj)
{
if (obj.realp() && !obj.minusp()) {
// Result is real.
@@ -706,7 +706,7 @@
* @param number
* @return number or signals an appropriate error
*/
- private final static LispObject OverUnderFlowCheck(LispObject number)
+ final static LispObject OverUnderFlowCheck(LispObject number)
{
if (number instanceof Complex) {
@@ -773,7 +773,7 @@
* @param base A value of any type
* @param power An integer (fixnum or bignum) value
*/
- private static final LispObject intexp(LispObject base, LispObject power)
+ static final LispObject intexp(LispObject base, LispObject power)
{
if (power.isEqualTo(0))
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 Tue Mar 2 17:35:36 2010
@@ -849,7 +849,7 @@
}
}
- private static final void checkCaseArgument(LispObject arg) {
+ static final void checkCaseArgument(LispObject arg) {
if (arg != Keyword.COMMON && arg != Keyword.LOCAL) {
type_error(arg, list(Symbol.MEMBER, Keyword.COMMON,
Keyword.LOCAL));
@@ -1029,7 +1029,7 @@
return new Pathname(namestring);
}
- private static final Pathname _makePathname(LispObject[] args) {
+ static final Pathname _makePathname(LispObject[] args) {
if (args.length % 2 != 0) {
error(new ProgramError("Odd number of keyword arguments."));
}
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 Tue Mar 2 17:35:36 2010
@@ -345,7 +345,7 @@
};
// ### eql
- private static final Primitive EQL = new pf_eql();
+ static final Primitive EQL = new pf_eql();
private static final class pf_eql extends Primitive {
pf_eql() {
super(Symbol.EQL, "x y");
@@ -1718,7 +1718,7 @@
private static final Symbol _SIMPLE_FORMAT_FUNCTION_ =
internSpecial("*SIMPLE-FORMAT-FUNCTION*", PACKAGE_SYS, _FORMAT);
- private static void checkRedefinition(LispObject arg)
+ static void checkRedefinition(LispObject arg)
{
final LispThread thread = LispThread.currentThread();
@@ -4312,7 +4312,7 @@
}
};
- private static final LispObject list_subseq(LispObject list, int start,
+ static final LispObject list_subseq(LispObject list, int start,
int end)
{
@@ -4521,7 +4521,7 @@
};
// ### list-delete-eq item list => result-list
- private static final Primitive LIST_DELETE_EQ = new pf_list_delete_eq();
+ static final Primitive LIST_DELETE_EQ = new pf_list_delete_eq();
private static final class pf_list_delete_eq extends Primitive {
pf_list_delete_eq() {
super("list-delete-eq", PACKAGE_SYS, true, "item list");
@@ -4565,7 +4565,7 @@
};
// ### list-delete-eql item list => result-list
- private static final Primitive LIST_DELETE_EQL = new pf_list_delete_eql();
+ static final Primitive LIST_DELETE_EQL = new pf_list_delete_eql();
private static final class pf_list_delete_eql extends Primitive {
pf_list_delete_eql() {
super("list-delete-eql", PACKAGE_SYS, true, "item list");
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 Tue Mar 2 17:35:36 2010
@@ -37,7 +37,7 @@
public class Profiler
{
- private static int sleep = 1;
+ static int sleep = 1;
// ### %start-profiler
// %start-profiler type granularity
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 Tue Mar 2 17:35:36 2010
@@ -135,7 +135,7 @@
}
// FIXME synchronization
- private static void copyReadtable(Readtable from, Readtable to)
+ static void copyReadtable(Readtable from, Readtable to)
{
Iterator<Character> charIterator = from.syntax.getCharIterator();
while (charIterator.hasNext()) {
@@ -252,7 +252,7 @@
return readerMacroFunctions.get(c);
}
- private LispObject getMacroCharacter(char c)
+ LispObject getMacroCharacter(char c)
{
LispObject function = getReaderMacroFunction(c);
LispObject non_terminating_p;
@@ -271,7 +271,7 @@
return LispThread.currentThread().setValues(function, non_terminating_p);
}
- private void makeDispatchMacroCharacter(char dispChar, LispObject non_terminating_p)
+ void makeDispatchMacroCharacter(char dispChar, LispObject non_terminating_p)
{
byte syntaxType;
if (non_terminating_p != NIL)
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 Tue Mar 2 17:35:36 2010
@@ -41,7 +41,7 @@
public class RuntimeClass
{
- private static Map<String,RuntimeClass> classes = new HashMap<String,RuntimeClass>();
+ static Map<String,RuntimeClass> classes = new HashMap<String,RuntimeClass>();
private Map<String,Function> methods = new HashMap<String,Function>();
@@ -144,7 +144,7 @@
return (Function) methods.get(methodName);
}
- private void addLispMethod(String methodName, Function def) {
+ void addLispMethod(String methodName, Function def) {
methods.put(methodName, def);
}
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 Tue Mar 2 17:35:36 2010
@@ -65,12 +65,12 @@
return (output != null) ? output.toString() : "";
}
- private final int exitValue()
+ final int exitValue()
{
return exitValue;
}
- private void processOutput(String s)
+ void processOutput(String s)
{
if (outputStream != null)
outputStream._writeString(s);
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 Tue Mar 2 17:35:36 2010
@@ -247,7 +247,7 @@
return new ComplexBitVector(newCapacity, displacedTo, displacement);
}
- private SimpleBitVector and(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector and(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -256,7 +256,7 @@
return result;
}
- private SimpleBitVector ior(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector ior(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -265,7 +265,7 @@
return result;
}
- private SimpleBitVector xor(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector xor(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -274,7 +274,7 @@
return result;
}
- private SimpleBitVector eqv(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector eqv(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -283,7 +283,7 @@
return result;
}
- private SimpleBitVector nand(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector nand(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -292,7 +292,7 @@
return result;
}
- private SimpleBitVector nor(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector nor(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -301,7 +301,7 @@
return result;
}
- private SimpleBitVector andc1(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector andc1(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -310,7 +310,7 @@
return result;
}
- private SimpleBitVector andc2(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector andc2(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -319,7 +319,7 @@
return result;
}
- private SimpleBitVector orc1(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector orc1(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
@@ -328,7 +328,7 @@
return result;
}
- private SimpleBitVector orc2(SimpleBitVector v, SimpleBitVector result)
+ SimpleBitVector orc2(SimpleBitVector v, SimpleBitVector result)
{
if (result == null)
result = new SimpleBitVector(capacity);
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 Tue Mar 2 17:35:36 2010
@@ -40,8 +40,8 @@
// type is a subtype of type SIMPLE-VECTOR."
public final class SimpleVector extends AbstractVector
{
- private int capacity;
- private LispObject[] data;
+ int capacity;
+ LispObject[] data;
public SimpleVector(int capacity)
{
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 Tue Mar 2 17:35:36 2010
@@ -40,7 +40,7 @@
public final class SiteName
{
- private static LispObject getHostName()
+ static LispObject getHostName()
{
String hostName = null;
InetAddress addr;
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 Tue Mar 2 17:35:36 2010
@@ -42,7 +42,7 @@
private final StringWriter stringWriter;
final Function f;
- private SlimeOutputStream(Function f)
+ SlimeOutputStream(Function f)
{
super(Symbol.SLIME_OUTPUT_STREAM);
this.elementType = Symbol.CHARACTER;
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 Tue Mar 2 17:35:36 2010
@@ -120,7 +120,7 @@
this.defaultInitargs = defaultInitargs;
}
- private LispObject computeDefaultInitargs()
+ LispObject computeDefaultInitargs()
{
LispObject result = NIL;
LispObject cpl = getCPL();
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 Tue Mar 2 17:35:36 2010
@@ -119,7 +119,7 @@
}
};
- private static final LispObject _let(LispObject args, Environment env,
+ static final LispObject _let(LispObject args, Environment env,
boolean sequential)
{
@@ -306,7 +306,7 @@
}
};
- private static final LispObject _flet(LispObject args, Environment env,
+ static final LispObject _flet(LispObject args, Environment env,
boolean recursive)
{
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 Tue Mar 2 17:35:36 2010
@@ -39,12 +39,12 @@
public final class StandardGenericFunction extends StandardObject
{
- private LispObject function;
+ LispObject function;
- private int numberOfRequiredArgs;
+ int numberOfRequiredArgs;
- private HashMap<CacheEntry,LispObject> cache;
- private HashMap<LispObject,LispObject> slotCache;
+ HashMap<CacheEntry,LispObject> cache;
+ HashMap<LispObject,LispObject> slotCache;
public StandardGenericFunction()
{
@@ -87,7 +87,7 @@
slots[StandardGenericFunctionClass.SLOT_INDEX_DOCUMENTATION] = NIL;
}
- private void finalizeInternal()
+ void finalizeInternal()
{
cache = null;
}
@@ -663,7 +663,7 @@
* { EqlSpecialization('SYMBOL), EqlSpecialization('SYMBOL) }.
* </pre>
*/
- private LispObject getArgSpecialization(LispObject arg)
+ LispObject getArgSpecialization(LispObject arg)
{
for (EqlSpecialization eqlSpecialization : eqlSpecializations)
{
@@ -766,7 +766,7 @@
}
}
- private EqlSpecialization eqlSpecializations[] = new EqlSpecialization[0];
+ EqlSpecialization eqlSpecializations[] = new EqlSpecialization[0];
// ### %init-eql-specializations
private static final Primitive _INIT_EQL_SPECIALIZATIONS
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 Tue Mar 2 17:35:36 2010
@@ -179,7 +179,7 @@
return unreadableString(typeOf().writeToString());
}
- private Layout updateLayout()
+ Layout updateLayout()
{
Debug.assertTrue(layout.isInvalid());
Layout oldLayout = layout;
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 Tue Mar 2 17:35:36 2010
@@ -2066,7 +2066,7 @@
}
};
- private static final LispObject finishOutput(LispObject arg)
+ static final LispObject finishOutput(LispObject arg)
{
final LispObject out;
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 Tue Mar 2 17:35:36 2010
@@ -37,7 +37,7 @@
import static org.armedbear.lisp.Lisp.*;
import java.util.Arrays;
public final class StringFunctions {
- private final static class StringIndicesAndChars {
+ final static class StringIndicesAndChars {
public AbstractString string1;
public boolean convertCase = false;
public char[] array1;
@@ -85,7 +85,7 @@
return convert ? LispCharacter.toUpperCase(c) : c;
}
- private final static StringIndicesAndChars
+ final static StringIndicesAndChars
stringIndicesAndChars(LispObject... params) {
StringIndicesAndChars retVal = new StringIndicesAndChars();
retVal.string1 = checkString(params[0].STRING());
@@ -162,7 +162,7 @@
};
- private static final int notEqual(StringIndicesAndChars indicesAndChars) {
+ static final int notEqual(StringIndicesAndChars indicesAndChars) {
int i = indicesAndChars.start1;
int j = indicesAndChars.start2;
while (true) {
@@ -187,7 +187,7 @@
}
// ### %string/=
// Case sensitive.
- private static final Primitive _STRING_NOT_EQUAL = new pf__string_not_equal();
+ static final Primitive _STRING_NOT_EQUAL = new pf__string_not_equal();
private static final class pf__string_not_equal extends Primitive {
pf__string_not_equal() {
super("%string/=", PACKAGE_SYS, true);
@@ -228,7 +228,7 @@
// ### %string-not-equal
// Case insensitive.
- private static final Primitive _STRING_NOT_EQUAL_IGNORE_CASE = new pf__string_not_equal_ignore_case();
+ static final Primitive _STRING_NOT_EQUAL_IGNORE_CASE = new pf__string_not_equal_ignore_case();
private static final class pf__string_not_equal_ignore_case extends Primitive {
pf__string_not_equal_ignore_case() {
super("%string-not-equal", PACKAGE_SYS, true);
@@ -247,7 +247,7 @@
}
};
- private static final int lessThan(StringIndicesAndChars indicesAndChars) {
+ static final int lessThan(StringIndicesAndChars indicesAndChars) {
int i = indicesAndChars.start1;
int j = indicesAndChars.start2;
while (true) {
@@ -297,7 +297,7 @@
}
};
- private static LispObject
+ static LispObject
swapReturnValue(int original,
StringIndicesAndChars indicesAndChars) {
if (original < 0) {
@@ -330,7 +330,7 @@
}
};
- private static final int lessThanOrEqual(StringIndicesAndChars indicesAndChars) {
+ static final int lessThanOrEqual(StringIndicesAndChars indicesAndChars) {
int i = indicesAndChars.start1;
int j = indicesAndChars.start2;
while (true) {
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 Tue Mar 2 17:35:36 2010
@@ -46,7 +46,7 @@
this(Symbol.CHARACTER);
}
- private StringOutputStream(LispObject elementType)
+ StringOutputStream(LispObject elementType)
{
super(Symbol.STRING_OUTPUT_STREAM);
this.elementType = elementType;
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 Tue Mar 2 17:35:36 2010
@@ -37,7 +37,7 @@
public class StructureClass extends SlotClass
{
- private StructureClass(Symbol symbol)
+ StructureClass(Symbol symbol)
{
super(symbol, new Cons(BuiltInClass.STRUCTURE_OBJECT));
}
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 Tue Mar 2 17:35:36 2010
@@ -38,7 +38,7 @@
public class StructureObject extends LispObject
{
private final StructureClass structureClass;
- private final LispObject[] slots;
+ final LispObject[] slots;
public StructureObject(Symbol symbol)
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 Tue Mar 2 17:35:36 2010
@@ -37,9 +37,9 @@
public final class SynonymStream extends Stream
{
- private final Symbol symbol;
+ final Symbol symbol;
- private SynonymStream(Symbol symbol)
+ SynonymStream(Symbol symbol)
{
super(Symbol.SYNONYM_STREAM);
this.symbol = symbol;
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 Tue Mar 2 17:35:36 2010
@@ -37,7 +37,7 @@
public final class arglist
{
- private static final Operator getOperator(LispObject obj)
+ static final Operator getOperator(LispObject obj)
{
if (obj instanceof Operator)
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 Tue Mar 2 17:35:36 2010
@@ -37,7 +37,7 @@
public final class function_info
{
- private static EqualHashTable FUNCTION_TABLE =
+ static EqualHashTable FUNCTION_TABLE =
new EqualHashTable(64, NIL, NIL);
// ### function-info name
Modified: trunk/abcl/src/org/armedbear/lisp/java/DialogPromptStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/java/DialogPromptStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/java/DialogPromptStream.java Tue Mar 2 17:35:36 2010
@@ -17,7 +17,7 @@
*/
public abstract class DialogPromptStream extends Stream {
- private StringWriter writtenSoFar = new StringWriter();
+ StringWriter writtenSoFar = new StringWriter();
private Reader reader = new Reader() {
private StringReader stringReader = null;
Modified: trunk/abcl/src/org/armedbear/lisp/java/awt/AwtDialogPromptStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/java/awt/AwtDialogPromptStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/java/awt/AwtDialogPromptStream.java Tue Mar 2 17:35:36 2010
@@ -16,7 +16,7 @@
public class AwtDialogPromptStream extends DialogPromptStream {
- private Dialog dialog = new Dialog((Frame)null, true);
+ Dialog dialog = new Dialog((Frame)null, true);
private Label prompt = new Label();
private TextField input = new TextField(32);
Modified: trunk/abcl/src/org/armedbear/lisp/java/swing/SwingDialogPromptStream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/java/swing/SwingDialogPromptStream.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/java/swing/SwingDialogPromptStream.java Tue Mar 2 17:35:36 2010
@@ -16,7 +16,7 @@
public class SwingDialogPromptStream extends DialogPromptStream {
- private JDialog dialog = new JDialog((Frame)null, true);
+ JDialog dialog = new JDialog((Frame)null, true);
private JLabel prompt = new JLabel();
private JTextField input = new JTextField(32);
Modified: trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java Tue Mar 2 17:35:36 2010
@@ -54,7 +54,7 @@
/**
* The function used to evaluate a compiled script.
*/
- private Function evalCompiledScript;
+ Function evalCompiledScript;
protected AbclScriptEngine() {
interpreter = Interpreter.getInstance();
@@ -229,7 +229,7 @@
return Symbol.LIST.getSymbolFunction().execute(argList);
}
- private Object eval(Function evaluator, LispObject code, ScriptContext ctx) throws ScriptException {
+ Object eval(Function evaluator, LispObject code, ScriptContext ctx) throws ScriptException {
ReaderInputStream in = null;
WriterOutputStream out = null;
LispObject retVal = null;
Modified: trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java (original)
+++ trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java Tue Mar 2 17:35:36 2010
@@ -136,7 +136,7 @@
private class RandomAccessOutputStream extends OutputStream {
- private RandomAccessOutputStream() {
+ RandomAccessOutputStream() {
}
private byte[] buf = new byte[1];
@@ -168,11 +168,11 @@
// dummy reader which we need to call the Pushback constructor
// because a null value won't work
- private static Reader staticReader = new StringReader("");
+ static Reader staticReader = new StringReader("");
private class RandomAccessReader extends PushbackReader {
- private RandomAccessReader() {
+ RandomAccessReader() {
// because we override all methods of Pushbackreader,
// staticReader will never be referenced
super(staticReader);
@@ -237,7 +237,7 @@
private class RandomAccessWriter extends Writer {
- private RandomAccessWriter() {
+ RandomAccessWriter() {
}
public final void close() throws IOException {
@@ -365,7 +365,7 @@
return bufReady;
}
- private final int read(char[] cb, int off, int len) throws IOException {
+ final int read(char[] cb, int off, int len) throws IOException {
CharBuffer cbuf = CharBuffer.wrap(cb, off, len);
boolean decodeWasUnderflow = false;
boolean atEof = false;
@@ -395,7 +395,7 @@
}
}
- private final void write(char[] cb, int off, int len) throws IOException {
+ final void write(char[] cb, int off, int len) throws IOException {
CharBuffer cbuf = CharBuffer.wrap(cb, off, len);
encodeAndWrite(cbuf, false, false);
}
@@ -544,7 +544,7 @@
position(pos);
}
- private final void write(byte[] b, int off, int len) throws IOException {
+ final void write(byte[] b, int off, int len) throws IOException {
int pos = off;
while (pos < off + len) {
int want = len;
More information about the armedbear-cvs
mailing list