Switch our internals over to the new variadic list() function.

parent aab97f4a
......@@ -190,7 +190,7 @@ public abstract class AbstractArray extends LispObject
if (dimv[i] == 0) {
for (int j = i + 1; j < dimv.length; j++) {
if (dimv[j] != 0) {
error(new PrintNotReadable(list2(Keyword.OBJECT,
error(new PrintNotReadable(list(Keyword.OBJECT,
this)));
return null; // Not reached.
}
......
......@@ -167,7 +167,7 @@ public abstract class AbstractVector extends AbstractArray
}
error(new TypeError(sb.toString(),
new Fixnum(index),
list3(Symbol.INTEGER,
list(Symbol.INTEGER,
Fixnum.ZERO,
new Fixnum(limit - 1))));
......
......@@ -58,7 +58,7 @@ public final class BasicVector_UnsignedByte16 extends AbstractVector
@Override
public LispObject typeOf()
{
return list3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_16,
return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_16,
new Cons(new Fixnum(capacity)));
}
......
......@@ -59,7 +59,7 @@ public final class BasicVector_UnsignedByte32 extends AbstractVector
@Override
public LispObject typeOf()
{
return list3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_32,
return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_32,
new Cons(new Fixnum(capacity)));
}
......
......@@ -58,7 +58,7 @@ public final class BasicVector_UnsignedByte8 extends AbstractVector
@Override
public LispObject typeOf()
{
return list3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_8, new Cons(new Fixnum(capacity)));
return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_8, new Cons(new Fixnum(capacity)));
}
@Override
......
......@@ -83,7 +83,7 @@ public final class Bignum extends LispInteger
public LispObject typeOf()
{
if (value.signum() > 0)
return list2(Symbol.INTEGER,
return list(Symbol.INTEGER,
new Bignum((long)Integer.MAX_VALUE + 1));
return Symbol.BIGNUM;
}
......
......@@ -240,7 +240,7 @@ public final class BroadcastStream extends Stream
streams[i] = (Stream) args[i];
continue;
} else
return error(new TypeError(args[i], list2(Symbol.SATISFIES,
return error(new TypeError(args[i], list(Symbol.SATISFIES,
Symbol.OUTPUT_STREAM_P)));
} else
return error(new TypeError(args[i], Symbol.STREAM));
......
......@@ -144,7 +144,7 @@ public class BuiltInClass extends LispClass
public static final BuiltInClass VECTOR = addClass(Symbol.VECTOR);
public static final StructureClass STRUCTURE_OBJECT =
new StructureClass(Symbol.STRUCTURE_OBJECT, list1(CLASS_T));
new StructureClass(Symbol.STRUCTURE_OBJECT, list(CLASS_T));
static
{
addClass(Symbol.STRUCTURE_OBJECT, STRUCTURE_OBJECT);
......@@ -229,17 +229,17 @@ public class BuiltInClass extends LispClass
SEQUENCE.setCPL(SEQUENCE, CLASS_T);
SIMPLE_ARRAY.setDirectSuperclass(ARRAY);
SIMPLE_ARRAY.setCPL(SIMPLE_ARRAY, ARRAY, CLASS_T);
SIMPLE_BASE_STRING.setDirectSuperclasses(list2(BASE_STRING, SIMPLE_STRING));
SIMPLE_BASE_STRING.setDirectSuperclasses(list(BASE_STRING, SIMPLE_STRING));
SIMPLE_BASE_STRING.setCPL(SIMPLE_BASE_STRING, BASE_STRING, SIMPLE_STRING,
STRING, VECTOR, SIMPLE_ARRAY, ARRAY, SEQUENCE,
CLASS_T);
SIMPLE_BIT_VECTOR.setDirectSuperclasses(list2(BIT_VECTOR, SIMPLE_ARRAY));
SIMPLE_BIT_VECTOR.setDirectSuperclasses(list(BIT_VECTOR, SIMPLE_ARRAY));
SIMPLE_BIT_VECTOR.setCPL(SIMPLE_BIT_VECTOR, BIT_VECTOR, VECTOR,
SIMPLE_ARRAY, ARRAY, SEQUENCE, CLASS_T);
SIMPLE_STRING.setDirectSuperclasses(list3(BASE_STRING, STRING, SIMPLE_ARRAY));
SIMPLE_STRING.setDirectSuperclasses(list(BASE_STRING, STRING, SIMPLE_ARRAY));
SIMPLE_STRING.setCPL(SIMPLE_STRING, BASE_STRING, STRING, VECTOR,
SIMPLE_ARRAY, ARRAY, SEQUENCE, CLASS_T);
SIMPLE_VECTOR.setDirectSuperclasses(list2(VECTOR, SIMPLE_ARRAY));
SIMPLE_VECTOR.setDirectSuperclasses(list(VECTOR, SIMPLE_ARRAY));
SIMPLE_VECTOR.setCPL(SIMPLE_VECTOR, VECTOR, SIMPLE_ARRAY, ARRAY, SEQUENCE,
CLASS_T);
SINGLE_FLOAT.setDirectSuperclass(FLOAT);
......@@ -273,7 +273,7 @@ public class BuiltInClass extends LispClass
THREAD.setCPL(THREAD, CLASS_T);
TWO_WAY_STREAM.setDirectSuperclass(STREAM);
TWO_WAY_STREAM.setCPL(TWO_WAY_STREAM, STREAM, CLASS_T);
VECTOR.setDirectSuperclasses(list2(ARRAY, SEQUENCE));
VECTOR.setDirectSuperclasses(list(ARRAY, SEQUENCE));
VECTOR.setCPL(VECTOR, ARRAY, SEQUENCE, CLASS_T);
}
......
......@@ -1141,7 +1141,7 @@ public class Closure extends Function
@Override
public LispObject execute(LispObject arg) throws ConditionThrowable
{
Closure closure = new Closure(list3(Symbol.LAMBDA, arg, NIL), new Environment());
Closure closure = new Closure(list(Symbol.LAMBDA, arg, NIL), new Environment());
return closure.getVariableList();
}
};
......
......@@ -42,7 +42,7 @@ public class ClosureTemplateFunction extends Closure
public ClosureTemplateFunction(LispObject lambdaList)
throws ConditionThrowable
{
super(list2(Symbol.LAMBDA, lambdaList), null);
super(list(Symbol.LAMBDA, lambdaList), null);
}
final public ClosureTemplateFunction setContext(LispObject[] context)
......
......@@ -128,7 +128,7 @@ public final class ComplexArray extends AbstractArray
@Override
public LispObject typeOf()
{
return list3(Symbol.ARRAY, elementType, getDimensions());
return list(Symbol.ARRAY, elementType, getDimensions());
}
@Override
......
......@@ -124,7 +124,7 @@ public final class ComplexArray_UnsignedByte32 extends AbstractArray
@Override
public LispObject typeOf()
{
return list3(Symbol.ARRAY, UNSIGNED_BYTE_32, getDimensions());
return list(Symbol.ARRAY, UNSIGNED_BYTE_32, getDimensions());
}
@Override
......
......@@ -120,7 +120,7 @@ public final class ComplexArray_UnsignedByte8 extends AbstractArray
@Override
public LispObject typeOf()
{
return list3(Symbol.ARRAY, UNSIGNED_BYTE_8, getDimensions());
return list(Symbol.ARRAY, UNSIGNED_BYTE_8, getDimensions());
}
@Override
......@@ -227,7 +227,7 @@ public final class ComplexArray_UnsignedByte8 extends AbstractArray
public String writeToString() throws ConditionThrowable
{
if (Symbol.PRINT_READABLY.symbolValue() != NIL) {
error(new PrintNotReadable(list2(Keyword.OBJECT, this)));
error(new PrintNotReadable(list(Keyword.OBJECT, this)));
// Not reached.
return null;
}
......
......@@ -62,7 +62,7 @@ public final class ComplexBitVector extends AbstractBitVector
@Override
public LispObject typeOf()
{
return list2(Symbol.BIT_VECTOR, new Fixnum(capacity));
return list(Symbol.BIT_VECTOR, new Fixnum(capacity));
}
@Override
......
......@@ -64,7 +64,7 @@ public final class ComplexString extends AbstractString
@Override
public LispObject typeOf()
{
return list2(Symbol.STRING, number(capacity()));
return list(Symbol.STRING, number(capacity()));
}
@Override
......
......@@ -67,7 +67,7 @@ public final class ComplexVector extends AbstractVector
@Override
public LispObject typeOf()
{
return list3(Symbol.VECTOR, T, new Fixnum(capacity));
return list(Symbol.VECTOR, T, new Fixnum(capacity));
}
@Override
......
......@@ -68,7 +68,7 @@ public final class ComplexVector_UnsignedByte32 extends AbstractVector
@Override
public LispObject typeOf()
{
return list3(Symbol.VECTOR, UNSIGNED_BYTE_32, new Fixnum(capacity));
return list(Symbol.VECTOR, UNSIGNED_BYTE_32, new Fixnum(capacity));
}
@Override
......
......@@ -66,7 +66,7 @@ public final class ComplexVector_UnsignedByte8 extends AbstractVector
@Override
public LispObject typeOf()
{
return list3(Symbol.VECTOR, UNSIGNED_BYTE_8, new Fixnum(capacity));
return list(Symbol.VECTOR, UNSIGNED_BYTE_8, new Fixnum(capacity));
}
@Override
......
......@@ -184,7 +184,7 @@ public final class Cons extends LispObject
{
if (n < 0)
return type_error(new Fixnum(n),
list2(Symbol.INTEGER, Fixnum.ZERO));
list(Symbol.INTEGER, Fixnum.ZERO));
LispObject result = this;
for (int i = n; i-- > 0;)
{
......@@ -371,7 +371,7 @@ public final class Cons extends LispObject
{
// Index too large.
type_error(new Fixnum(index),
list3(Symbol.INTEGER, Fixnum.ZERO,
list(Symbol.INTEGER, Fixnum.ZERO,
new Fixnum(length() - 1)));
}
else
......@@ -606,7 +606,7 @@ public final class Cons extends LispObject
private final LispObject signalExecutionError() throws ConditionThrowable
{
return type_error(this, list3(Symbol.OR, Symbol.FUNCTION,
return type_error(this, list(Symbol.OR, Symbol.FUNCTION,
Symbol.SYMBOL));
}
......
......@@ -596,7 +596,7 @@ public final class DoubleFloat extends LispObject
LispThread thread = LispThread.currentThread();
if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL ||
!memq(Symbol.READ_DEFAULT_FLOAT_FORMAT.symbolValue(thread),
list2(Symbol.DOUBLE_FLOAT, Symbol.LONG_FLOAT)))
list(Symbol.DOUBLE_FLOAT, Symbol.LONG_FLOAT)))
{
if (s1.indexOf('E') >= 0)
return s1.replace('E', 'd');
......
......@@ -41,7 +41,7 @@ public final class Extensions extends Lisp
// ### *ed-functions*
public static final Symbol _ED_FUNCTIONS_ =
exportSpecial("*ED-FUNCTIONS*", PACKAGE_EXT,
list1(intern("DEFAULT-ED-FUNCTION", PACKAGE_SYS)));
list(intern("DEFAULT-ED-FUNCTION", PACKAGE_SYS)));
// ### truly-the value-type form => result*
private static final SpecialOperator TRULY_THE =
......
......@@ -60,8 +60,8 @@ public final class FillPointerOutputStream extends Stream
if (string.getFillPointer() >= 0)
return new FillPointerOutputStream(string);
}
return type_error(arg, list3(Symbol.AND, Symbol.STRING,
list2(Symbol.SATISFIES,
return type_error(arg, list(Symbol.AND, Symbol.STRING,
list(Symbol.SATISFIES,
Symbol.ARRAY_HAS_FILL_POINTER_P)));
}
};
......
......@@ -88,7 +88,7 @@ public final class Fixnum extends LispInteger
if (value == 0 || value == 1)
return Symbol.BIT;
if (value > 1)
return list3(Symbol.INTEGER, ZERO, new Fixnum(Integer.MAX_VALUE));
return list(Symbol.INTEGER, ZERO, new Fixnum(Integer.MAX_VALUE));
return Symbol.FIXNUM;
}
......
......@@ -85,7 +85,7 @@ public final class FloatFunctions extends Lisp
traps = traps.push(Keyword.UNDERFLOW);
if (TRAP_OVERFLOW)
traps = traps.push(Keyword.OVERFLOW);
return list2(Keyword.TRAPS, traps);
return list(Keyword.TRAPS, traps);
}
};
......
......@@ -229,7 +229,7 @@ public abstract class HashTable extends LispObject
{
if (Symbol.PRINT_READABLY.symbolValue(LispThread.currentThread()) != NIL)
{
error(new PrintNotReadable(list2(Keyword.OBJECT, this)));
error(new PrintNotReadable(list(Keyword.OBJECT, this)));
return null; // Not reached.
}
FastStringBuffer sb = new FastStringBuffer(getTest().writeToString());
......
......@@ -626,7 +626,7 @@ public final class Java extends Lisp
instance = ((JavaObject)instanceArg).getObject();
else {
type_error(instanceArg,
list3(Symbol.OR, Symbol.STRING, Symbol.JAVA_OBJECT));
list(Symbol.OR, Symbol.STRING, Symbol.JAVA_OBJECT));
// Not reached.
return null;
}
......@@ -859,7 +859,7 @@ public final class Java extends Lisp
javaObject = (JavaObject) obj;
}
catch (ClassCastException e) {
type_error(obj, list3(Symbol.OR, Symbol.STRING,
type_error(obj, list(Symbol.OR, Symbol.STRING,
Symbol.JAVA_OBJECT));
// Not reached.
return null;
......
......@@ -870,7 +870,7 @@ public abstract class Lisp
return ((Symbol)arg).getName();
if (arg instanceof LispCharacter)
return String.valueOf(new char[] {((LispCharacter)arg).value});
type_error(arg, list4(Symbol.OR, Symbol.STRING, Symbol.SYMBOL,
type_error(arg, list(Symbol.OR, Symbol.STRING, Symbol.SYMBOL,
Symbol.CHARACTER));
// Not reached.
return null;
......@@ -1163,7 +1163,7 @@ public abstract class Lisp
LispObject classBytes =
getf(ctf.getPropertyList(), Symbol.CLASS_BYTES, NIL);
if (classBytes != NIL)
result.setPropertyList(list2(Symbol.CLASS_BYTES, classBytes));
result.setPropertyList(list(Symbol.CLASS_BYTES, classBytes));
return result;
}
......@@ -1199,20 +1199,20 @@ public abstract class Lisp
}
public static final LispObject FUNCTION_NAME =
list3(Symbol.OR,
list(Symbol.OR,
Symbol.SYMBOL,
list3(Symbol.CONS,
list2(Symbol.EQL, Symbol.SETF),
list3(Symbol.CONS, Symbol.SYMBOL, Symbol.NULL)));
list(Symbol.CONS,
list(Symbol.EQL, Symbol.SETF),
list(Symbol.CONS, Symbol.SYMBOL, Symbol.NULL)));
public static final LispObject UNSIGNED_BYTE_8 =
list2(Symbol.UNSIGNED_BYTE, Fixnum.constants[8]);
list(Symbol.UNSIGNED_BYTE, Fixnum.constants[8]);
public static final LispObject UNSIGNED_BYTE_16 =
list2(Symbol.UNSIGNED_BYTE, Fixnum.constants[16]);
list(Symbol.UNSIGNED_BYTE, Fixnum.constants[16]);
public static final LispObject UNSIGNED_BYTE_32 =
list2(Symbol.UNSIGNED_BYTE, Fixnum.constants[32]);
list(Symbol.UNSIGNED_BYTE, Fixnum.constants[32]);
public static final LispObject UNSIGNED_BYTE_32_MAX_VALUE =
new Bignum(4294967296L);
......@@ -1618,7 +1618,7 @@ public abstract class Lisp
return Pathname.parseNamestring((AbstractString)arg);
if (arg instanceof FileStream)
return ((FileStream)arg).getPathname();
type_error(arg, list4(Symbol.OR, Symbol.PATHNAME,
type_error(arg, list(Symbol.OR, Symbol.PATHNAME,
Symbol.STRING, Symbol.FILE_STREAM));
// Not reached.
return null;
......@@ -2114,7 +2114,7 @@ public abstract class Lisp
String osName = System.getProperty("os.name");
if (osName.startsWith("Linux"))
{
Symbol.FEATURES.setSymbolValue(list7(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2124,7 +2124,7 @@ public abstract class Lisp
}
else if (osName.startsWith("SunOS"))
{
Symbol.FEATURES.setSymbolValue(list7(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2134,7 +2134,7 @@ public abstract class Lisp
}
else if (osName.startsWith("Mac OS X"))
{
Symbol.FEATURES.setSymbolValue(list7(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2144,7 +2144,7 @@ public abstract class Lisp
}
else if (osName.startsWith("FreeBSD"))
{
Symbol.FEATURES.setSymbolValue(list7(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2154,7 +2154,7 @@ public abstract class Lisp
}
else if (osName.startsWith("OpenBSD"))
{
Symbol.FEATURES.setSymbolValue(list7(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2164,7 +2164,7 @@ public abstract class Lisp
}
else if (osName.startsWith("NetBSD"))
{
Symbol.FEATURES.setSymbolValue(list7(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2174,7 +2174,7 @@ public abstract class Lisp
}
else if (osName.startsWith("Windows"))
{
Symbol.FEATURES.setSymbolValue(list6(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2183,7 +2183,7 @@ public abstract class Lisp
}
else
{
Symbol.FEATURES.setSymbolValue(list5(Keyword.ARMEDBEAR,
Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR,
Keyword.ABCL,
Keyword.COMMON_LISP,
Keyword.ANSI_CL,
......@@ -2532,7 +2532,7 @@ public abstract class Lisp
// ### *bq-vector-flag*
public static final Symbol _BQ_VECTOR_FLAG_ =
internSpecial("*BQ-VECTOR-FLAG*", PACKAGE_SYS, list1(new Symbol("bqv")));
internSpecial("*BQ-VECTOR-FLAG*", PACKAGE_SYS, list(new Symbol("bqv")));
// ### *traced-names*
public static final Symbol _TRACED_NAMES_ =
......
......@@ -501,7 +501,7 @@ public final class LispCharacter extends LispObject
}
if (radix < 2 || radix > 36)
return type_error(second,
list3(Symbol.INTEGER, Fixnum.TWO,
list(Symbol.INTEGER, Fixnum.TWO,
Fixnum.constants[36]));
int weight;
try
......@@ -563,7 +563,7 @@ public final class LispCharacter extends LispObject
}
catch (ClassCastException e) {}
return type_error(second,
list3(Symbol.INTEGER, Fixnum.TWO,
list(Symbol.INTEGER, Fixnum.TWO,
Fixnum.constants[36]));
}
};
......
......@@ -235,34 +235,34 @@ public abstract class LispClass extends StandardObject
public final void setCPL(LispObject obj1, LispObject obj2)
{
Debug.assertTrue(obj1 == this);
classPrecedenceList = list2(obj1, obj2);
classPrecedenceList = list(obj1, obj2);
}
public final void setCPL(LispObject obj1, LispObject obj2, LispObject obj3)
{
Debug.assertTrue(obj1 == this);
classPrecedenceList = list3(obj1, obj2, obj3);
classPrecedenceList = list(obj1, obj2, obj3);
}
public final void setCPL(LispObject obj1, LispObject obj2, LispObject obj3,
LispObject obj4)
{
Debug.assertTrue(obj1 == this);
classPrecedenceList = list4(obj1, obj2, obj3, obj4);
classPrecedenceList = list(obj1, obj2, obj3, obj4);
}
public final void setCPL(LispObject obj1, LispObject obj2, LispObject obj3,
LispObject obj4, LispObject obj5)
{
Debug.assertTrue(obj1 == this);
classPrecedenceList = list5(obj1, obj2, obj3, obj4, obj5);
classPrecedenceList = list(obj1, obj2, obj3, obj4, obj5);
}
public final void setCPL(LispObject obj1, LispObject obj2, LispObject obj3,
LispObject obj4, LispObject obj5, LispObject obj6)
{
Debug.assertTrue(obj1 == this);
classPrecedenceList = list6(obj1, obj2, obj3, obj4, obj5, obj6);
classPrecedenceList = list(obj1, obj2, obj3, obj4, obj5, obj6);
}
public final void setCPL(LispObject obj1, LispObject obj2, LispObject obj3,
......@@ -270,7 +270,7 @@ public abstract class LispClass extends StandardObject
LispObject obj7)
{
Debug.assertTrue(obj1 == this);
classPrecedenceList = list7(obj1, obj2, obj3, obj4, obj5, obj6, obj7);
classPrecedenceList = list(obj1, obj2, obj3, obj4, obj5, obj6, obj7);
}
public final void setCPL(LispObject obj1, LispObject obj2, LispObject obj3,
......@@ -279,7 +279,7 @@ public abstract class LispClass extends StandardObject
{
Debug.assertTrue(obj1 == this);
classPrecedenceList =
list8(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8);
list(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8);
}
public final void setCPL(LispObject obj1, LispObject obj2, LispObject obj3,
......@@ -288,7 +288,7 @@ public abstract class LispClass extends StandardObject
{
Debug.assertTrue(obj1 == this);
classPrecedenceList =
list9(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9);
list(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9);
}
public String getName()
......
......@@ -163,7 +163,7 @@ public class LispObject extends Lisp
{
if (n < 0)
return type_error(new Fixnum(n),
list2(Symbol.INTEGER, Fixnum.ZERO));
list(Symbol.INTEGER, Fixnum.ZERO));
return type_error(this, Symbol.LIST);
}
......@@ -516,8 +516,8 @@ public class LispObject extends Lisp
public final LispObject noFillPointer() throws ConditionThrowable
{
return type_error(this, list3(Symbol.AND, Symbol.VECTOR,
list2(Symbol.SATISFIES,
return type_error(this, list(Symbol.AND, Symbol.VECTOR,
list(Symbol.SATISFIES,
Symbol.ARRAY_HAS_FILL_POINTER_P)));
}
......
......@@ -1069,7 +1069,7 @@ public final class LispThread extends LispObject
double d =
((DoubleFloat)arg.multiplyBy(new DoubleFloat(1000))).getValue();
if (d < 0)
return type_error(arg, list2(Symbol.REAL, Fixnum.ZERO));
return type_error(arg, list(Symbol.REAL, Fixnum.ZERO));
long millis = d < Long.MAX_VALUE ? (long) d : Long.MAX_VALUE;
try {
Thread.sleep(millis);
......
......@@ -43,7 +43,7 @@ public final class MacroObject extends Function
this.name = name;
this.expander = expander;
if (name instanceof Symbol && name != NIL && expander instanceof Function)
((Function)expander).setLambdaName(list2(Symbol.MACRO_FUNCTION,
((Function)expander).setLambdaName(list(Symbol.MACRO_FUNCTION,
name));
}
......
......@@ -137,7 +137,7 @@ public final class Nil extends Symbol
{
if (n < 0)
return type_error(new Fixnum(n),
list2(Symbol.INTEGER, Fixnum.ZERO));
list(Symbol.INTEGER, Fixnum.ZERO));
return this;
}
......
......@@ -69,7 +69,7 @@ public final class NilVector extends AbstractString
@Override
public LispObject typeOf()
{
return list2(Symbol.NIL_VECTOR, new Fixnum(capacity));
return list(Symbol.NIL_VECTOR, new Fixnum(capacity));
}
@Override
......
......@@ -102,7 +102,7 @@ public class Pathname extends LispObject
return;
}
if (s.equals("..") || s.equals("../")) {
directory = list2(Keyword.RELATIVE, Keyword.UP);
directory = list(Keyword.RELATIVE, Keyword.UP);
return;
}
if (Utilities.isPlatformWindows) {
......@@ -627,7 +627,7 @@ public class Pathname extends LispObject
throws ConditionThrowable
{
if (arg != Keyword.COMMON && arg != Keyword.LOCAL)
type_error(arg, list3(Symbol.MEMBER, Keyword.COMMON,
type_error(arg, list(Symbol.MEMBER, Keyword.COMMON,
Keyword.LOCAL));
}
......@@ -837,9 +837,9 @@ public class Pathname extends LispObject
deviceSupplied = true;
} else if (key == Keyword.DIRECTORY) {
if (value instanceof AbstractString)
directory = list2(Keyword.ABSOLUTE, value);
directory = list(Keyword.ABSOLUTE, value);
else if (value == Keyword.WILD)
directory = list2(Keyword.ABSOLUTE, Keyword.WILD);
directory = list(Keyword.ABSOLUTE, Keyword.WILD);
else
directory = value;
} else if (key == Keyword.NAME) {
......
......@@ -99,7 +99,7 @@ public class Primitive0R extends Function
public LispObject execute(LispObject first, LispObject second)
throws ConditionThrowable
{
return _execute(list2(first, second));
return _execute(list(first, second));
}
@Override
......@@ -107,7 +107,7 @@ public class Primitive0R extends Function
LispObject third)
throws ConditionThrowable
{
return _execute(list3(first, second, third));
return _execute(list(first, second, third));
}
@Override
......@@ -115,7 +115,7 @@ public class Primitive0R extends Function
LispObject third, LispObject fourth)
throws ConditionThrowable
{
return _execute(list4(first, second, third, fourth));
return _execute(list(first, second, third, fourth));
}
@Override
......@@ -124,7 +124,7 @@ public class Primitive0R extends Function
LispObject fifth)
throws ConditionThrowable
{
return _execute(list5(first, second, third, fourth, fifth));
return _execute(list(first, second, third, fourth, fifth));
}
@Override
......@@ -133,7 +133,7 @@ public class Primitive0R extends Function
LispObject fifth, LispObject sixth)
throws ConditionThrowable
{
return _execute(list6(first, second, third, fourth, fifth, sixth));
return _execute(list(first, second, third, fourth, fifth, sixth));
}
@Override
......@@ -143,7 +143,7 @@ public class Primitive0R extends Function
LispObject seventh)
throws ConditionThrowable
{
return _execute(list7(first, second, third, fourth, fifth, sixth,
return _execute(list(first, second, third, fourth, fifth, sixth,
seventh));
}
......@@ -154,7 +154,7 @@ public class Primitive0R extends Function
LispObject seventh, LispObject eighth)
throws ConditionThrowable
{
return _execute(list8(first, second,