Changeset 12513


Ignore:
Timestamp:
03/02/10 22:35:36 (11 years ago)
Author:
ehuelsmann
Message:

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>

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
49 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/ArithmeticError.java

    r12288 r12513  
    101101    }
    102102
    103     private final LispObject getOperation()
     103    final LispObject getOperation()
    104104    {
    105105        return getInstanceSlotValue(Symbol.OPERATION);
     
    112112    }
    113113
    114     private final LispObject getOperands()
     114    final LispObject getOperands()
    115115    {
    116116        return getInstanceSlotValue(Symbol.OPERANDS);
  • trunk/abcl/src/org/armedbear/lisp/AutoloadMacro.java

    r12288 r12513  
    4848    }
    4949
    50     private static void installAutoloadMacro(Symbol symbol, String fileName)
     50    static void installAutoloadMacro(Symbol symbol, String fileName)
    5151
    5252    {
  • trunk/abcl/src/org/armedbear/lisp/AutoloadedFunctionProxy.java

    r12478 r12513  
    4747     * proxy and restored while loading the actual function.
    4848     */
    49     final static private Symbol[] symsToSave =
     49    final static Symbol[] symsToSave =
    5050        new Symbol[]
    5151        {
  • trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java

    r12362 r12513  
    3838public final class BroadcastStream extends Stream
    3939{
    40     private final Stream[] streams;
    41 
    42     private BroadcastStream(Stream[] streams)
     40    final Stream[] streams;
     41
     42    BroadcastStream(Stream[] streams)
    4343    {
    4444        super(Symbol.BROADCAST_STREAM);
  • trunk/abcl/src/org/armedbear/lisp/ByteArrayOutputStream.java

    r12414 r12513  
    4545    }
    4646
    47     private ByteArrayOutputStream(LispObject elementType)
     47    ByteArrayOutputStream(LispObject elementType)
    4848    {
    4949        super(Symbol.SYSTEM_STREAM);
  • trunk/abcl/src/org/armedbear/lisp/Closure.java

    r12398 r12513  
    10271027  public static class Parameter
    10281028  {
    1029     private final Symbol var;
    1030     private final LispObject initForm;
    1031     private final LispObject initVal;
    1032     private final LispObject svar;
     1029    final Symbol var;
     1030    final LispObject initForm;
     1031    final LispObject initVal;
     1032    final LispObject svar;
    10331033    private final int type;
    1034     private final Symbol keyword;
     1034    final Symbol keyword;
    10351035
    10361036    public Parameter(Symbol var)
  • trunk/abcl/src/org/armedbear/lisp/ConcatenatedStream.java

    r12362 r12513  
    3838public final class ConcatenatedStream extends Stream
    3939{
    40     private LispObject streams;
    41 
    42     private ConcatenatedStream(LispObject streams)
     40    LispObject streams;
     41
     42    ConcatenatedStream(LispObject streams)
    4343    {
    4444        super(Symbol.CONCATENATED_STREAM);
  • trunk/abcl/src/org/armedbear/lisp/Do.java

    r12460 r12513  
    6767    };
    6868
    69     private static final LispObject _do(LispObject args, Environment env,
     69    static final LispObject _do(LispObject args, Environment env,
    7070                                        boolean sequential)
    7171
  • trunk/abcl/src/org/armedbear/lisp/Environment.java

    r12288 r12513  
    3838public final class Environment extends LispObject
    3939{
    40   private Binding vars;
    41   private FunctionBinding lastFunctionBinding;
     40  Binding vars;
     41  FunctionBinding lastFunctionBinding;
    4242  private Binding blocks;
    4343  private Binding tags;
  • trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java

    r12362 r12513  
    3838public final class FillPointerOutputStream extends Stream
    3939{
    40     private ComplexString string;
     40    ComplexString string;
    4141
    42     private FillPointerOutputStream(ComplexString string)
     42    FillPointerOutputStream(ComplexString string)
    4343    {
    4444        super(Symbol.SYSTEM_STREAM);
     
    7070    };
    7171
    72     private class Writer extends java.io.Writer
     72    class Writer extends java.io.Writer
    7373    {
    7474        @Override
  • trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java

    r12290 r12513  
    199199    };
    200200
    201     private static final Fixnum FIXNUM_24 = Fixnum.getInstance(24);
    202     private static final Fixnum FIXNUM_53 = Fixnum.getInstance(53);
     201    static final Fixnum FIXNUM_24 = Fixnum.getInstance(24);
     202    static final Fixnum FIXNUM_53 = Fixnum.getInstance(53);
    203203
    204204    // ### float-digits
  • trunk/abcl/src/org/armedbear/lisp/HashTableFunctions.java

    r12290 r12513  
    3838public final class HashTableFunctions
    3939{
    40   private static final LispObject FUNCTION_EQ =
     40  static final LispObject FUNCTION_EQ =
    4141    Symbol.EQ.getSymbolFunction();
    42   private static final LispObject FUNCTION_EQL =
     42  static final LispObject FUNCTION_EQL =
    4343    Symbol.EQL.getSymbolFunction();
    44   private static final LispObject FUNCTION_EQUAL =
     44  static final LispObject FUNCTION_EQUAL =
    4545    Symbol.EQUAL.getSymbolFunction();
    46   private static final LispObject FUNCTION_EQUALP =
     46  static final LispObject FUNCTION_EQUALP =
    4747    Symbol.EQUALP.getSymbolFunction();
    4848
  • trunk/abcl/src/org/armedbear/lisp/JHandler.java

    r12290 r12513  
    4242public final class JHandler
    4343{
    44     private static final Map<Object,Map<String,Entry>> table =
     44    static final Map<Object,Map<String,Entry>> table =
    4545       new WeakHashMap<Object,Map<String,Entry>>();
    4646
  • trunk/abcl/src/org/armedbear/lisp/JProxy.java

    r12290 r12513  
    4545public final class JProxy
    4646{
    47   private static final Map<Object,Entry> table = new WeakHashMap<Object,Entry>();
     47  static final Map<Object,Entry> table = new WeakHashMap<Object,Entry>();
    4848
    4949  // ### %jnew-proxy interface &rest method-names-and-defs
     
    136136     * A weak map associating each proxy instance with a "Lisp-this" object.
    137137     */
    138     private static final Map<Object, LispObject> proxyMap = new WeakHashMap<Object, LispObject>();
     138    static final Map<Object, LispObject> proxyMap = new WeakHashMap<Object, LispObject>();
    139139 
    140140    public static class LispInvocationHandler implements InvocationHandler {
     
    239239      };   
    240240     
    241   private static LispObject toLispObject(Object obj) {
     241  static LispObject toLispObject(Object obj) {
    242242    return (obj instanceof LispObject) ? (LispObject) obj : new JavaObject(obj);
    243243  }
  • trunk/abcl/src/org/armedbear/lisp/Java.java

    r12431 r12513  
    5050public final class Java
    5151{
    52     private static final Map<Class,Symbol> registeredExceptions =
     52    static final Map<Class,Symbol> registeredExceptions =
    5353       new HashMap<Class,Symbol>();
    5454
    5555    private static final LispClass java_exception = LispClass.findClass(Symbol.JAVA_EXCEPTION);
    5656
    57     private static boolean isJavaException(LispClass lc)
     57    static boolean isJavaException(LispClass lc)
    5858    {
    5959        return lc.subclassp(java_exception);
     
    9494    };
    9595
    96     private static Symbol getCondition(Class cl)
     96    static Symbol getCondition(Class cl)
    9797    {
    9898  Class o = classForName("java.lang.Object");
     
    147147    //
    148148
    149     private static final LispObject jfield(Primitive fun, LispObject[] args, boolean translate)
     149    static final LispObject jfield(Primitive fun, LispObject[] args, boolean translate)
    150150
    151151    {
     
    348348    };
    349349
    350     private static final LispObject jstatic(Primitive fun, LispObject[] args, boolean translate)
     350    static final LispObject jstatic(Primitive fun, LispObject[] args, boolean translate)
    351351
    352352    {
     
    512512    };
    513513
    514     private static final LispObject jarray_ref(Primitive fun, LispObject[] args, boolean translate)
     514    static final LispObject jarray_ref(Primitive fun, LispObject[] args, boolean translate)
    515515
    516516    {
     
    624624    };
    625625
    626     private static LispObject jcall(Primitive fun, LispObject[] args, boolean translate)
     626    static LispObject jcall(Primitive fun, LispObject[] args, boolean translate)
    627627
    628628    {
     
    765765    }
    766766
    767     private static Constructor findConstructor(Class<?> c, LispObject[] args) throws NoSuchMethodException {
     767    static Constructor findConstructor(Class<?> c, LispObject[] args) throws NoSuchMethodException {
    768768  int argCount = args.length - 1;
    769769        Object[] javaArgs = translateMethodArguments(args, 1);
     
    10161016    };
    10171017
    1018     private static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws IntrospectionException {
     1018    static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws IntrospectionException {
    10191019        String prop = ((AbstractString) propertyName).getStringValue();
    10201020        BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
     
    10291029    }
    10301030   
    1031     private static Class classForName(String className)
     1031    static Class classForName(String className)
    10321032    {
    10331033        try {
     
    10471047
    10481048    // Supports Java primitive types too.
    1049     private static Class javaClass(LispObject obj)
     1049    static Class javaClass(LispObject obj)
    10501050    {
    10511051        if (obj instanceof AbstractString || obj instanceof Symbol) {
     
    10931093    }
    10941094
    1095     private static final String getMessage(Throwable t)
     1095    static final String getMessage(Throwable t)
    10961096    {
    10971097        String message = t.getMessage();
  • trunk/abcl/src/org/armedbear/lisp/JavaObject.java

    r12431 r12513  
    4343
    4444public final class JavaObject extends LispObject {
    45     private final Object obj;
     45    final Object obj;
    4646    private final Class<?> intendedClass;
    4747
  • trunk/abcl/src/org/armedbear/lisp/Layout.java

    r12481 r12513  
    4141  public final EqHashTable slotTable;
    4242
    43   private final LispObject[] slotNames;
    44   private final LispObject sharedSlots;
     43  final LispObject[] slotNames;
     44  final LispObject sharedSlots;
    4545
    4646  private boolean invalid;
     
    7575
    7676  // Copy constructor.
    77   private Layout(Layout oldLayout)
     77  Layout(Layout oldLayout)
    7878  {
    7979    lispClass = oldLayout.getLispClass();
  • trunk/abcl/src/org/armedbear/lisp/Lisp.java

    r12461 r12513  
    20292029
    20302030  // The compiler's object table.
    2031   private static final Hashtable<String,LispObject> objectTable =
     2031  static final Hashtable<String,LispObject> objectTable =
    20322032          new Hashtable<String,LispObject>();
    20332033
     
    26212621
    26222622  public static final LispObject UNBOUND_VALUE = new unboundValue();
    2623   private static class unboundValue extends LispObject
     2623  static class unboundValue extends LispObject
    26242624  {
    26252625    @Override
     
    26312631
    26322632  public static final LispObject NULL_VALUE = new nullValue();
    2633   private static class nullValue extends LispObject
     2633  static class nullValue extends LispObject
    26342634  {
    26352635    @Override
  • trunk/abcl/src/org/armedbear/lisp/LispCharacter.java

    r12431 r12513  
    130130  }
    131131
    132   private boolean isStandardChar()
     132  boolean isStandardChar()
    133133  {
    134134    if (value >= ' ' && value < 127)
     
    683683  } 
    684684
    685   private static final char[] UPPER_CASE_CHARS = new char[128];
     685  static final char[] UPPER_CASE_CHARS = new char[128];
    686686
    687687  static
     
    698698  }
    699699
    700   private static final char[] LOWER_CASE_CHARS = new char[128];
     700  static final char[] LOWER_CASE_CHARS = new char[128];
    701701
    702702  static
  • trunk/abcl/src/org/armedbear/lisp/LispThread.java

    r12298 r12513  
    4242public final class LispThread extends LispObject
    4343{
    44     private static boolean use_fast_calls = false;
     44    static boolean use_fast_calls = false;
    4545
    4646    // use a concurrent hashmap: we may want to add threads
    4747    // while at the same time iterating the hash
    48     final private static ConcurrentHashMap<Thread,LispThread> map =
     48    final static ConcurrentHashMap<Thread,LispThread> map =
    4949       new ConcurrentHashMap<Thread,LispThread>();
    5050
     
    6767    }
    6868
    69     private final Thread javaThread;
     69    final Thread javaThread;
    7070    private boolean destroyed;
    71     private final LispObject name;
     71    final LispObject name;
    7272    public LispObject[] _values;
    7373    private boolean threadInterrupted;
    7474    private LispObject pending = NIL;
    7575
    76     private LispThread(Thread javaThread)
     76    LispThread(Thread javaThread)
    7777    {
    7878        this.javaThread = javaThread;
     
    8080    }
    8181
    82     private LispThread(final Function fun, LispObject name)
     82    LispThread(final Function fun, LispObject name)
    8383    {
    8484        Runnable r = new Runnable() {
     
    142142    }
    143143
    144     private final synchronized boolean isInterrupted()
     144    final synchronized boolean isInterrupted()
    145145    {
    146146        return threadInterrupted;
    147147    }
    148148
    149     private final synchronized void setDestroyed(boolean b)
     149    final synchronized void setDestroyed(boolean b)
    150150    {
    151151        destroyed = b;
    152152    }
    153153
    154     private final synchronized void interrupt(LispObject function, LispObject args)
     154    final synchronized void interrupt(LispObject function, LispObject args)
    155155    {
    156156        pending = new Cons(args, pending);
     
    160160    }
    161161
    162     private final synchronized void processThreadInterrupts()
     162    final synchronized void processThreadInterrupts()
    163163
    164164    {
  • trunk/abcl/src/org/armedbear/lisp/Load.java

    r12469 r12513  
    325325    // ### *fasl-version*
    326326    // internal symbol
    327     private static final Symbol _FASL_VERSION_ =
     327    static final Symbol _FASL_VERSION_ =
    328328        exportConstant("*FASL-VERSION*", PACKAGE_SYS, Fixnum.getInstance(35));
    329329
     
    531531    }
    532532
    533     private static final LispObject faslLoadStream(LispThread thread)
     533    static final LispObject faslLoadStream(LispThread thread)
    534534    {
    535535        Stream in = (Stream) _LOAD_STREAM_.symbolValue(thread);
     
    590590    }
    591591
    592     private static final LispObject load(LispObject filespec,
     592    static final LispObject load(LispObject filespec,
    593593                                         LispObject verbose,
    594594                                         LispObject print,
  • trunk/abcl/src/org/armedbear/lisp/MathFunctions.java

    r12298 r12513  
    4848    };
    4949
    50     private static LispObject sin(LispObject arg)
     50    static LispObject sin(LispObject arg)
    5151    {
    5252        if (arg instanceof DoubleFloat)
     
    7575    };
    7676
    77     private static LispObject cos(LispObject arg)
     77    static LispObject cos(LispObject arg)
    7878    {
    7979        if (arg instanceof DoubleFloat)
     
    115115    };
    116116
    117     private static LispObject asin(LispObject arg)
     117    static LispObject asin(LispObject arg)
    118118    {
    119119        if (arg instanceof SingleFloat) {
     
    156156    };
    157157
    158     private static LispObject acos(LispObject arg)
     158    static LispObject acos(LispObject arg)
    159159    {
    160160        if (arg instanceof DoubleFloat) {
     
    226226    };
    227227
    228     private static LispObject atan(LispObject arg)
     228    static LispObject atan(LispObject arg)
    229229    {
    230230        if (arg instanceof Complex) {
     
    260260    };
    261261
    262     private static LispObject sinh(LispObject arg)
     262    static LispObject sinh(LispObject arg)
    263263    {
    264264        if (arg instanceof Complex) {
     
    298298    };
    299299
    300     private static LispObject cosh(LispObject arg)
     300    static LispObject cosh(LispObject arg)
    301301    {
    302302        if (arg instanceof Complex) {
     
    353353    };
    354354
    355     private static LispObject asinh(LispObject arg)
     355    static LispObject asinh(LispObject arg)
    356356    {
    357357        if (arg instanceof Complex) {
     
    386386    };
    387387
    388     private static LispObject acosh(LispObject arg)
     388    static LispObject acosh(LispObject arg)
    389389    {
    390390        if (arg instanceof Complex) {
     
    423423    };
    424424
    425     private static LispObject atanh(LispObject arg)
     425    static LispObject atanh(LispObject arg)
    426426    {
    427427        if (arg instanceof Complex) {
     
    455455    };
    456456
    457     private static LispObject cis(LispObject arg)
     457    static LispObject cis(LispObject arg)
    458458    {
    459459        if (arg.realp())
     
    472472    };
    473473
    474     private static LispObject exp(LispObject arg)
     474    static LispObject exp(LispObject arg)
    475475    {
    476476        if (arg.realp()) {
     
    500500    };
    501501
    502     private static final LispObject sqrt(LispObject obj)
     502    static final LispObject sqrt(LispObject obj)
    503503    {
    504504        if (obj instanceof DoubleFloat) {
     
    553553    };
    554554
    555     private static final LispObject log(LispObject obj)
     555    static final LispObject log(LispObject obj)
    556556    {
    557557        if (obj.realp() && !obj.minusp()) {
     
    707707     * @return number or signals an appropriate error
    708708     */
    709     private final static LispObject OverUnderFlowCheck(LispObject number)
     709    final static LispObject OverUnderFlowCheck(LispObject number)
    710710
    711711    {
     
    774774     * @param power An integer (fixnum or bignum) value
    775775     */
    776     private static final LispObject intexp(LispObject base, LispObject power)
     776    static final LispObject intexp(LispObject base, LispObject power)
    777777
    778778    {
  • trunk/abcl/src/org/armedbear/lisp/Pathname.java

    r12506 r12513  
    850850    }
    851851
    852     private static final void checkCaseArgument(LispObject arg) {
     852    static final void checkCaseArgument(LispObject arg) {
    853853        if (arg != Keyword.COMMON && arg != Keyword.LOCAL) {
    854854            type_error(arg, list(Symbol.MEMBER, Keyword.COMMON,
     
    10301030    }
    10311031
    1032     private static final Pathname _makePathname(LispObject[] args) {
     1032    static final Pathname _makePathname(LispObject[] args) {
    10331033        if (args.length % 2 != 0) {
    10341034            error(new ProgramError("Odd number of keyword arguments."));
  • trunk/abcl/src/org/armedbear/lisp/Primitives.java

    r12481 r12513  
    346346
    347347    // ### eql
    348     private static final Primitive EQL = new pf_eql();
     348    static final Primitive EQL = new pf_eql();
    349349    private static final class pf_eql extends Primitive {
    350350        pf_eql() {
     
    17191719        internSpecial("*SIMPLE-FORMAT-FUNCTION*", PACKAGE_SYS, _FORMAT);
    17201720
    1721     private static void checkRedefinition(LispObject arg)
     1721    static void checkRedefinition(LispObject arg)
    17221722
    17231723    {
     
    43134313    };
    43144314
    4315     private static final LispObject list_subseq(LispObject list, int start,
     4315    static final LispObject list_subseq(LispObject list, int start,
    43164316            int end)
    43174317
     
    45224522
    45234523    // ### list-delete-eq item list => result-list
    4524     private static final Primitive LIST_DELETE_EQ = new pf_list_delete_eq();
     4524    static final Primitive LIST_DELETE_EQ = new pf_list_delete_eq();
    45254525    private static final class pf_list_delete_eq extends Primitive {
    45264526        pf_list_delete_eq() {
     
    45664566
    45674567    // ### list-delete-eql item list => result-list
    4568     private static final Primitive LIST_DELETE_EQL = new pf_list_delete_eql();
     4568    static final Primitive LIST_DELETE_EQL = new pf_list_delete_eql();
    45694569    private static final class pf_list_delete_eql extends Primitive {
    45704570        pf_list_delete_eql() {
  • trunk/abcl/src/org/armedbear/lisp/Profiler.java

    r12290 r12513  
    3838public class Profiler
    3939{
    40     private static int sleep = 1;
     40    static int sleep = 1;
    4141
    4242    // ### %start-profiler
  • trunk/abcl/src/org/armedbear/lisp/Readtable.java

    r12431 r12513  
    136136
    137137  // FIXME synchronization
    138   private static void copyReadtable(Readtable from, Readtable to)
     138  static void copyReadtable(Readtable from, Readtable to)
    139139  {
    140140    Iterator<Character> charIterator = from.syntax.getCharIterator();
     
    253253  }
    254254
    255   private LispObject getMacroCharacter(char c)
     255  LispObject getMacroCharacter(char c)
    256256  {
    257257    LispObject function = getReaderMacroFunction(c);
     
    272272  }
    273273
    274   private void makeDispatchMacroCharacter(char dispChar, LispObject non_terminating_p)
     274  void makeDispatchMacroCharacter(char dispChar, LispObject non_terminating_p)
    275275  {
    276276    byte syntaxType;
  • trunk/abcl/src/org/armedbear/lisp/RuntimeClass.java

    r12298 r12513  
    4242public class RuntimeClass
    4343{
    44     private static Map<String,RuntimeClass> classes = new HashMap<String,RuntimeClass>();
     44    static Map<String,RuntimeClass> classes = new HashMap<String,RuntimeClass>();
    4545
    4646    private Map<String,Function> methods = new HashMap<String,Function>();
     
    145145    }
    146146
    147     private void addLispMethod(String methodName, Function def) {
     147    void addLispMethod(String methodName, Function def) {
    148148        methods.put(methodName, def);
    149149    }
  • trunk/abcl/src/org/armedbear/lisp/ShellCommand.java

    r12431 r12513  
    6666    }
    6767
    68     private final int exitValue()
     68    final int exitValue()
    6969    {
    7070        return exitValue;
    7171    }
    7272
    73     private void processOutput(String s)
     73    void processOutput(String s)
    7474    {
    7575        if (outputStream != null)
  • trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java

    r12288 r12513  
    248248    }
    249249
    250     private SimpleBitVector and(SimpleBitVector v, SimpleBitVector result)
     250    SimpleBitVector and(SimpleBitVector v, SimpleBitVector result)
    251251    {
    252252        if (result == null)
     
    257257    }
    258258
    259     private SimpleBitVector ior(SimpleBitVector v, SimpleBitVector result)
     259    SimpleBitVector ior(SimpleBitVector v, SimpleBitVector result)
    260260    {
    261261        if (result == null)
     
    266266    }
    267267
    268     private SimpleBitVector xor(SimpleBitVector v, SimpleBitVector result)
     268    SimpleBitVector xor(SimpleBitVector v, SimpleBitVector result)
    269269    {
    270270        if (result == null)
     
    275275    }
    276276
    277     private SimpleBitVector eqv(SimpleBitVector v, SimpleBitVector result)
     277    SimpleBitVector eqv(SimpleBitVector v, SimpleBitVector result)
    278278    {
    279279        if (result == null)
     
    284284    }
    285285
    286     private SimpleBitVector nand(SimpleBitVector v, SimpleBitVector result)
     286    SimpleBitVector nand(SimpleBitVector v, SimpleBitVector result)
    287287    {
    288288        if (result == null)
     
    293293    }
    294294
    295     private SimpleBitVector nor(SimpleBitVector v, SimpleBitVector result)
     295    SimpleBitVector nor(SimpleBitVector v, SimpleBitVector result)
    296296    {
    297297        if (result == null)
     
    302302    }
    303303
    304     private SimpleBitVector andc1(SimpleBitVector v, SimpleBitVector result)
     304    SimpleBitVector andc1(SimpleBitVector v, SimpleBitVector result)
    305305    {
    306306        if (result == null)
     
    311311    }
    312312
    313     private SimpleBitVector andc2(SimpleBitVector v, SimpleBitVector result)
     313    SimpleBitVector andc2(SimpleBitVector v, SimpleBitVector result)
    314314    {
    315315        if (result == null)
     
    320320    }
    321321
    322     private SimpleBitVector orc1(SimpleBitVector v, SimpleBitVector result)
     322    SimpleBitVector orc1(SimpleBitVector v, SimpleBitVector result)
    323323    {
    324324        if (result == null)
     
    329329    }
    330330
    331     private SimpleBitVector orc2(SimpleBitVector v, SimpleBitVector result)
     331    SimpleBitVector orc2(SimpleBitVector v, SimpleBitVector result)
    332332    {
    333333        if (result == null)
  • trunk/abcl/src/org/armedbear/lisp/SimpleVector.java

    r12288 r12513  
    4141public final class SimpleVector extends AbstractVector
    4242{
    43   private int capacity;
    44   private LispObject[] data;
     43  int capacity;
     44  LispObject[] data;
    4545
    4646  public SimpleVector(int capacity)
  • trunk/abcl/src/org/armedbear/lisp/SiteName.java

    r12298 r12513  
    4141public final class SiteName
    4242{
    43     private static LispObject getHostName()
     43    static LispObject getHostName()
    4444    {
    4545        String hostName = null;
  • trunk/abcl/src/org/armedbear/lisp/SlimeOutputStream.java

    r12362 r12513  
    4343    final Function f;
    4444
    45     private SlimeOutputStream(Function f)
     45    SlimeOutputStream(Function f)
    4646    {
    4747        super(Symbol.SLIME_OUTPUT_STREAM);
  • trunk/abcl/src/org/armedbear/lisp/SlotClass.java

    r12481 r12513  
    121121    }
    122122
    123     private LispObject computeDefaultInitargs()
     123    LispObject computeDefaultInitargs()
    124124    {
    125125        LispObject result = NIL;
  • trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java

    r12457 r12513  
    120120    };
    121121
    122     private static final LispObject _let(LispObject args, Environment env,
     122    static final LispObject _let(LispObject args, Environment env,
    123123                                         boolean sequential)
    124124
     
    307307    };
    308308
    309     private static final LispObject _flet(LispObject args, Environment env,
     309    static final LispObject _flet(LispObject args, Environment env,
    310310                                          boolean recursive)
    311311
  • trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java

    r12481 r12513  
    4040public final class StandardGenericFunction extends StandardObject
    4141{
    42   private LispObject function;
    43 
    44   private int numberOfRequiredArgs;
    45 
    46   private HashMap<CacheEntry,LispObject> cache;
    47   private HashMap<LispObject,LispObject> slotCache;
     42  LispObject function;
     43
     44  int numberOfRequiredArgs;
     45
     46  HashMap<CacheEntry,LispObject> cache;
     47  HashMap<LispObject,LispObject> slotCache;
    4848
    4949  public StandardGenericFunction()
     
    8888  }
    8989
    90   private void finalizeInternal()
     90  void finalizeInternal()
    9191  {
    9292    cache = null;
     
    664664   * </pre>
    665665   */     
    666   private LispObject getArgSpecialization(LispObject arg)
     666  LispObject getArgSpecialization(LispObject arg)
    667667  {
    668668    for (EqlSpecialization eqlSpecialization : eqlSpecializations)
     
    767767  }
    768768
    769   private EqlSpecialization eqlSpecializations[] = new EqlSpecialization[0];
     769  EqlSpecialization eqlSpecializations[] = new EqlSpecialization[0];
    770770
    771771    // ### %init-eql-specializations
  • trunk/abcl/src/org/armedbear/lisp/StandardObject.java

    r12481 r12513  
    180180  }
    181181
    182   private Layout updateLayout()
     182  Layout updateLayout()
    183183  {
    184184    Debug.assertTrue(layout.isInvalid());
  • trunk/abcl/src/org/armedbear/lisp/Stream.java

    r12431 r12513  
    20672067    };
    20682068
    2069     private static final LispObject finishOutput(LispObject arg)
     2069    static final LispObject finishOutput(LispObject arg)
    20702070
    20712071    {
  • trunk/abcl/src/org/armedbear/lisp/StringFunctions.java

    r12497 r12513  
    3838import java.util.Arrays;
    3939public final class StringFunctions {
    40     private final static class StringIndicesAndChars {
     40    final static class StringIndicesAndChars {
    4141        public AbstractString string1;
    4242        public boolean convertCase = false;
     
    8686    }
    8787
    88     private final static StringIndicesAndChars
     88    final static StringIndicesAndChars
    8989        stringIndicesAndChars(LispObject... params) {
    9090        StringIndicesAndChars retVal = new StringIndicesAndChars();
     
    163163
    164164
    165     private static final int notEqual(StringIndicesAndChars indicesAndChars) {
     165    static final int notEqual(StringIndicesAndChars indicesAndChars) {
    166166        int i = indicesAndChars.start1;
    167167        int j = indicesAndChars.start2;
     
    188188    // ### %string/=
    189189    // Case sensitive.
    190     private static final Primitive _STRING_NOT_EQUAL = new pf__string_not_equal();
     190    static final Primitive _STRING_NOT_EQUAL = new pf__string_not_equal();
    191191    private static final class pf__string_not_equal extends Primitive {
    192192        pf__string_not_equal() {
     
    229229    // ### %string-not-equal
    230230    // Case insensitive.
    231     private static final Primitive _STRING_NOT_EQUAL_IGNORE_CASE = new pf__string_not_equal_ignore_case();
     231    static final Primitive _STRING_NOT_EQUAL_IGNORE_CASE = new pf__string_not_equal_ignore_case();
    232232    private static final class pf__string_not_equal_ignore_case extends Primitive {
    233233        pf__string_not_equal_ignore_case() {
     
    248248    };
    249249
    250     private static final int lessThan(StringIndicesAndChars indicesAndChars) {
     250    static final int lessThan(StringIndicesAndChars indicesAndChars) {
    251251        int i = indicesAndChars.start1;
    252252        int j = indicesAndChars.start2;
     
    298298    };
    299299
    300     private static LispObject
     300    static LispObject
    301301        swapReturnValue(int original,
    302302                        StringIndicesAndChars indicesAndChars) {
     
    331331    };
    332332
    333     private static final int lessThanOrEqual(StringIndicesAndChars indicesAndChars) {
     333    static final int lessThanOrEqual(StringIndicesAndChars indicesAndChars) {
    334334        int i = indicesAndChars.start1;
    335335        int j = indicesAndChars.start2;
  • trunk/abcl/src/org/armedbear/lisp/StringOutputStream.java

    r12362 r12513  
    4747    }
    4848
    49     private StringOutputStream(LispObject elementType)
     49    StringOutputStream(LispObject elementType)
    5050    {
    5151        super(Symbol.STRING_OUTPUT_STREAM);
  • trunk/abcl/src/org/armedbear/lisp/StructureClass.java

    r12481 r12513  
    3838public class StructureClass extends SlotClass
    3939{
    40     private StructureClass(Symbol symbol)
     40    StructureClass(Symbol symbol)
    4141    {
    4242        super(symbol, new Cons(BuiltInClass.STRUCTURE_OBJECT));
  • trunk/abcl/src/org/armedbear/lisp/StructureObject.java

    r12481 r12513  
    3939{
    4040  private final StructureClass structureClass;
    41   private final LispObject[] slots;
     41  final LispObject[] slots;
    4242
    4343  public StructureObject(Symbol symbol)
  • trunk/abcl/src/org/armedbear/lisp/SynonymStream.java

    r12362 r12513  
    3838public final class SynonymStream extends Stream
    3939{
    40     private final Symbol symbol;
    41 
    42     private SynonymStream(Symbol symbol)
     40    final Symbol symbol;
     41
     42    SynonymStream(Symbol symbol)
    4343    {
    4444        super(Symbol.SYNONYM_STREAM);
  • trunk/abcl/src/org/armedbear/lisp/arglist.java

    r12290 r12513  
    3838public final class arglist
    3939{
    40     private static final Operator getOperator(LispObject obj)
     40    static final Operator getOperator(LispObject obj)
    4141
    4242    {
  • trunk/abcl/src/org/armedbear/lisp/function_info.java

    r12290 r12513  
    3838public final class function_info
    3939{
    40     private static EqualHashTable FUNCTION_TABLE =
     40    static EqualHashTable FUNCTION_TABLE =
    4141        new EqualHashTable(64, NIL, NIL);
    4242
  • trunk/abcl/src/org/armedbear/lisp/java/DialogPromptStream.java

    r12362 r12513  
    1818public abstract class DialogPromptStream extends Stream {
    1919
    20   private StringWriter writtenSoFar = new StringWriter();
     20  StringWriter writtenSoFar = new StringWriter();
    2121  private Reader reader = new Reader() {
    2222
  • trunk/abcl/src/org/armedbear/lisp/java/awt/AwtDialogPromptStream.java

    r12035 r12513  
    1717public class AwtDialogPromptStream extends DialogPromptStream {
    1818
    19   private Dialog dialog = new Dialog((Frame)null, true);
     19  Dialog dialog = new Dialog((Frame)null, true);
    2020  private Label prompt = new Label();
    2121  private TextField input = new TextField(32);
  • trunk/abcl/src/org/armedbear/lisp/java/swing/SwingDialogPromptStream.java

    r12035 r12513  
    1717public class SwingDialogPromptStream extends DialogPromptStream {
    1818
    19   private JDialog dialog = new JDialog((Frame)null, true);
     19  JDialog dialog = new JDialog((Frame)null, true);
    2020  private JLabel prompt = new JLabel();
    2121  private JTextField input = new JTextField(32);
  • trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java

    r12362 r12513  
    5555     * The function used to evaluate a compiled script.
    5656     */
    57     private Function evalCompiledScript;
     57    Function evalCompiledScript;
    5858
    5959    protected AbclScriptEngine() {
     
    230230  }
    231231
    232     private Object eval(Function evaluator, LispObject code, ScriptContext ctx) throws ScriptException {
     232    Object eval(Function evaluator, LispObject code, ScriptContext ctx) throws ScriptException {
    233233  ReaderInputStream in = null;
    234234  WriterOutputStream out = null;
  • trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java

    r12327 r12513  
    137137    private class RandomAccessOutputStream extends OutputStream {
    138138
    139         private RandomAccessOutputStream() {
     139        RandomAccessOutputStream() {
    140140        }
    141141
     
    169169    // dummy reader which we need to call the Pushback constructor
    170170    // because a null value won't work
    171     private static Reader staticReader = new StringReader("");
     171    static Reader staticReader = new StringReader("");
    172172
    173173    private class RandomAccessReader extends PushbackReader {
    174174
    175         private RandomAccessReader() {
     175        RandomAccessReader() {
    176176                // because we override all methods of Pushbackreader,
    177177                // staticReader will never be referenced
     
    238238    private class RandomAccessWriter extends Writer {
    239239
    240         private RandomAccessWriter() {
     240        RandomAccessWriter() {
    241241        }
    242242
     
    366366    }
    367367
    368     private final int read(char[] cb, int off, int len) throws IOException {
     368    final int read(char[] cb, int off, int len) throws IOException {
    369369        CharBuffer cbuf = CharBuffer.wrap(cb, off, len);
    370370        boolean decodeWasUnderflow = false;
     
    396396    }
    397397
    398     private final void write(char[] cb, int off, int len) throws IOException {
     398    final void write(char[] cb, int off, int len) throws IOException {
    399399        CharBuffer cbuf = CharBuffer.wrap(cb, off, len);
    400400        encodeAndWrite(cbuf, false, false);
     
    545545    }
    546546
    547     private final void write(byte[] b, int off, int len) throws IOException {
     547    final void write(byte[] b, int off, int len) throws IOException {
    548548        int pos = off;
    549549        while (pos < off + len) {
Note: See TracChangeset for help on using the changeset viewer.