Changeset 11711
- Timestamp:
- 03/15/09 15:51:40 (15 years ago)
- Location:
- trunk/abcl/src/org/armedbear/lisp
- Files:
-
- 63 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/AbstractArray.java
r11575 r11711 191 191 for (int j = i + 1; j < dimv.length; j++) { 192 192 if (dimv[j] != 0) { 193 error(new PrintNotReadable(list 2(Keyword.OBJECT,193 error(new PrintNotReadable(list(Keyword.OBJECT, 194 194 this))); 195 195 return null; // Not reached. -
trunk/abcl/src/org/armedbear/lisp/AbstractVector.java
r11557 r11711 168 168 error(new TypeError(sb.toString(), 169 169 new Fixnum(index), 170 list 3(Symbol.INTEGER,170 list(Symbol.INTEGER, 171 171 Fixnum.ZERO, 172 172 new Fixnum(limit - 1)))); -
trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte16.java
r11562 r11711 59 59 public LispObject typeOf() 60 60 { 61 return list 3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_16,61 return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_16, 62 62 new Cons(new Fixnum(capacity))); 63 63 } -
trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte32.java
r11562 r11711 60 60 public LispObject typeOf() 61 61 { 62 return list 3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_32,62 return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_32, 63 63 new Cons(new Fixnum(capacity))); 64 64 } -
trunk/abcl/src/org/armedbear/lisp/BasicVector_UnsignedByte8.java
r11562 r11711 59 59 public LispObject typeOf() 60 60 { 61 return list 3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_8, new Cons(new Fixnum(capacity)));61 return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_8, new Cons(new Fixnum(capacity))); 62 62 } 63 63 -
trunk/abcl/src/org/armedbear/lisp/Bignum.java
r11647 r11711 84 84 { 85 85 if (value.signum() > 0) 86 return list 2(Symbol.INTEGER,86 return list(Symbol.INTEGER, 87 87 new Bignum((long)Integer.MAX_VALUE + 1)); 88 88 return Symbol.BIGNUM; -
trunk/abcl/src/org/armedbear/lisp/BroadcastStream.java
r11488 r11711 241 241 continue; 242 242 } else 243 return error(new TypeError(args[i], list 2(Symbol.SATISFIES,243 return error(new TypeError(args[i], list(Symbol.SATISFIES, 244 244 Symbol.OUTPUT_STREAM_P))); 245 245 } else -
trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java
r11587 r11711 145 145 146 146 public static final StructureClass STRUCTURE_OBJECT = 147 new StructureClass(Symbol.STRUCTURE_OBJECT, list 1(CLASS_T));147 new StructureClass(Symbol.STRUCTURE_OBJECT, list(CLASS_T)); 148 148 static 149 149 { … … 230 230 SIMPLE_ARRAY.setDirectSuperclass(ARRAY); 231 231 SIMPLE_ARRAY.setCPL(SIMPLE_ARRAY, ARRAY, CLASS_T); 232 SIMPLE_BASE_STRING.setDirectSuperclasses(list 2(BASE_STRING, SIMPLE_STRING));232 SIMPLE_BASE_STRING.setDirectSuperclasses(list(BASE_STRING, SIMPLE_STRING)); 233 233 SIMPLE_BASE_STRING.setCPL(SIMPLE_BASE_STRING, BASE_STRING, SIMPLE_STRING, 234 234 STRING, VECTOR, SIMPLE_ARRAY, ARRAY, SEQUENCE, 235 235 CLASS_T); 236 SIMPLE_BIT_VECTOR.setDirectSuperclasses(list 2(BIT_VECTOR, SIMPLE_ARRAY));236 SIMPLE_BIT_VECTOR.setDirectSuperclasses(list(BIT_VECTOR, SIMPLE_ARRAY)); 237 237 SIMPLE_BIT_VECTOR.setCPL(SIMPLE_BIT_VECTOR, BIT_VECTOR, VECTOR, 238 238 SIMPLE_ARRAY, ARRAY, SEQUENCE, CLASS_T); 239 SIMPLE_STRING.setDirectSuperclasses(list 3(BASE_STRING, STRING, SIMPLE_ARRAY));239 SIMPLE_STRING.setDirectSuperclasses(list(BASE_STRING, STRING, SIMPLE_ARRAY)); 240 240 SIMPLE_STRING.setCPL(SIMPLE_STRING, BASE_STRING, STRING, VECTOR, 241 241 SIMPLE_ARRAY, ARRAY, SEQUENCE, CLASS_T); 242 SIMPLE_VECTOR.setDirectSuperclasses(list 2(VECTOR, SIMPLE_ARRAY));242 SIMPLE_VECTOR.setDirectSuperclasses(list(VECTOR, SIMPLE_ARRAY)); 243 243 SIMPLE_VECTOR.setCPL(SIMPLE_VECTOR, VECTOR, SIMPLE_ARRAY, ARRAY, SEQUENCE, 244 244 CLASS_T); … … 274 274 TWO_WAY_STREAM.setDirectSuperclass(STREAM); 275 275 TWO_WAY_STREAM.setCPL(TWO_WAY_STREAM, STREAM, CLASS_T); 276 VECTOR.setDirectSuperclasses(list 2(ARRAY, SEQUENCE));276 VECTOR.setDirectSuperclasses(list(ARRAY, SEQUENCE)); 277 277 VECTOR.setCPL(VECTOR, ARRAY, SEQUENCE, CLASS_T); 278 278 } -
trunk/abcl/src/org/armedbear/lisp/Closure.java
r11698 r11711 1142 1142 public LispObject execute(LispObject arg) throws ConditionThrowable 1143 1143 { 1144 Closure closure = new Closure(list 3(Symbol.LAMBDA, arg, NIL), new Environment());1144 Closure closure = new Closure(list(Symbol.LAMBDA, arg, NIL), new Environment()); 1145 1145 return closure.getVariableList(); 1146 1146 } -
trunk/abcl/src/org/armedbear/lisp/ClosureTemplateFunction.java
r11512 r11711 43 43 throws ConditionThrowable 44 44 { 45 super(list 2(Symbol.LAMBDA, lambdaList), null);45 super(list(Symbol.LAMBDA, lambdaList), null); 46 46 } 47 47 -
trunk/abcl/src/org/armedbear/lisp/ComplexArray.java
r11562 r11711 129 129 public LispObject typeOf() 130 130 { 131 return list 3(Symbol.ARRAY, elementType, getDimensions());131 return list(Symbol.ARRAY, elementType, getDimensions()); 132 132 } 133 133 -
trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte32.java
r11562 r11711 125 125 public LispObject typeOf() 126 126 { 127 return list 3(Symbol.ARRAY, UNSIGNED_BYTE_32, getDimensions());127 return list(Symbol.ARRAY, UNSIGNED_BYTE_32, getDimensions()); 128 128 } 129 129 -
trunk/abcl/src/org/armedbear/lisp/ComplexArray_UnsignedByte8.java
r11562 r11711 121 121 public LispObject typeOf() 122 122 { 123 return list 3(Symbol.ARRAY, UNSIGNED_BYTE_8, getDimensions());123 return list(Symbol.ARRAY, UNSIGNED_BYTE_8, getDimensions()); 124 124 } 125 125 … … 228 228 { 229 229 if (Symbol.PRINT_READABLY.symbolValue() != NIL) { 230 error(new PrintNotReadable(list 2(Keyword.OBJECT, this)));230 error(new PrintNotReadable(list(Keyword.OBJECT, this))); 231 231 // Not reached. 232 232 return null; -
trunk/abcl/src/org/armedbear/lisp/ComplexBitVector.java
r11562 r11711 63 63 public LispObject typeOf() 64 64 { 65 return list 2(Symbol.BIT_VECTOR, new Fixnum(capacity));65 return list(Symbol.BIT_VECTOR, new Fixnum(capacity)); 66 66 } 67 67 -
trunk/abcl/src/org/armedbear/lisp/ComplexString.java
r11562 r11711 65 65 public LispObject typeOf() 66 66 { 67 return list 2(Symbol.STRING, number(capacity()));67 return list(Symbol.STRING, number(capacity())); 68 68 } 69 69 -
trunk/abcl/src/org/armedbear/lisp/ComplexVector.java
r11562 r11711 68 68 public LispObject typeOf() 69 69 { 70 return list 3(Symbol.VECTOR, T, new Fixnum(capacity));70 return list(Symbol.VECTOR, T, new Fixnum(capacity)); 71 71 } 72 72 -
trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte32.java
r11562 r11711 69 69 public LispObject typeOf() 70 70 { 71 return list 3(Symbol.VECTOR, UNSIGNED_BYTE_32, new Fixnum(capacity));71 return list(Symbol.VECTOR, UNSIGNED_BYTE_32, new Fixnum(capacity)); 72 72 } 73 73 -
trunk/abcl/src/org/armedbear/lisp/ComplexVector_UnsignedByte8.java
r11562 r11711 67 67 public LispObject typeOf() 68 68 { 69 return list 3(Symbol.VECTOR, UNSIGNED_BYTE_8, new Fixnum(capacity));69 return list(Symbol.VECTOR, UNSIGNED_BYTE_8, new Fixnum(capacity)); 70 70 } 71 71 -
trunk/abcl/src/org/armedbear/lisp/Cons.java
r11488 r11711 185 185 if (n < 0) 186 186 return type_error(new Fixnum(n), 187 list 2(Symbol.INTEGER, Fixnum.ZERO));187 list(Symbol.INTEGER, Fixnum.ZERO)); 188 188 LispObject result = this; 189 189 for (int i = n; i-- > 0;) … … 372 372 // Index too large. 373 373 type_error(new Fixnum(index), 374 list 3(Symbol.INTEGER, Fixnum.ZERO,374 list(Symbol.INTEGER, Fixnum.ZERO, 375 375 new Fixnum(length() - 1))); 376 376 } … … 607 607 private final LispObject signalExecutionError() throws ConditionThrowable 608 608 { 609 return type_error(this, list 3(Symbol.OR, Symbol.FUNCTION,609 return type_error(this, list(Symbol.OR, Symbol.FUNCTION, 610 610 Symbol.SYMBOL)); 611 611 } -
trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java
r11579 r11711 597 597 if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL || 598 598 !memq(Symbol.READ_DEFAULT_FLOAT_FORMAT.symbolValue(thread), 599 list 2(Symbol.DOUBLE_FLOAT, Symbol.LONG_FLOAT)))599 list(Symbol.DOUBLE_FLOAT, Symbol.LONG_FLOAT))) 600 600 { 601 601 if (s1.indexOf('E') >= 0) -
trunk/abcl/src/org/armedbear/lisp/Extensions.java
r11488 r11711 42 42 public static final Symbol _ED_FUNCTIONS_ = 43 43 exportSpecial("*ED-FUNCTIONS*", PACKAGE_EXT, 44 list 1(intern("DEFAULT-ED-FUNCTION", PACKAGE_SYS)));44 list(intern("DEFAULT-ED-FUNCTION", PACKAGE_SYS))); 45 45 46 46 // ### truly-the value-type form => result* -
trunk/abcl/src/org/armedbear/lisp/FillPointerOutputStream.java
r11488 r11711 61 61 return new FillPointerOutputStream(string); 62 62 } 63 return type_error(arg, list 3(Symbol.AND, Symbol.STRING,64 list 2(Symbol.SATISFIES,63 return type_error(arg, list(Symbol.AND, Symbol.STRING, 64 list(Symbol.SATISFIES, 65 65 Symbol.ARRAY_HAS_FILL_POINTER_P))); 66 66 } -
trunk/abcl/src/org/armedbear/lisp/Fixnum.java
r11579 r11711 89 89 return Symbol.BIT; 90 90 if (value > 1) 91 return list 3(Symbol.INTEGER, ZERO, new Fixnum(Integer.MAX_VALUE));91 return list(Symbol.INTEGER, ZERO, new Fixnum(Integer.MAX_VALUE)); 92 92 return Symbol.FIXNUM; 93 93 } -
trunk/abcl/src/org/armedbear/lisp/FloatFunctions.java
r11572 r11711 86 86 if (TRAP_OVERFLOW) 87 87 traps = traps.push(Keyword.OVERFLOW); 88 return list 2(Keyword.TRAPS, traps);88 return list(Keyword.TRAPS, traps); 89 89 } 90 90 }; -
trunk/abcl/src/org/armedbear/lisp/HashTable.java
r11698 r11711 230 230 if (Symbol.PRINT_READABLY.symbolValue(LispThread.currentThread()) != NIL) 231 231 { 232 error(new PrintNotReadable(list 2(Keyword.OBJECT, this)));232 error(new PrintNotReadable(list(Keyword.OBJECT, this))); 233 233 return null; // Not reached. 234 234 } -
trunk/abcl/src/org/armedbear/lisp/Java.java
r11698 r11711 627 627 else { 628 628 type_error(instanceArg, 629 list 3(Symbol.OR, Symbol.STRING, Symbol.JAVA_OBJECT));629 list(Symbol.OR, Symbol.STRING, Symbol.JAVA_OBJECT)); 630 630 // Not reached. 631 631 return null; … … 860 860 } 861 861 catch (ClassCastException e) { 862 type_error(obj, list 3(Symbol.OR, Symbol.STRING,862 type_error(obj, list(Symbol.OR, Symbol.STRING, 863 863 Symbol.JAVA_OBJECT)); 864 864 // Not reached. -
trunk/abcl/src/org/armedbear/lisp/Lisp.java
r11710 r11711 871 871 if (arg instanceof LispCharacter) 872 872 return String.valueOf(new char[] {((LispCharacter)arg).value}); 873 type_error(arg, list 4(Symbol.OR, Symbol.STRING, Symbol.SYMBOL,873 type_error(arg, list(Symbol.OR, Symbol.STRING, Symbol.SYMBOL, 874 874 Symbol.CHARACTER)); 875 875 // Not reached. … … 1164 1164 getf(ctf.getPropertyList(), Symbol.CLASS_BYTES, NIL); 1165 1165 if (classBytes != NIL) 1166 result.setPropertyList(list 2(Symbol.CLASS_BYTES, classBytes));1166 result.setPropertyList(list(Symbol.CLASS_BYTES, classBytes)); 1167 1167 return result; 1168 1168 } … … 1200 1200 1201 1201 public static final LispObject FUNCTION_NAME = 1202 list 3(Symbol.OR,1202 list(Symbol.OR, 1203 1203 Symbol.SYMBOL, 1204 list 3(Symbol.CONS,1205 list 2(Symbol.EQL, Symbol.SETF),1206 list 3(Symbol.CONS, Symbol.SYMBOL, Symbol.NULL)));1204 list(Symbol.CONS, 1205 list(Symbol.EQL, Symbol.SETF), 1206 list(Symbol.CONS, Symbol.SYMBOL, Symbol.NULL))); 1207 1207 1208 1208 public static final LispObject UNSIGNED_BYTE_8 = 1209 list 2(Symbol.UNSIGNED_BYTE, Fixnum.constants[8]);1209 list(Symbol.UNSIGNED_BYTE, Fixnum.constants[8]); 1210 1210 1211 1211 public static final LispObject UNSIGNED_BYTE_16 = 1212 list 2(Symbol.UNSIGNED_BYTE, Fixnum.constants[16]);1212 list(Symbol.UNSIGNED_BYTE, Fixnum.constants[16]); 1213 1213 1214 1214 public static final LispObject UNSIGNED_BYTE_32 = 1215 list 2(Symbol.UNSIGNED_BYTE, Fixnum.constants[32]);1215 list(Symbol.UNSIGNED_BYTE, Fixnum.constants[32]); 1216 1216 1217 1217 public static final LispObject UNSIGNED_BYTE_32_MAX_VALUE = … … 1619 1619 if (arg instanceof FileStream) 1620 1620 return ((FileStream)arg).getPathname(); 1621 type_error(arg, list 4(Symbol.OR, Symbol.PATHNAME,1621 type_error(arg, list(Symbol.OR, Symbol.PATHNAME, 1622 1622 Symbol.STRING, Symbol.FILE_STREAM)); 1623 1623 // Not reached. … … 2115 2115 if (osName.startsWith("Linux")) 2116 2116 { 2117 Symbol.FEATURES.setSymbolValue(list 7(Keyword.ARMEDBEAR,2117 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2118 2118 Keyword.ABCL, 2119 2119 Keyword.COMMON_LISP, … … 2125 2125 else if (osName.startsWith("SunOS")) 2126 2126 { 2127 Symbol.FEATURES.setSymbolValue(list 7(Keyword.ARMEDBEAR,2127 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2128 2128 Keyword.ABCL, 2129 2129 Keyword.COMMON_LISP, … … 2135 2135 else if (osName.startsWith("Mac OS X")) 2136 2136 { 2137 Symbol.FEATURES.setSymbolValue(list 7(Keyword.ARMEDBEAR,2137 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2138 2138 Keyword.ABCL, 2139 2139 Keyword.COMMON_LISP, … … 2145 2145 else if (osName.startsWith("FreeBSD")) 2146 2146 { 2147 Symbol.FEATURES.setSymbolValue(list 7(Keyword.ARMEDBEAR,2147 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2148 2148 Keyword.ABCL, 2149 2149 Keyword.COMMON_LISP, … … 2155 2155 else if (osName.startsWith("OpenBSD")) 2156 2156 { 2157 Symbol.FEATURES.setSymbolValue(list 7(Keyword.ARMEDBEAR,2157 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2158 2158 Keyword.ABCL, 2159 2159 Keyword.COMMON_LISP, … … 2165 2165 else if (osName.startsWith("NetBSD")) 2166 2166 { 2167 Symbol.FEATURES.setSymbolValue(list 7(Keyword.ARMEDBEAR,2167 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2168 2168 Keyword.ABCL, 2169 2169 Keyword.COMMON_LISP, … … 2175 2175 else if (osName.startsWith("Windows")) 2176 2176 { 2177 Symbol.FEATURES.setSymbolValue(list 6(Keyword.ARMEDBEAR,2177 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2178 2178 Keyword.ABCL, 2179 2179 Keyword.COMMON_LISP, … … 2184 2184 else 2185 2185 { 2186 Symbol.FEATURES.setSymbolValue(list 5(Keyword.ARMEDBEAR,2186 Symbol.FEATURES.setSymbolValue(list(Keyword.ARMEDBEAR, 2187 2187 Keyword.ABCL, 2188 2188 Keyword.COMMON_LISP, … … 2533 2533 // ### *bq-vector-flag* 2534 2534 public static final Symbol _BQ_VECTOR_FLAG_ = 2535 internSpecial("*BQ-VECTOR-FLAG*", PACKAGE_SYS, list 1(new Symbol("bqv")));2535 internSpecial("*BQ-VECTOR-FLAG*", PACKAGE_SYS, list(new Symbol("bqv"))); 2536 2536 2537 2537 // ### *traced-names* -
trunk/abcl/src/org/armedbear/lisp/LispCharacter.java
r11573 r11711 502 502 if (radix < 2 || radix > 36) 503 503 return type_error(second, 504 list 3(Symbol.INTEGER, Fixnum.TWO,504 list(Symbol.INTEGER, Fixnum.TWO, 505 505 Fixnum.constants[36])); 506 506 int weight; … … 564 564 catch (ClassCastException e) {} 565 565 return type_error(second, 566 list 3(Symbol.INTEGER, Fixnum.TWO,566 list(Symbol.INTEGER, Fixnum.TWO, 567 567 Fixnum.constants[36])); 568 568 } -
trunk/abcl/src/org/armedbear/lisp/LispClass.java
r11488 r11711 236 236 { 237 237 Debug.assertTrue(obj1 == this); 238 classPrecedenceList = list 2(obj1, obj2);238 classPrecedenceList = list(obj1, obj2); 239 239 } 240 240 … … 242 242 { 243 243 Debug.assertTrue(obj1 == this); 244 classPrecedenceList = list 3(obj1, obj2, obj3);244 classPrecedenceList = list(obj1, obj2, obj3); 245 245 } 246 246 … … 249 249 { 250 250 Debug.assertTrue(obj1 == this); 251 classPrecedenceList = list 4(obj1, obj2, obj3, obj4);251 classPrecedenceList = list(obj1, obj2, obj3, obj4); 252 252 } 253 253 … … 256 256 { 257 257 Debug.assertTrue(obj1 == this); 258 classPrecedenceList = list 5(obj1, obj2, obj3, obj4, obj5);258 classPrecedenceList = list(obj1, obj2, obj3, obj4, obj5); 259 259 } 260 260 … … 263 263 { 264 264 Debug.assertTrue(obj1 == this); 265 classPrecedenceList = list 6(obj1, obj2, obj3, obj4, obj5, obj6);265 classPrecedenceList = list(obj1, obj2, obj3, obj4, obj5, obj6); 266 266 } 267 267 … … 271 271 { 272 272 Debug.assertTrue(obj1 == this); 273 classPrecedenceList = list 7(obj1, obj2, obj3, obj4, obj5, obj6, obj7);273 classPrecedenceList = list(obj1, obj2, obj3, obj4, obj5, obj6, obj7); 274 274 } 275 275 … … 280 280 Debug.assertTrue(obj1 == this); 281 281 classPrecedenceList = 282 list 8(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8);282 list(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8); 283 283 } 284 284 … … 289 289 Debug.assertTrue(obj1 == this); 290 290 classPrecedenceList = 291 list 9(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9);291 list(obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9); 292 292 } 293 293 -
trunk/abcl/src/org/armedbear/lisp/LispObject.java
r11698 r11711 164 164 if (n < 0) 165 165 return type_error(new Fixnum(n), 166 list 2(Symbol.INTEGER, Fixnum.ZERO));166 list(Symbol.INTEGER, Fixnum.ZERO)); 167 167 return type_error(this, Symbol.LIST); 168 168 } … … 517 517 public final LispObject noFillPointer() throws ConditionThrowable 518 518 { 519 return type_error(this, list 3(Symbol.AND, Symbol.VECTOR,520 list 2(Symbol.SATISFIES,519 return type_error(this, list(Symbol.AND, Symbol.VECTOR, 520 list(Symbol.SATISFIES, 521 521 Symbol.ARRAY_HAS_FILL_POINTER_P))); 522 522 } -
trunk/abcl/src/org/armedbear/lisp/LispThread.java
r11553 r11711 1070 1070 ((DoubleFloat)arg.multiplyBy(new DoubleFloat(1000))).getValue(); 1071 1071 if (d < 0) 1072 return type_error(arg, list 2(Symbol.REAL, Fixnum.ZERO));1072 return type_error(arg, list(Symbol.REAL, Fixnum.ZERO)); 1073 1073 long millis = d < Long.MAX_VALUE ? (long) d : Long.MAX_VALUE; 1074 1074 try { -
trunk/abcl/src/org/armedbear/lisp/MacroObject.java
r11488 r11711 44 44 this.expander = expander; 45 45 if (name instanceof Symbol && name != NIL && expander instanceof Function) 46 ((Function)expander).setLambdaName(list 2(Symbol.MACRO_FUNCTION,46 ((Function)expander).setLambdaName(list(Symbol.MACRO_FUNCTION, 47 47 name)); 48 48 } -
trunk/abcl/src/org/armedbear/lisp/Nil.java
r11698 r11711 138 138 if (n < 0) 139 139 return type_error(new Fixnum(n), 140 list 2(Symbol.INTEGER, Fixnum.ZERO));140 list(Symbol.INTEGER, Fixnum.ZERO)); 141 141 return this; 142 142 } -
trunk/abcl/src/org/armedbear/lisp/NilVector.java
r11557 r11711 70 70 public LispObject typeOf() 71 71 { 72 return list 2(Symbol.NIL_VECTOR, new Fixnum(capacity));72 return list(Symbol.NIL_VECTOR, new Fixnum(capacity)); 73 73 } 74 74 -
trunk/abcl/src/org/armedbear/lisp/Pathname.java
r11581 r11711 103 103 } 104 104 if (s.equals("..") || s.equals("../")) { 105 directory = list 2(Keyword.RELATIVE, Keyword.UP);105 directory = list(Keyword.RELATIVE, Keyword.UP); 106 106 return; 107 107 } … … 628 628 { 629 629 if (arg != Keyword.COMMON && arg != Keyword.LOCAL) 630 type_error(arg, list 3(Symbol.MEMBER, Keyword.COMMON,630 type_error(arg, list(Symbol.MEMBER, Keyword.COMMON, 631 631 Keyword.LOCAL)); 632 632 } … … 838 838 } else if (key == Keyword.DIRECTORY) { 839 839 if (value instanceof AbstractString) 840 directory = list 2(Keyword.ABSOLUTE, value);840 directory = list(Keyword.ABSOLUTE, value); 841 841 else if (value == Keyword.WILD) 842 directory = list 2(Keyword.ABSOLUTE, Keyword.WILD);842 directory = list(Keyword.ABSOLUTE, Keyword.WILD); 843 843 else 844 844 directory = value; -
trunk/abcl/src/org/armedbear/lisp/Primitive0R.java
r11488 r11711 100 100 throws ConditionThrowable 101 101 { 102 return _execute(list 2(first, second));102 return _execute(list(first, second)); 103 103 } 104 104 … … 108 108 throws ConditionThrowable 109 109 { 110 return _execute(list 3(first, second, third));110 return _execute(list(first, second, third)); 111 111 } 112 112 … … 116 116 throws ConditionThrowable 117 117 { 118 return _execute(list 4(first, second, third, fourth));118 return _execute(list(first, second, third, fourth)); 119 119 } 120 120 … … 125 125 throws ConditionThrowable 126 126 { 127 return _execute(list 5(first, second, third, fourth, fifth));127 return _execute(list(first, second, third, fourth, fifth)); 128 128 } 129 129 … … 134 134 throws ConditionThrowable 135 135 { 136 return _execute(list 6(first, second, third, fourth, fifth, sixth));136 return _execute(list(first, second, third, fourth, fifth, sixth)); 137 137 } 138 138 … … 144 144 throws ConditionThrowable 145 145 { 146 return _execute(list 7(first, second, third, fourth, fifth, sixth,146 return _execute(list(first, second, third, fourth, fifth, sixth, 147 147 seventh)); 148 148 } … … 155 155 throws ConditionThrowable 156 156 { 157 return _execute(list 8(first, second, third, fourth, fifth, sixth,157 return _execute(list(first, second, third, fourth, fifth, sixth, 158 158 seventh, eighth)); 159 159 } -
trunk/abcl/src/org/armedbear/lisp/Primitive1R.java
r11488 r11711 102 102 throws ConditionThrowable 103 103 { 104 return _execute(first, list 2(second, third));104 return _execute(first, list(second, third)); 105 105 } 106 106 … … 110 110 throws ConditionThrowable 111 111 { 112 return _execute(first, list 3(second, third, fourth));112 return _execute(first, list(second, third, fourth)); 113 113 } 114 114 … … 119 119 throws ConditionThrowable 120 120 { 121 return _execute(first, list 4(second, third, fourth, fifth));121 return _execute(first, list(second, third, fourth, fifth)); 122 122 } 123 123 … … 128 128 throws ConditionThrowable 129 129 { 130 return _execute(first, list 5(second, third, fourth, fifth, sixth));130 return _execute(first, list(second, third, fourth, fifth, sixth)); 131 131 } 132 132 … … 138 138 throws ConditionThrowable 139 139 { 140 return _execute(first, list 6(second, third, fourth, fifth, sixth,140 return _execute(first, list(second, third, fourth, fifth, sixth, 141 141 seventh)); 142 142 } … … 149 149 throws ConditionThrowable 150 150 { 151 return _execute(first, list 7(second, third, fourth, fifth, sixth,151 return _execute(first, list(second, third, fourth, fifth, sixth, 152 152 seventh, eighth)); 153 153 } -
trunk/abcl/src/org/armedbear/lisp/Primitive2R.java
r11488 r11711 104 104 throws ConditionThrowable 105 105 { 106 return _execute(first, second, list 2(third, fourth));106 return _execute(first, second, list(third, fourth)); 107 107 } 108 108 … … 113 113 throws ConditionThrowable 114 114 { 115 return _execute(first, second, list 3(third, fourth, fifth));115 return _execute(first, second, list(third, fourth, fifth)); 116 116 } 117 117 … … 122 122 throws ConditionThrowable 123 123 { 124 return _execute(first, second, list 4(third, fourth, fifth, sixth));124 return _execute(first, second, list(third, fourth, fifth, sixth)); 125 125 } 126 126 … … 132 132 throws ConditionThrowable 133 133 { 134 return _execute(first, second, list 5(third, fourth, fifth, sixth,134 return _execute(first, second, list(third, fourth, fifth, sixth, 135 135 seventh)); 136 136 } … … 143 143 throws ConditionThrowable 144 144 { 145 return _execute(first, second, list 6(third, fourth, fifth, sixth,145 return _execute(first, second, list(third, fourth, fifth, sixth, 146 146 seventh, eighth)); 147 147 } -
trunk/abcl/src/org/armedbear/lisp/Primitives.java
r11539 r11711 1517 1517 if (index < 0) 1518 1518 return type_error(first, 1519 list 2(Symbol.INTEGER, Fixnum.ZERO));1519 list(Symbol.INTEGER, Fixnum.ZERO)); 1520 1520 for (int i = 0; i < index; i++) 1521 1521 { … … 1833 1833 LispObject block = new Cons(Symbol.BLOCK, new Cons(symbol, body)); 1834 1834 LispObject toBeApplied = 1835 list 2(Symbol.FUNCTION, list3(Symbol.LAMBDA, lambdaList, block));1835 list(Symbol.FUNCTION, list(Symbol.LAMBDA, lambdaList, block)); 1836 1836 final LispThread thread = LispThread.currentThread(); 1837 1837 LispObject formArg = gensym("FORM-", thread); 1838 1838 LispObject envArg = gensym("ENV-", thread); // Ignored. 1839 1839 LispObject expander = 1840 list 3(Symbol.LAMBDA, list2(formArg, envArg),1841 list 3(Symbol.APPLY, toBeApplied,1842 list 2(Symbol.CDR, formArg)));1840 list(Symbol.LAMBDA, list(formArg, envArg), 1841 list(Symbol.APPLY, toBeApplied, 1842 list(Symbol.CDR, formArg))); 1843 1843 Closure expansionFunction = new Closure(expander, env); 1844 1844 MacroObject macroObject = … … 2551 2551 catch (ClassCastException e) 2552 2552 { 2553 return type_error(arg, list 3(Symbol.AND, Symbol.VECTOR,2554 list 2(Symbol.SATISFIES,2553 return type_error(arg, list(Symbol.AND, Symbol.VECTOR, 2554 list(Symbol.SATISFIES, 2555 2555 Symbol.ARRAY_HAS_FILL_POINTER_P))); 2556 2556 } … … 2577 2577 catch (ClassCastException e) 2578 2578 { 2579 return type_error(first, list 3(Symbol.AND, Symbol.VECTOR,2580 list 2(Symbol.SATISFIES,2579 return type_error(first, list(Symbol.AND, Symbol.VECTOR, 2580 list(Symbol.SATISFIES, 2581 2581 Symbol.ARRAY_HAS_FILL_POINTER_P))); 2582 2582 } … … 3193 3193 return gensym(arg.getStringValue(), LispThread.currentThread()); 3194 3194 return type_error(arg, 3195 list 3(Symbol.OR,3195 list(Symbol.OR, 3196 3196 Symbol.STRING, 3197 3197 Symbol.UNSIGNED_BYTE)); … … 3734 3734 new Cons(Symbol.BLOCK, new Cons(symbol, body)); 3735 3735 LispObject toBeApplied = 3736 list 3(Symbol.LAMBDA, lambdaList, block);3736 list(Symbol.LAMBDA, lambdaList, block); 3737 3737 final LispThread thread = LispThread.currentThread(); 3738 3738 LispObject formArg = gensym("WHOLE-", thread); 3739 3739 LispObject envArg = gensym("ENVIRONMENT-", thread); // Ignored. 3740 3740 LispObject expander = 3741 list 3(Symbol.LAMBDA, list2(formArg, envArg),3742 list 3(Symbol.APPLY, toBeApplied,3743 list 2(Symbol.CDR, formArg)));3741 list(Symbol.LAMBDA, list(formArg, envArg), 3742 list(Symbol.APPLY, toBeApplied, 3743 list(Symbol.CDR, formArg))); 3744 3744 return expander; 3745 3745 } … … 4884 4884 int size = Fixnum.getValue(first); 4885 4885 if (size < 0) 4886 return type_error(first, list 3(Symbol.INTEGER, Fixnum.ZERO,4886 return type_error(first, list(Symbol.INTEGER, Fixnum.ZERO, 4887 4887 Symbol.MOST_POSITIVE_FIXNUM.getSymbolValue())); 4888 4888 LispObject result = NIL; -
trunk/abcl/src/org/armedbear/lisp/RandomState.java
r11488 r11711 127 127 } 128 128 } 129 return type_error(arg, list 3(Symbol.OR,130 list 2(Symbol.INTEGER, Fixnum.ONE),131 list 2(Symbol.FLOAT, list1(Fixnum.ZERO))));129 return type_error(arg, list(Symbol.OR, 130 list(Symbol.INTEGER, Fixnum.ONE), 131 list(Symbol.FLOAT, list(Fixnum.ZERO)))); 132 132 } 133 133 -
trunk/abcl/src/org/armedbear/lisp/Readtable.java
r11698 r11711 581 581 return second; 582 582 } 583 return type_error(second, list 5(Symbol.MEMBER,583 return type_error(second, list(Symbol.MEMBER, 584 584 Keyword.INVERT, 585 585 Keyword.PRESERVE, -
trunk/abcl/src/org/armedbear/lisp/SimpleArray_T.java
r11562 r11711 154 154 public LispObject typeOf() 155 155 { 156 return list 3(Symbol.SIMPLE_ARRAY, elementType, getDimensions());156 return list(Symbol.SIMPLE_ARRAY, elementType, getDimensions()); 157 157 } 158 158 -
trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte16.java
r11562 r11711 125 125 public LispObject typeOf() 126 126 { 127 return list 3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_16, getDimensions());127 return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_16, getDimensions()); 128 128 } 129 129 … … 293 293 { 294 294 if (Symbol.PRINT_READABLY.symbolValue() != NIL) { 295 error(new PrintNotReadable(list 2(Keyword.OBJECT, this)));295 error(new PrintNotReadable(list(Keyword.OBJECT, this))); 296 296 // Not reached. 297 297 return null; -
trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte32.java
r11562 r11711 129 129 public LispObject typeOf() 130 130 { 131 return list 3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_32, getDimensions());131 return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_32, getDimensions()); 132 132 } 133 133 … … 283 283 { 284 284 if (Symbol.PRINT_READABLY.symbolValue() != NIL) { 285 error(new PrintNotReadable(list 2(Keyword.OBJECT, this)));285 error(new PrintNotReadable(list(Keyword.OBJECT, this))); 286 286 // Not reached. 287 287 return null; -
trunk/abcl/src/org/armedbear/lisp/SimpleArray_UnsignedByte8.java
r11562 r11711 125 125 public LispObject typeOf() 126 126 { 127 return list 3(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_8, getDimensions());127 return list(Symbol.SIMPLE_ARRAY, UNSIGNED_BYTE_8, getDimensions()); 128 128 } 129 129 … … 280 280 { 281 281 if (Symbol.PRINT_READABLY.symbolValue() != NIL) { 282 error(new PrintNotReadable(list 2(Keyword.OBJECT, this)));282 error(new PrintNotReadable(list(Keyword.OBJECT, this))); 283 283 // Not reached. 284 284 return null; -
trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java
r11562 r11711 66 66 public LispObject typeOf() 67 67 { 68 return list 2(Symbol.SIMPLE_BIT_VECTOR, new Fixnum(capacity));68 return list(Symbol.SIMPLE_BIT_VECTOR, new Fixnum(capacity)); 69 69 } 70 70 -
trunk/abcl/src/org/armedbear/lisp/SimpleString.java
r11587 r11711 98 98 public LispObject typeOf() 99 99 { 100 return list 2(Symbol.SIMPLE_BASE_STRING, new Fixnum(capacity));100 return list(Symbol.SIMPLE_BASE_STRING, new Fixnum(capacity)); 101 101 } 102 102 -
trunk/abcl/src/org/armedbear/lisp/SimpleTypeError.java
r11488 r11711 78 78 LispObject result = 79 79 Primitives.APPLY.execute(Symbol.FORMAT, 80 Primitives.APPEND.execute(list 2(NIL,80 Primitives.APPEND.execute(list(NIL, 81 81 formatControl), 82 82 formatArguments)); -
trunk/abcl/src/org/armedbear/lisp/SimpleVector.java
r11562 r11711 77 77 public LispObject typeOf() 78 78 { 79 return list 2(Symbol.SIMPLE_VECTOR, new Fixnum(capacity));79 return list(Symbol.SIMPLE_VECTOR, new Fixnum(capacity)); 80 80 } 81 81 -
trunk/abcl/src/org/armedbear/lisp/SingleFloat.java
r11579 r11711 586 586 if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL || 587 587 !memq(Symbol.READ_DEFAULT_FLOAT_FORMAT.symbolValue(thread), 588 list 2(Symbol.SINGLE_FLOAT, Symbol.SHORT_FLOAT)))588 list(Symbol.SINGLE_FLOAT, Symbol.SHORT_FLOAT))) 589 589 { 590 590 if (s1.indexOf('E') >= 0) -
trunk/abcl/src/org/armedbear/lisp/SlotDefinitionClass.java
r11391 r11711 48 48 public SlotDefinitionClass() 49 49 { 50 super(Symbol.SLOT_DEFINITION, list 1(StandardClass.STANDARD_OBJECT));50 super(Symbol.SLOT_DEFINITION, list(StandardClass.STANDARD_OBJECT)); 51 51 Package pkg = PACKAGE_SYS; 52 52 LispObject[] instanceSlotNames = { -
trunk/abcl/src/org/armedbear/lisp/SpecialOperators.java
r11548 r11711 392 392 new Cons(Symbol.LAMBDA, new Cons(parameters, body)); 393 393 LispObject lambda_name = 394 list 2(recursive ? Symbol.LABELS : Symbol.FLET, name);394 list(recursive ? Symbol.LABELS : Symbol.FLET, name); 395 395 Closure closure = 396 396 new Closure(lambda_name, lambda_expression, … … 535 535 } 536 536 } 537 return error(new UndefinedFunction(list 2(Keyword.NAME, arg)));537 return error(new UndefinedFunction(list(Keyword.NAME, arg))); 538 538 } 539 539 }; … … 567 567 LispObject expansion = 568 568 ((SymbolMacro)binding.value).getExpansion(); 569 LispObject form = list 3(Symbol.SETF, expansion, args.car());569 LispObject form = list(Symbol.SETF, expansion, args.car()); 570 570 value = eval(form, env, thread); 571 571 } … … 582 582 LispObject expansion = 583 583 ((SymbolMacro)symbol.getSymbolValue()).getExpansion(); 584 LispObject form = list 3(Symbol.SETF, expansion, args.car());584 LispObject form = list(Symbol.SETF, expansion, args.car()); 585 585 value = eval(form, env, thread); 586 586 } … … 602 602 LispObject expansion = 603 603 ((SymbolMacro)binding.value).getExpansion(); 604 LispObject form = list 3(Symbol.SETF, expansion, args.car());604 LispObject form = list(Symbol.SETF, expansion, args.car()); 605 605 value = eval(form, env, thread); 606 606 } … … 617 617 LispObject expansion = 618 618 ((SymbolMacro)symbol.getSymbolValue()).getExpansion(); 619 LispObject form = list 3(Symbol.SETF, expansion, args.car());619 LispObject form = list(Symbol.SETF, expansion, args.car()); 620 620 value = eval(form, env, thread); 621 621 } -
trunk/abcl/src/org/armedbear/lisp/StandardClass.java
r11590 r11711 78 78 new SimpleString("No layout for class ~S."), 79 79 Keyword.FORMAT_ARGUMENTS, 80 list 1(this));80 list(this)); 81 81 } 82 82 return new StandardObject(this, layout.getLength()); … … 109 109 // below. 110 110 public static final StandardClass STANDARD_CLASS = 111 addStandardClass(Symbol.STANDARD_CLASS, list 1(BuiltInClass.CLASS_T));111 addStandardClass(Symbol.STANDARD_CLASS, list(BuiltInClass.CLASS_T)); 112 112 public static final StandardClass STANDARD_OBJECT = 113 addStandardClass(Symbol.STANDARD_OBJECT, list 1(BuiltInClass.CLASS_T));113 addStandardClass(Symbol.STANDARD_OBJECT, list(BuiltInClass.CLASS_T)); 114 114 115 115 // BuiltInClass.FUNCTION is also null here (see previous comment). 116 116 public static final StandardClass GENERIC_FUNCTION = 117 addStandardClass(Symbol.GENERIC_FUNCTION, list 2(BuiltInClass.FUNCTION,117 addStandardClass(Symbol.GENERIC_FUNCTION, list(BuiltInClass.FUNCTION, 118 118 STANDARD_OBJECT)); 119 119 120 120 public static final StandardClass CLASS = 121 addStandardClass(Symbol.CLASS, list 1(STANDARD_OBJECT));121 addStandardClass(Symbol.CLASS, list(STANDARD_OBJECT)); 122 122 123 123 public static final StandardClass BUILT_IN_CLASS = 124 addStandardClass(Symbol.BUILT_IN_CLASS, list 1(CLASS));124 addStandardClass(Symbol.BUILT_IN_CLASS, list(CLASS)); 125 125 126 126 public static final StandardClass JAVA_CLASS = 127 addStandardClass(Symbol.JAVA_CLASS, list 1(CLASS));127 addStandardClass(Symbol.JAVA_CLASS, list(CLASS)); 128 128 129 129 public static final StandardClass FORWARD_REFERENCED_CLASS = 130 addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list 1(CLASS));130 addStandardClass(Symbol.FORWARD_REFERENCED_CLASS, list(CLASS)); 131 131 132 132 public static final StandardClass STRUCTURE_CLASS = 133 addStandardClass(Symbol.STRUCTURE_CLASS, list 1(CLASS));133 addStandardClass(Symbol.STRUCTURE_CLASS, list(CLASS)); 134 134 135 135 public static final StandardClass CONDITION = 136 addStandardClass(Symbol.CONDITION, list 1(STANDARD_OBJECT));136 addStandardClass(Symbol.CONDITION, list(STANDARD_OBJECT)); 137 137 138 138 public static final StandardClass SIMPLE_CONDITION = 139 addStandardClass(Symbol.SIMPLE_CONDITION, list 1(CONDITION));139 addStandardClass(Symbol.SIMPLE_CONDITION, list(CONDITION)); 140 140 141 141 public static final StandardClass WARNING = 142 addStandardClass(Symbol.WARNING, list 1(CONDITION));142 addStandardClass(Symbol.WARNING, list(CONDITION)); 143 143 144 144 public static final StandardClass SIMPLE_WARNING = 145 addStandardClass(Symbol.SIMPLE_WARNING, list 2(SIMPLE_CONDITION, WARNING));145 addStandardClass(Symbol.SIMPLE_WARNING, list(SIMPLE_CONDITION, WARNING)); 146 146 147 147 public static final StandardClass STYLE_WARNING = 148 addStandardClass(Symbol.STYLE_WARNING, list 1(WARNING));148 addStandardClass(Symbol.STYLE_WARNING, list(WARNING)); 149 149 150 150 public static final StandardClass SERIOUS_CONDITION = 151 addStandardClass(Symbol.SERIOUS_CONDITION, list 1(CONDITION));151 addStandardClass(Symbol.SERIOUS_CONDITION, list(CONDITION)); 152 152 153 153 public static final StandardClass STORAGE_CONDITION = 154 addStandardClass(Symbol.STORAGE_CONDITION, list 1(SERIOUS_CONDITION));154 addStandardClass(Symbol.STORAGE_CONDITION, list(SERIOUS_CONDITION)); 155 155 156 156 public static final StandardClass ERROR = 157 addStandardClass(Symbol.ERROR, list 1(SERIOUS_CONDITION));157 addStandardClass(Symbol.ERROR, list(SERIOUS_CONDITION)); 158 158 159 159 public static final StandardClass ARITHMETIC_ERROR = 160 addStandardClass(Symbol.ARITHMETIC_ERROR, list 1(ERROR));160 addStandardClass(Symbol.ARITHMETIC_ERROR, list(ERROR)); 161 161 162 162 public static final StandardClass CELL_ERROR = 163 addStandardClass(Symbol.CELL_ERROR, list 1(ERROR));163 addStandardClass(Symbol.CELL_ERROR, list(ERROR)); 164 164 165 165 public static final StandardClass CONTROL_ERROR = 166 addStandardClass(Symbol.CONTROL_ERROR, list 1(ERROR));166 addStandardClass(Symbol.CONTROL_ERROR, list(ERROR)); 167 167 168 168 public static final StandardClass FILE_ERROR = 169 addStandardClass(Symbol.FILE_ERROR, list 1(ERROR));169 addStandardClass(Symbol.FILE_ERROR, list(ERROR)); 170 170 171 171 public static final StandardClass DIVISION_BY_ZERO = 172 addStandardClass(Symbol.DIVISION_BY_ZERO, list 1(ARITHMETIC_ERROR));172 addStandardClass(Symbol.DIVISION_BY_ZERO, list(ARITHMETIC_ERROR)); 173 173 174 174 public static final StandardClass FLOATING_POINT_INEXACT = 175 addStandardClass(Symbol.FLOATING_POINT_INEXACT, list 1(ARITHMETIC_ERROR));175 addStandardClass(Symbol.FLOATING_POINT_INEXACT, list(ARITHMETIC_ERROR)); 176 176 177 177 public static final StandardClass FLOATING_POINT_INVALID_OPERATION = 178 addStandardClass(Symbol.FLOATING_POINT_INVALID_OPERATION, list 1(ARITHMETIC_ERROR));178 addStandardClass(Symbol.FLOATING_POINT_INVALID_OPERATION, list(ARITHMETIC_ERROR)); 179 179 180 180 public static final StandardClass FLOATING_POINT_OVERFLOW = 181 addStandardClass(Symbol.FLOATING_POINT_OVERFLOW, list 1(ARITHMETIC_ERROR));181 addStandardClass(Symbol.FLOATING_POINT_OVERFLOW, list(ARITHMETIC_ERROR)); 182 182 183 183 public static final StandardClass FLOATING_POINT_UNDERFLOW = 184 addStandardClass(Symbol.FLOATING_POINT_UNDERFLOW, list 1(ARITHMETIC_ERROR));184 addStandardClass(Symbol.FLOATING_POINT_UNDERFLOW, list(ARITHMETIC_ERROR)); 185 185 186 186 public static final StandardClass PROGRAM_ERROR = 187 addStandardClass(Symbol.PROGRAM_ERROR, list 1(ERROR));187 addStandardClass(Symbol.PROGRAM_ERROR, list(ERROR)); 188 188 189 189 public static final StandardClass PACKAGE_ERROR = 190 addStandardClass(Symbol.PACKAGE_ERROR, list 1(ERROR));190 addStandardClass(Symbol.PACKAGE_ERROR, list(ERROR)); 191 191 192 192 public static final StandardClass STREAM_ERROR = 193 addStandardClass(Symbol.STREAM_ERROR, list 1(ERROR));193 addStandardClass(Symbol.STREAM_ERROR, list(ERROR)); 194 194 195 195 public static final StandardClass PARSE_ERROR = 196 addStandardClass(Symbol.PARSE_ERROR, list 1(ERROR));196 addStandardClass(Symbol.PARSE_ERROR, list(ERROR)); 197 197 198 198 public static final StandardClass PRINT_NOT_READABLE = 199 addStandardClass(Symbol.PRINT_NOT_READABLE, list 1(ERROR));199 addStandardClass(Symbol.PRINT_NOT_READABLE, list(ERROR)); 200 200 201 201 public static final StandardClass READER_ERROR = 202 addStandardClass(Symbol.READER_ERROR, list 2(PARSE_ERROR, STREAM_ERROR));202 addStandardClass(Symbol.READER_ERROR, list(PARSE_ERROR, STREAM_ERROR)); 203 203 204 204 public static final StandardClass END_OF_FILE = 205 addStandardClass(Symbol.END_OF_FILE, list 1(STREAM_ERROR));205 addStandardClass(Symbol.END_OF_FILE, list(STREAM_ERROR)); 206 206 207 207 public static final StandardClass SIMPLE_ERROR = 208 addStandardClass(Symbol.SIMPLE_ERROR, list 2(SIMPLE_CONDITION, ERROR));208 addStandardClass(Symbol.SIMPLE_ERROR, list(SIMPLE_CONDITION, ERROR)); 209 209 210 210 public static final StandardClass TYPE_ERROR = 211 addStandardClass(Symbol.TYPE_ERROR, list 1(ERROR));211 addStandardClass(Symbol.TYPE_ERROR, list(ERROR)); 212 212 213 213 public static final StandardClass SIMPLE_TYPE_ERROR = 214 addStandardClass(Symbol.SIMPLE_TYPE_ERROR, list 2(SIMPLE_CONDITION,214 addStandardClass(Symbol.SIMPLE_TYPE_ERROR, list(SIMPLE_CONDITION, 215 215 TYPE_ERROR)); 216 216 217 217 public static final StandardClass UNBOUND_SLOT = 218 addStandardClass(Symbol.UNBOUND_SLOT, list 1(CELL_ERROR));218 addStandardClass(Symbol.UNBOUND_SLOT, list(CELL_ERROR)); 219 219 220 220 public static final StandardClass UNBOUND_VARIABLE = 221 addStandardClass(Symbol.UNBOUND_VARIABLE, list 1(CELL_ERROR));221 addStandardClass(Symbol.UNBOUND_VARIABLE, list(CELL_ERROR)); 222 222 223 223 public static final StandardClass UNDEFINED_FUNCTION = 224 addStandardClass(Symbol.UNDEFINED_FUNCTION, list 1(CELL_ERROR));224 addStandardClass(Symbol.UNDEFINED_FUNCTION, list(CELL_ERROR)); 225 225 226 226 public static final StandardClass COMPILER_ERROR = 227 addStandardClass(Symbol.COMPILER_ERROR, list 1(CONDITION));227 addStandardClass(Symbol.COMPILER_ERROR, list(CONDITION)); 228 228 229 229 public static final StandardClass COMPILER_UNSUPPORTED_FEATURE_ERROR = 230 230 addStandardClass(Symbol.COMPILER_UNSUPPORTED_FEATURE_ERROR, 231 list 1(CONDITION));231 list(CONDITION)); 232 232 233 233 public static final StandardClass JAVA_EXCEPTION = 234 addStandardClass(Symbol.JAVA_EXCEPTION, list 1(ERROR));234 addStandardClass(Symbol.JAVA_EXCEPTION, list(ERROR)); 235 235 236 236 public static final StandardClass METHOD = 237 addStandardClass(Symbol.METHOD, list 1(STANDARD_OBJECT));237 addStandardClass(Symbol.METHOD, list(STANDARD_OBJECT)); 238 238 239 239 public static final StandardClass STANDARD_METHOD = … … 272 272 STANDARD_CLASS.setDirectSuperclass(CLASS); 273 273 STANDARD_OBJECT.setDirectSuperclass(BuiltInClass.CLASS_T); 274 GENERIC_FUNCTION.setDirectSuperclasses(list 2(BuiltInClass.FUNCTION,274 GENERIC_FUNCTION.setDirectSuperclasses(list(BuiltInClass.FUNCTION, 275 275 STANDARD_OBJECT)); 276 276 … … 278 278 CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T); 279 279 ARITHMETIC_ERROR.setDirectSlotDefinitions( 280 list 2(new SlotDefinition(Symbol.OPERATION,281 list 1(PACKAGE_CL.intern("ARITHMETIC-ERROR-OPERATION"))),280 list(new SlotDefinition(Symbol.OPERATION, 281 list(PACKAGE_CL.intern("ARITHMETIC-ERROR-OPERATION"))), 282 282 new SlotDefinition(Symbol.OPERANDS, 283 list 1(PACKAGE_CL.intern("ARITHMETIC-ERROR-OPERANDS")))));283 list(PACKAGE_CL.intern("ARITHMETIC-ERROR-OPERANDS"))))); 284 284 BUILT_IN_CLASS.setCPL(BUILT_IN_CLASS, CLASS, STANDARD_OBJECT, 285 285 BuiltInClass.CLASS_T); … … 289 289 STANDARD_OBJECT, BuiltInClass.CLASS_T); 290 290 CELL_ERROR.setDirectSlotDefinitions( 291 list 1(new SlotDefinition(Symbol.NAME,292 list 1(Symbol.CELL_ERROR_NAME))));291 list(new SlotDefinition(Symbol.NAME, 292 list(Symbol.CELL_ERROR_NAME)))); 293 293 CLASS.setCPL(CLASS, STANDARD_OBJECT, BuiltInClass.CLASS_T); 294 294 COMPILER_ERROR.setCPL(COMPILER_ERROR, CONDITION, STANDARD_OBJECT, … … 299 299 CONDITION.setCPL(CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T); 300 300 CONDITION.setDirectSlotDefinitions( 301 list 2(new SlotDefinition(Symbol.FORMAT_CONTROL,302 list 1(Symbol.SIMPLE_CONDITION_FORMAT_CONTROL)),301 list(new SlotDefinition(Symbol.FORMAT_CONTROL, 302 list(Symbol.SIMPLE_CONDITION_FORMAT_CONTROL)), 303 303 new SlotDefinition(Symbol.FORMAT_ARGUMENTS, 304 list 1(Symbol.SIMPLE_CONDITION_FORMAT_ARGUMENTS),304 list(Symbol.SIMPLE_CONDITION_FORMAT_ARGUMENTS), 305 305 NIL))); 306 CONDITION.setDirectDefaultInitargs(list 2(Keyword.FORMAT_ARGUMENTS,306 CONDITION.setDirectDefaultInitargs(list(Keyword.FORMAT_ARGUMENTS, 307 307 // FIXME 308 new Closure(list 3(Symbol.LAMBDA, NIL, NIL),308 new Closure(list(Symbol.LAMBDA, NIL, NIL), 309 309 new Environment()))); 310 310 CONTROL_ERROR.setCPL(CONTROL_ERROR, ERROR, SERIOUS_CONDITION, CONDITION, … … 320 320 STANDARD_OBJECT, BuiltInClass.CLASS_T); 321 321 FILE_ERROR.setDirectSlotDefinitions( 322 list 1(new SlotDefinition(Symbol.PATHNAME,323 list 1(PACKAGE_CL.intern("FILE-ERROR-PATHNAME")))));322 list(new SlotDefinition(Symbol.PATHNAME, 323 list(PACKAGE_CL.intern("FILE-ERROR-PATHNAME"))))); 324 324 FLOATING_POINT_INEXACT.setCPL(FLOATING_POINT_INEXACT, ARITHMETIC_ERROR, 325 325 ERROR, SERIOUS_CONDITION, CONDITION, … … 343 343 STANDARD_OBJECT, BuiltInClass.CLASS_T); 344 344 JAVA_EXCEPTION.setDirectSlotDefinitions( 345 list 1(new SlotDefinition(Symbol.CAUSE, list1(Symbol.JAVA_EXCEPTION_CAUSE))));345 list(new SlotDefinition(Symbol.CAUSE, list(Symbol.JAVA_EXCEPTION_CAUSE)))); 346 346 METHOD.setCPL(METHOD, STANDARD_OBJECT, BuiltInClass.CLASS_T); 347 347 PACKAGE_ERROR.setCPL(PACKAGE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION, 348 348 STANDARD_OBJECT, BuiltInClass.CLASS_T); 349 349 PACKAGE_ERROR.setDirectSlotDefinitions( 350 list 1(new SlotDefinition(Symbol.PACKAGE,351 list 1(PACKAGE_CL.intern("PACKAGE-ERROR-PACKAGE")))));350 list(new SlotDefinition(Symbol.PACKAGE, 351 list(PACKAGE_CL.intern("PACKAGE-ERROR-PACKAGE"))))); 352 352 PARSE_ERROR.setCPL(PARSE_ERROR, ERROR, SERIOUS_CONDITION, CONDITION, 353 353 STANDARD_OBJECT, BuiltInClass.CLASS_T); … … 355 355 CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T); 356 356 PRINT_NOT_READABLE.setDirectSlotDefinitions( 357 list 1(new SlotDefinition(Symbol.OBJECT,358 list 1(PACKAGE_CL.intern("PRINT-NOT-READABLE-OBJECT")))));357 list(new SlotDefinition(Symbol.OBJECT, 358 list(PACKAGE_CL.intern("PRINT-NOT-READABLE-OBJECT"))))); 359 359 PROGRAM_ERROR.setCPL(PROGRAM_ERROR, ERROR, SERIOUS_CONDITION, CONDITION, 360 360 STANDARD_OBJECT, BuiltInClass.CLASS_T); … … 369 369 SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT, 370 370 BuiltInClass.CLASS_T); 371 SIMPLE_TYPE_ERROR.setDirectSuperclasses(list 2(SIMPLE_CONDITION,371 SIMPLE_TYPE_ERROR.setDirectSuperclasses(list(SIMPLE_CONDITION, 372 372 TYPE_ERROR)); 373 373 SIMPLE_TYPE_ERROR.setCPL(SIMPLE_TYPE_ERROR, SIMPLE_CONDITION, 374 374 TYPE_ERROR, ERROR, SERIOUS_CONDITION, 375 375 CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T); 376 SIMPLE_WARNING.setDirectSuperclasses(list 2(SIMPLE_CONDITION, WARNING));376 SIMPLE_WARNING.setDirectSuperclasses(list(SIMPLE_CONDITION, WARNING)); 377 377 SIMPLE_WARNING.setCPL(SIMPLE_WARNING, SIMPLE_CONDITION, WARNING, 378 378 CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T); … … 385 385 STANDARD_OBJECT, BuiltInClass.CLASS_T); 386 386 STREAM_ERROR.setDirectSlotDefinitions( 387 list 1(new SlotDefinition(Symbol.STREAM,388 list 1(PACKAGE_CL.intern("STREAM-ERROR-STREAM")))));387 list(new SlotDefinition(Symbol.STREAM, 388 list(PACKAGE_CL.intern("STREAM-ERROR-STREAM"))))); 389 389 STRUCTURE_CLASS.setCPL(STRUCTURE_CLASS, CLASS, STANDARD_OBJECT, 390 390 BuiltInClass.CLASS_T); … … 394 394 STANDARD_OBJECT, BuiltInClass.CLASS_T); 395 395 TYPE_ERROR.setDirectSlotDefinitions( 396 list 2(new SlotDefinition(Symbol.DATUM,397 list 1(PACKAGE_CL.intern("TYPE-ERROR-DATUM"))),396 list(new SlotDefinition(Symbol.DATUM, 397 list(PACKAGE_CL.intern("TYPE-ERROR-DATUM"))), 398 398 new SlotDefinition(Symbol.EXPECTED_TYPE, 399 list 1(PACKAGE_CL.intern("TYPE-ERROR-EXPECTED-TYPE")))));399 list(PACKAGE_CL.intern("TYPE-ERROR-EXPECTED-TYPE"))))); 400 400 UNBOUND_SLOT.setCPL(UNBOUND_SLOT, CELL_ERROR, ERROR, SERIOUS_CONDITION, 401 401 CONDITION, STANDARD_OBJECT, BuiltInClass.CLASS_T); 402 402 UNBOUND_SLOT.setDirectSlotDefinitions( 403 list 1(new SlotDefinition(Symbol.INSTANCE,404 list 1(PACKAGE_CL.intern("UNBOUND-SLOT-INSTANCE")))));403 list(new SlotDefinition(Symbol.INSTANCE, 404 list(PACKAGE_CL.intern("UNBOUND-SLOT-INSTANCE"))))); 405 405 UNBOUND_VARIABLE.setCPL(UNBOUND_VARIABLE, CELL_ERROR, ERROR, 406 406 SERIOUS_CONDITION, CONDITION, STANDARD_OBJECT, … … 469 469 STANDARD_READER_METHOD.setSlotDefinitions(STANDARD_READER_METHOD.getClassLayout().generateSlotDefinitions()); 470 470 // All but the last slot are inherited. 471 STANDARD_READER_METHOD.setDirectSlotDefinitions(list 1(STANDARD_READER_METHOD.getSlotDefinitions().reverse().car()));471 STANDARD_READER_METHOD.setDirectSlotDefinitions(list(STANDARD_READER_METHOD.getSlotDefinitions().reverse().car())); 472 472 473 473 // STANDARD-GENERIC-FUNCTION -
trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java
r11698 r11711 76 76 new StandardMethod(this, function, lambdaList, specializers); 77 77 slots[StandardGenericFunctionClass.SLOT_INDEX_METHODS] = 78 list 1(method);78 list(method); 79 79 slots[StandardGenericFunctionClass.SLOT_INDEX_METHOD_CLASS] = 80 80 StandardClass.STANDARD_METHOD; … … 826 826 true, 827 827 _GENERIC_FUNCTION_NAME, 828 list 1(Symbol.GENERIC_FUNCTION),829 list 1(StandardClass.STANDARD_GENERIC_FUNCTION));828 list(Symbol.GENERIC_FUNCTION), 829 list(StandardClass.STANDARD_GENERIC_FUNCTION)); 830 830 831 831 private static class CacheEntry -
trunk/abcl/src/org/armedbear/lisp/StandardGenericFunctionClass.java
r11488 r11711 50 50 { 51 51 super(Symbol.STANDARD_GENERIC_FUNCTION, 52 list 1(StandardClass.GENERIC_FUNCTION));52 list(StandardClass.GENERIC_FUNCTION)); 53 53 Package pkg = PACKAGE_SYS; 54 54 LispObject[] instanceSlotNames = -
trunk/abcl/src/org/armedbear/lisp/StandardMethod.java
r11488 r11711 384 384 true, 385 385 _METHOD_SPECIALIZERS, 386 list 1(Symbol.METHOD),387 list 1(StandardClass.STANDARD_METHOD));386 list(Symbol.METHOD), 387 list(StandardClass.STANDARD_METHOD)); 388 388 389 389 private static final StandardGenericFunction METHOD_QUALIFIERS = … … 392 392 true, 393 393 _METHOD_QUALIFIERS, 394 list 1(Symbol.METHOD),395 list 1(StandardClass.STANDARD_METHOD));394 list(Symbol.METHOD), 395 list(StandardClass.STANDARD_METHOD)); 396 396 397 397 } -
trunk/abcl/src/org/armedbear/lisp/StandardMethodClass.java
r11488 r11711 46 46 public StandardMethodClass() 47 47 { 48 super(Symbol.STANDARD_METHOD, list 1(StandardClass.METHOD));48 super(Symbol.STANDARD_METHOD, list(StandardClass.METHOD)); 49 49 Package pkg = PACKAGE_SYS; 50 50 LispObject[] instanceSlotNames = -
trunk/abcl/src/org/armedbear/lisp/StandardObject.java
r11488 r11711 400 400 { 401 401 return type_error(second, 402 list 3(Symbol.INTEGER, Fixnum.ZERO,402 list(Symbol.INTEGER, Fixnum.ZERO, 403 403 new Fixnum(instance.slots.length))); 404 404 } … … 411 411 { 412 412 return type_error(second, 413 list 3(Symbol.INTEGER, Fixnum.ZERO,413 list(Symbol.INTEGER, Fixnum.ZERO, 414 414 new Fixnum(instance.slots.length))); 415 415 } -
trunk/abcl/src/org/armedbear/lisp/StandardReaderMethodClass.java
r11488 r11711 51 51 { 52 52 super(Symbol.STANDARD_READER_METHOD, 53 list 1(StandardClass.STANDARD_READER_METHOD));53 list(StandardClass.STANDARD_READER_METHOD)); 54 54 Package pkg = PACKAGE_SYS; 55 55 LispObject[] instanceSlotNames = -
trunk/abcl/src/org/armedbear/lisp/Stream.java
r11698 r11711 2925 2925 int end = Fixnum.getValue(fourth); 2926 2926 if (!v.getElementType().equal(UNSIGNED_BYTE_8)) 2927 return type_error(first, list 2(Symbol.VECTOR,2927 return type_error(first, list(Symbol.VECTOR, 2928 2928 UNSIGNED_BYTE_8)); 2929 2929 for (int i = start; i < end; i++) -
trunk/abcl/src/org/armedbear/lisp/Symbol.java
r11698 r11711 362 362 LispObject obj = get(this, Symbol.SETF_FUNCTION, null); 363 363 if (obj == null) 364 error(new UndefinedFunction(list 2(Keyword.NAME,365 list 2(Symbol.SETF,364 error(new UndefinedFunction(list(Keyword.NAME, 365 list(Symbol.SETF, 366 366 this)))); 367 367 return obj; … … 735 735 catch (NullPointerException e) 736 736 { 737 return handleNPE(e, list 1(arg));737 return handleNPE(e, list(arg)); 738 738 } 739 739 } … … 749 749 catch (NullPointerException e) 750 750 { 751 return handleNPE(e, list 2(first, second));751 return handleNPE(e, list(first, second)); 752 752 } 753 753 } … … 764 764 catch (NullPointerException e) 765 765 { 766 return handleNPE(e, list 3(first, second, third));766 return handleNPE(e, list(first, second, third)); 767 767 } 768 768 } … … 779 779 catch (NullPointerException e) 780 780 { 781 return handleNPE(e, list 4(first, second, third, fourth));781 return handleNPE(e, list(first, second, third, fourth)); 782 782 } 783 783 } … … 795 795 catch (NullPointerException e) 796 796 { 797 return handleNPE(e, list 5(first, second, third, fourth, fifth));797 return handleNPE(e, list(first, second, third, fourth, fifth)); 798 798 } 799 799 } … … 811 811 catch (NullPointerException e) 812 812 { 813 return handleNPE(e, list 6(first, second, third, fourth, fifth,813 return handleNPE(e, list(first, second, third, fourth, fifth, 814 814 sixth)); 815 815 } … … 831 831 { 832 832 return handleNPE(e, 833 list 7(first, second, third, fourth, fifth, sixth,833 list(first, second, third, fourth, fifth, sixth, 834 834 seventh)); 835 835 } … … 851 851 { 852 852 return handleNPE(e, 853 list 8(first, second, third, fourth, fifth, sixth,853 list(first, second, third, fourth, fifth, sixth, 854 854 seventh, eighth)); 855 855 } -
trunk/abcl/src/org/armedbear/lisp/TwoWayStream.java
r11488 r11711 60 60 if (itype.equal(otype)) 61 61 return itype; 62 return list 3(Symbol.AND, itype, otype);62 return list(Symbol.AND, itype, otype); 63 63 } 64 64 … … 240 240 } 241 241 if (!in.isInputStream()) 242 return type_error(in, list 2(Symbol.SATISFIES,242 return type_error(in, list(Symbol.SATISFIES, 243 243 Symbol.INPUT_STREAM_P)); 244 244 if (!out.isOutputStream()) 245 return type_error(out, list 2(Symbol.SATISFIES,245 return type_error(out, list(Symbol.SATISFIES, 246 246 Symbol.OUTPUT_STREAM_P)); 247 247 return new TwoWayStream(in, out); -
trunk/abcl/src/org/armedbear/lisp/ZeroRankArray.java
r11562 r11711 53 53 { 54 54 if (adjustable) 55 return list 3(Symbol.ARRAY, elementType, NIL);55 return list(Symbol.ARRAY, elementType, NIL); 56 56 else 57 return list 3(Symbol.SIMPLE_ARRAY, elementType, NIL);57 return list(Symbol.SIMPLE_ARRAY, elementType, NIL); 58 58 } 59 59 … … 139 139 if (printReadably) { 140 140 if (elementType != T) { 141 error(new PrintNotReadable(list 2(Keyword.OBJECT, this)));141 error(new PrintNotReadable(list(Keyword.OBJECT, this))); 142 142 // Not reached. 143 143 return null;
Note: See TracChangeset
for help on using the changeset viewer.