Changeset 12431
- Timestamp:
- 02/08/10 08:05:15 (11 years ago)
- Location:
- trunk/abcl
- Files:
-
- 2 deleted
- 45 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/abcl/src/org/armedbear/lisp/AbstractString.java
r12288 r12431 97 97 Symbol.PRINT_READABLY.symbolValue(thread) != NIL) 98 98 { 99 FastStringBuffer sb = new FastStringBuffer('"');99 StringBuilder sb = new StringBuilder("\""); 100 100 for (int i = beginIndex; i < endIndex; i++) { 101 101 char c = charAt(i); -
trunk/abcl/src/org/armedbear/lisp/AbstractVector.java
r12298 r12431 152 152 protected void badIndex(int index, int limit) 153 153 { 154 FastStringBuffer sb = new FastStringBuffer("Invalid array index ");154 StringBuilder sb = new StringBuilder("Invalid array index "); 155 155 sb.append(index); 156 156 sb.append(" for "); … … 210 210 if (Symbol.PRINT_READABLY.symbolValue(thread) != NIL) 211 211 { 212 FastStringBuffer sb = new FastStringBuffer("#(");212 StringBuilder sb = new StringBuilder("#("); 213 213 final int limit = length(); 214 214 for (int i = 0; i < limit; i++) -
trunk/abcl/src/org/armedbear/lisp/BuiltInClass.java
r12380 r12431 74 74 public String writeToString() 75 75 { 76 FastStringBuffer sb = new FastStringBuffer("#<BUILT-IN-CLASS ");76 StringBuilder sb = new StringBuilder("#<BUILT-IN-CLASS "); 77 77 sb.append(symbol.writeToString()); 78 78 sb.append('>'); -
trunk/abcl/src/org/armedbear/lisp/Complex.java
r12288 r12431 337 337 public String writeToString() 338 338 { 339 FastStringBuffer sb = new FastStringBuffer("#C(");339 StringBuilder sb = new StringBuilder("#C("); 340 340 sb.append(realpart.writeToString()); 341 341 sb.append(' '); -
trunk/abcl/src/org/armedbear/lisp/Cons.java
r12288 r12431 577 577 else 578 578 maxLevel = Integer.MAX_VALUE; 579 FastStringBuffer sb = new FastStringBuffer();579 StringBuilder sb = new StringBuilder(); 580 580 if (car == Symbol.QUOTE) 581 581 { -
trunk/abcl/src/org/armedbear/lisp/DoubleFloat.java
r12288 r12431 573 573 { 574 574 if (value == Double.POSITIVE_INFINITY) { 575 FastStringBuffer sb = new FastStringBuffer("#.");575 StringBuilder sb = new StringBuilder("#."); 576 576 sb.append(Symbol.DOUBLE_FLOAT_POSITIVE_INFINITY.writeToString()); 577 577 return sb.toString(); 578 578 } 579 579 if (value == Double.NEGATIVE_INFINITY) { 580 FastStringBuffer sb = new FastStringBuffer("#.");580 StringBuilder sb = new StringBuilder("#."); 581 581 sb.append(Symbol.DOUBLE_FLOAT_NEGATIVE_INFINITY.writeToString()); 582 582 return sb.toString(); -
trunk/abcl/src/org/armedbear/lisp/FaslReader.java
r12290 r12431 74 74 { 75 75 final Readtable rt = FaslReadtable.getInstance(); 76 FastStringBuffer sb = new FastStringBuffer();76 StringBuilder sb = new StringBuilder(); 77 77 try 78 78 { … … 223 223 final boolean suppress = 224 224 (Symbol.READ_SUPPRESS.symbolValue(thread) != NIL); 225 FastStringBuffer sb = new FastStringBuffer();225 StringBuilder sb = new StringBuilder(); 226 226 try 227 227 { … … 475 475 476 476 { 477 FastStringBuffer sb =478 new FastStringBuffer("Illegal # macro character: #\\");477 StringBuilder sb = 478 new StringBuilder("Illegal # macro character: #\\"); 479 479 String s = LispCharacter.charToName(c); 480 480 if (s != null) -
trunk/abcl/src/org/armedbear/lisp/Fixnum.java
r12288 r12431 947 947 if (Symbol.PRINT_RADIX.symbolValue(thread) != NIL) 948 948 { 949 FastStringBuffer sb = new FastStringBuffer();949 StringBuilder sb = new StringBuilder(); 950 950 switch (base) 951 951 { -
trunk/abcl/src/org/armedbear/lisp/HashTable.java
r12288 r12431 235 235 return null; // Not reached. 236 236 } 237 FastStringBuffer sb = new FastStringBuffer(getTest().writeToString());237 StringBuilder sb = new StringBuilder(getTest().writeToString()); 238 238 sb.append(' '); 239 239 sb.append(Symbol.HASH_TABLE.writeToString()); -
trunk/abcl/src/org/armedbear/lisp/Interpreter.java
r12422 r12431 260 260 final String separator = 261 261 System.getProperty("line.separator"); 262 FastStringBuffer sb = new FastStringBuffer();262 StringBuilder sb = new StringBuilder(); 263 263 sb.append(separator); 264 264 sb.append("Caught "); … … 542 542 { 543 543 final String sep = System.getProperty("line.separator"); 544 FastStringBuffer sb = new FastStringBuffer("Armed Bear Common Lisp ");544 StringBuilder sb = new StringBuilder("Armed Bear Common Lisp "); 545 545 sb.append(Version.getVersion()); 546 546 if (build != null) { -
trunk/abcl/src/org/armedbear/lisp/Java.java
r12351 r12431 324 324 } 325 325 catch (NoSuchMethodException e) { 326 FastStringBuffer sb = new FastStringBuffer("No such method: ");326 StringBuilder sb = new StringBuilder("No such method: "); 327 327 sb.append(c.getName()); 328 328 sb.append('.'); -
trunk/abcl/src/org/armedbear/lisp/JavaClass.java
r12429 r12431 97 97 98 98 public String writeToString() { 99 FastStringBuffer sb = new FastStringBuffer("#<JAVA-CLASS ");99 StringBuilder sb = new StringBuilder("#<JAVA-CLASS "); 100 100 sb.append(javaClass.getCanonicalName()); 101 101 sb.append('>'); -
trunk/abcl/src/org/armedbear/lisp/JavaObject.java
r12353 r12431 304 304 if(obj != null) { 305 305 Class<?> c = obj.getClass(); 306 FastStringBuffer sb307 = new FastStringBuffer(c.isArray() ? "jarray" : c.getName());306 StringBuilder sb 307 = new StringBuilder(c.isArray() ? "jarray" : c.getName()); 308 308 sb.append(' '); 309 309 String ts = obj.toString(); … … 437 437 { 438 438 final Object obj = javaObject.getObject(); 439 final FastStringBuffer sb =440 new FastStringBuffer(javaObject.writeToString());439 final StringBuilder sb = 440 new StringBuilder(javaObject.writeToString()); 441 441 sb.append(" is an object of type "); 442 442 sb.append(Symbol.JAVA_OBJECT.writeToString()); -
trunk/abcl/src/org/armedbear/lisp/Lisp.java
r12422 r12431 1064 1064 1065 1065 { 1066 FastStringBuffer sb = new FastStringBuffer(prefix);1066 StringBuilder sb = new StringBuilder(prefix); 1067 1067 SpecialBinding binding = thread.getSpecialBinding(Symbol.GENSYM_COUNTER); 1068 1068 final LispObject oldValue; … … 1677 1677 if (start < 0 || end < 0 || start > end || end > length) 1678 1678 { 1679 FastStringBuffer sb = new FastStringBuffer("The bounding indices ");1679 StringBuilder sb = new StringBuilder("The bounding indices "); 1680 1680 sb.append(start); 1681 1681 sb.append(" and "); -
trunk/abcl/src/org/armedbear/lisp/LispCharacter.java
r12288 r12431 97 97 public LispObject getDescription() 98 98 { 99 FastStringBuffer sb = new FastStringBuffer("character #\\");99 StringBuilder sb = new StringBuilder("character #\\"); 100 100 sb.append(value); 101 101 sb.append(" char-code #x"); … … 241 241 boolean printEscape = 242 242 printReadably || (Symbol.PRINT_ESCAPE.symbolValue(thread) != NIL); 243 FastStringBuffer sb = new FastStringBuffer();243 StringBuilder sb = new StringBuilder(); 244 244 if (printEscape) 245 245 { -
trunk/abcl/src/org/armedbear/lisp/LispClass.java
r12356 r12431 78 78 if (errorp) 79 79 { 80 FastStringBuffer sb =81 new FastStringBuffer("There is no class named ");80 StringBuilder sb = 81 new StringBuilder("There is no class named "); 82 82 sb.append(name.writeToString()); 83 83 sb.append('.'); -
trunk/abcl/src/org/armedbear/lisp/LispObject.java
r12311 r12431 65 65 public LispObject getDescription() 66 66 { 67 FastStringBuffer sb = new FastStringBuffer("An object of type ");67 StringBuilder sb = new StringBuilder("An object of type "); 68 68 sb.append(typeOf().writeToString()); 69 69 sb.append(" at #x"); … … 683 683 public String unreadableString(String s, boolean identity) 684 684 { 685 FastStringBuffer sb = new FastStringBuffer("#<");685 StringBuilder sb = new StringBuilder("#<"); 686 686 sb.append(s); 687 687 if (identity) { -
trunk/abcl/src/org/armedbear/lisp/LispReader.java
r12328 r12431 75 75 final LispThread thread = LispThread.currentThread(); 76 76 final Readtable rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread); 77 FastStringBuffer sb = new FastStringBuffer();77 StringBuilder sb = new StringBuilder(); 78 78 try 79 79 { … … 223 223 final Readtable rt = (Readtable) Symbol.CURRENT_READTABLE.symbolValue(thread); 224 224 final boolean suppress = Symbol.READ_SUPPRESS.symbolValue(thread) != NIL; 225 FastStringBuffer sb = new FastStringBuffer();225 StringBuilder sb = new StringBuilder(); 226 226 try 227 227 { … … 468 468 469 469 { 470 FastStringBuffer sb = new FastStringBuffer("Illegal # macro character: #\\");470 StringBuilder sb = new StringBuilder("Illegal # macro character: #\\"); 471 471 String s = LispCharacter.charToName(c); 472 472 if (s != null) -
trunk/abcl/src/org/armedbear/lisp/Load.java
r12427 r12431 188 188 } 189 189 catch (FaslVersionMismatch e) { 190 FastStringBuffer sb =191 new FastStringBuffer("Incorrect fasl version: ");190 StringBuilder sb = 191 new StringBuilder("Incorrect fasl version: "); 192 192 sb.append(truename); 193 193 return error(new SimpleError(sb.toString())); … … 302 302 verbose, print, auto); 303 303 } catch (FaslVersionMismatch e) { 304 FastStringBuffer sb =305 new FastStringBuffer("; Incorrect fasl version: ");304 StringBuilder sb = 305 new StringBuilder("; Incorrect fasl version: "); 306 306 sb.append(truename); 307 307 System.err.println(sb.toString()); … … 484 484 public static String getLoadVerbosePrefix(int loadDepth) 485 485 { 486 FastStringBuffer sb = new FastStringBuffer(";");486 StringBuilder sb = new StringBuilder(";"); 487 487 for (int i = loadDepth - 1; i-- > 0;) 488 488 sb.append(' '); -
trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java
r12422 r12431 204 204 protected String getDirectoryNamestring() 205 205 { 206 FastStringBuffer sb = new FastStringBuffer();206 StringBuilder sb = new StringBuilder(); 207 207 // "If a pathname is converted to a namestring, the symbols NIL and 208 208 // :UNSPECIFIC cause the field to be treated as if it were empty. That … … 245 245 boolean printReadably = (Symbol.PRINT_READABLY.symbolValue(thread) != NIL); 246 246 boolean printEscape = (Symbol.PRINT_ESCAPE.symbolValue(thread) != NIL); 247 FastStringBuffer sb = new FastStringBuffer();247 StringBuilder sb = new StringBuilder(); 248 248 if (printReadably || printEscape) 249 249 sb.append("#P\""); -
trunk/abcl/src/org/armedbear/lisp/Package.java
r12375 r12431 89 89 { 90 90 if (name != null) { 91 FastStringBuffer sb = new FastStringBuffer("The ");91 StringBuilder sb = new StringBuilder("The "); 92 92 sb.append(name); 93 93 sb.append(" package"); … … 406 406 sym = s; 407 407 else if (sym != s) { 408 FastStringBuffer sb =409 new FastStringBuffer("Uninterning the symbol ");408 StringBuilder sb = 409 new StringBuilder("Uninterning the symbol "); 410 410 sb.append(symbol.getQualifiedName()); 411 411 sb.append(" causes a name conflict between "); … … 443 443 Symbol sym = findAccessibleSymbol(symbol.name); 444 444 if (sym != null && sym != symbol) { 445 FastStringBuffer sb = new FastStringBuffer("The symbol ");445 StringBuilder sb = new StringBuilder("The symbol "); 446 446 sb.append(sym.getQualifiedName()); 447 447 sb.append(" is already accessible in package "); … … 462 462 Symbol sym = findAccessibleSymbol(symbol.name); 463 463 if (sym != symbol) { 464 FastStringBuffer sb = new FastStringBuffer("The symbol ");464 StringBuilder sb = new StringBuilder("The symbol "); 465 465 sb.append(symbol.getQualifiedName()); 466 466 sb.append(" is not accessible in package "); … … 483 483 // OK. 484 484 } else { 485 FastStringBuffer sb = new FastStringBuffer("The symbol ");485 StringBuilder sb = new StringBuilder("The symbol "); 486 486 sb.append(sym.getQualifiedName()); 487 487 sb.append(" is already accessible in package "); … … 502 502 // Symbol is already exported; there's nothing to do. 503 503 return; 504 FastStringBuffer sb = new FastStringBuffer("The symbol ");504 StringBuilder sb = new StringBuilder("The symbol "); 505 505 sb.append(symbol.getQualifiedName()); 506 506 sb.append(" is not accessible in package "); … … 529 529 } 530 530 } 531 FastStringBuffer sb = new FastStringBuffer("The symbol ");531 StringBuilder sb = new StringBuilder("The symbol "); 532 532 sb.append(symbol.getQualifiedName()); 533 533 sb.append(" is not accessible in package "); … … 826 826 { 827 827 if (_PRINT_FASL_.symbolValue() != NIL && name != null) { 828 FastStringBuffer sb = new FastStringBuffer("#.(FIND-PACKAGE \"");828 StringBuilder sb = new StringBuilder("#.(FIND-PACKAGE \""); 829 829 sb.append(name); 830 830 sb.append("\")"); … … 837 837 public String toString() { 838 838 if (name != null) { 839 FastStringBuffer sb = new FastStringBuffer("#<PACKAGE \"");839 StringBuilder sb = new StringBuilder("#<PACKAGE \""); 840 840 sb.append(name); 841 841 sb.append("\">"); -
trunk/abcl/src/org/armedbear/lisp/Pathname.java
r12422 r12431 471 471 Debug.assertTrue(false); 472 472 } 473 FastStringBuffer sb = new FastStringBuffer();473 StringBuilder sb = new StringBuilder(); 474 474 // "If a pathname is converted to a namestring, the symbols NIL and 475 475 // :UNSPECIFIC cause the field to be treated as if it were empty. That … … 499 499 i = 1; 500 500 } 501 FastStringBuffer prefix = new FastStringBuffer();501 StringBuilder prefix = new StringBuilder(); 502 502 for (; i < jars.length; i++) { 503 503 prefix.append("jar:"); … … 569 569 protected String getDirectoryNamestring() { 570 570 validateDirectory(true); 571 FastStringBuffer sb = new FastStringBuffer();571 StringBuilder sb = new StringBuilder(); 572 572 // "If a pathname is converted to a namestring, the symbols NIL and 573 573 // :UNSPECIFIC cause the field to be treated as if it were empty. That … … 734 734 useNamestring = false; 735 735 } 736 FastStringBuffer sb = new FastStringBuffer();736 StringBuilder sb = new StringBuilder(); 737 737 if (useNamestring) { 738 738 if (printReadably || printEscape) { … … 1183 1183 if (second == Keyword.UP || second == Keyword.BACK) { 1184 1184 if (signalError) { 1185 FastStringBuffer sb = new FastStringBuffer();1185 StringBuilder sb = new StringBuilder(); 1186 1186 sb.append(first.writeToString()); 1187 1187 sb.append(" may not be followed immediately by "); … … 1684 1684 error: 1685 1685 if (errorIfDoesNotExist) { 1686 FastStringBuffer sb = new FastStringBuffer("The file ");1686 StringBuilder sb = new StringBuilder("The file "); 1687 1687 sb.append(pathname.writeToString()); 1688 1688 sb.append(" does not exist."); … … 1958 1958 public LispObject execute(LispObject arg) { 1959 1959 Pathname p = coerceToPathname(arg); 1960 FastStringBuffer sb = new FastStringBuffer();1960 StringBuilder sb = new StringBuilder(); 1961 1961 if (p.name instanceof AbstractString) { 1962 1962 sb.append(p.name.getStringValue()); -
trunk/abcl/src/org/armedbear/lisp/Primitives.java
r12408 r12431 2179 2179 if (rank != args.length - 1) 2180 2180 { 2181 FastStringBuffer sb =2182 new FastStringBuffer("ARRAY-IN-BOUNDS-P: ");2181 StringBuilder sb = 2182 new StringBuilder("ARRAY-IN-BOUNDS-P: "); 2183 2183 sb.append("wrong number of subscripts ("); 2184 2184 sb.append(args.length - 1); … … 2236 2236 if (array.getRank() == 0) 2237 2237 return array.AREF(0); 2238 FastStringBuffer sb =2239 new FastStringBuffer("Wrong number of subscripts (0) for array of rank ");2238 StringBuilder sb = 2239 new StringBuilder("Wrong number of subscripts (0) for array of rank "); 2240 2240 sb.append(array.getRank()); 2241 2241 sb.append('.'); … … 2946 2946 if (n >= 0) 2947 2947 { 2948 FastStringBuffer sb = new FastStringBuffer('G');2948 StringBuilder sb = new StringBuilder("G"); 2949 2949 sb.append(n); // Decimal representation. 2950 2950 return new Symbol(new SimpleString(sb)); … … 2956 2956 if (n.signum() >= 0) 2957 2957 { 2958 FastStringBuffer sb = new FastStringBuffer('G');2958 StringBuilder sb = new StringBuilder("G"); 2959 2959 sb.append(n.toString()); // Decimal representation. 2960 2960 return new Symbol(new SimpleString(sb)); … … 4110 4110 if (start < 0) 4111 4111 { 4112 FastStringBuffer sb = new FastStringBuffer("Bad start index (");4112 StringBuilder sb = new StringBuilder("Bad start index ("); 4113 4113 sb.append(start); 4114 4114 sb.append(") for SUBSEQ."); … … 4132 4132 if (start < 0) 4133 4133 { 4134 FastStringBuffer sb = new FastStringBuffer("Bad start index (");4134 StringBuilder sb = new StringBuilder("Bad start index ("); 4135 4135 sb.append(start); 4136 4136 sb.append(")."); … … 4143 4143 if (start > end) 4144 4144 { 4145 FastStringBuffer sb = new FastStringBuffer("Start index (");4145 StringBuilder sb = new StringBuilder("Start index ("); 4146 4146 sb.append(start); 4147 4147 sb.append(") is greater than end index ("); -
trunk/abcl/src/org/armedbear/lisp/PrintNotReadable.java
r12298 r12431 82 82 public String getMessage() 83 83 { 84 FastStringBuffer sb = new FastStringBuffer();84 StringBuilder sb = new StringBuilder(); 85 85 LispObject object = UNBOUND_VALUE; 86 86 object = getInstanceSlotValue(Symbol.OBJECT); -
trunk/abcl/src/org/armedbear/lisp/Readtable.java
r12288 r12431 238 238 { 239 239 String name = LispCharacter.charToName(c); 240 FastStringBuffer sb = new FastStringBuffer("Invalid character");240 StringBuilder sb = new StringBuilder("Invalid character"); 241 241 if (name != null) 242 242 { -
trunk/abcl/src/org/armedbear/lisp/Return.java
r12298 r12431 72 72 public LispObject getCondition() 73 73 { 74 FastStringBuffer sb = new FastStringBuffer("No block named ");74 StringBuilder sb = new StringBuilder("No block named "); 75 75 sb.append(tag.writeToString()); 76 76 sb.append(" is currently visible."); -
trunk/abcl/src/org/armedbear/lisp/ShellCommand.java
r12298 r12431 86 86 if (Utilities.isPlatformUnix) { 87 87 if (directory != null) { 88 FastStringBuffer sb = new FastStringBuffer("\\cd \"");88 StringBuilder sb = new StringBuilder("\\cd \""); 89 89 sb.append(directory); 90 90 sb.append("\" && "); … … 101 101 list.add("/c"); 102 102 if (directory != null) { 103 FastStringBuffer sb = new FastStringBuffer("cd /d \"");103 StringBuilder sb = new StringBuilder("cd /d \""); 104 104 sb.append(directory); 105 105 sb.append("\" && "); -
trunk/abcl/src/org/armedbear/lisp/SimpleArray_T.java
r12288 r12431 254 254 if (rank != subscripts.length) 255 255 { 256 FastStringBuffer sb = new FastStringBuffer("Wrong number of subscripts (");256 StringBuilder sb = new StringBuilder("Wrong number of subscripts ("); 257 257 sb.append(subscripts.length); 258 258 sb.append(") for array of rank "); … … 271 271 if (n < 0 || n >= dim) 272 272 { 273 FastStringBuffer sb = new FastStringBuffer("Invalid index ");273 StringBuilder sb = new StringBuilder("Invalid index "); 274 274 sb.append(n); 275 275 sb.append(" for array "); -
trunk/abcl/src/org/armedbear/lisp/SimpleString.java
r12288 r12431 73 73 } 74 74 75 public SimpleString( FastStringBuffer sb)76 { 77 chars = sb.to CharArray();75 public SimpleString(StringBuilder sb) 76 { 77 chars = sb.toString().toCharArray(); 78 78 capacity = chars.length; 79 79 } … … 112 112 public LispObject getDescription() 113 113 { 114 FastStringBuffer sb = new FastStringBuffer("A simple-string (");114 StringBuilder sb = new StringBuilder("A simple-string ("); 115 115 sb.append(capacity); 116 116 sb.append(") \""); -
trunk/abcl/src/org/armedbear/lisp/SlotDefinition.java
r12298 r12431 89 89 public String writeToString() 90 90 { 91 FastStringBuffer sb =92 new FastStringBuffer(Symbol.SLOT_DEFINITION.writeToString());91 StringBuilder sb = 92 new StringBuilder(Symbol.SLOT_DEFINITION.writeToString()); 93 93 LispObject name = slots[SlotDefinitionClass.SLOT_INDEX_NAME]; 94 94 if (name != null && name != NIL) -
trunk/abcl/src/org/armedbear/lisp/StandardClass.java
r12288 r12431 88 88 public String writeToString() 89 89 { 90 FastStringBuffer sb =91 new FastStringBuffer(Symbol.STANDARD_CLASS.writeToString());90 StringBuilder sb = 91 new StringBuilder(Symbol.STANDARD_CLASS.writeToString()); 92 92 if (symbol != null) 93 93 { -
trunk/abcl/src/org/armedbear/lisp/StandardGenericFunction.java
r12288 r12431 209 209 if (name != null) 210 210 { 211 FastStringBuffer sb = new FastStringBuffer();211 StringBuilder sb = new StringBuilder(); 212 212 sb.append(getLispClass().getSymbol().writeToString()); 213 213 sb.append(' '); -
trunk/abcl/src/org/armedbear/lisp/StandardMethod.java
r12288 r12431 156 156 if (name != null) 157 157 { 158 FastStringBuffer sb = new FastStringBuffer();158 StringBuilder sb = new StringBuilder(); 159 159 sb.append(getLispClass().getSymbol().writeToString()); 160 160 sb.append(' '); -
trunk/abcl/src/org/armedbear/lisp/Stream.java
r12422 r12431 554 554 final Readtable rt = 555 555 (Readtable) Symbol.CURRENT_READTABLE.symbolValue(LispThread.currentThread()); 556 FastStringBuffer sb = new FastStringBuffer();556 StringBuilder sb = new StringBuilder(); 557 557 _readToken(sb, rt); 558 558 return new Symbol(sb.toString()); … … 560 560 561 561 public LispObject readSymbol(Readtable rt) { 562 FastStringBuffer sb = new FastStringBuffer();562 StringBuilder sb = new StringBuilder(); 563 563 _readToken(sb, rt); 564 564 return new Symbol(sb.toString()); … … 785 785 return error(new EndOfFile(this)); 786 786 char c = (char) n; // ### BUG: Codepoint conversion 787 FastStringBuffer sb = new FastStringBuffer(c);787 StringBuilder sb = new StringBuilder(String.valueOf(c)); 788 788 while (true) { 789 789 n = _readChar(); … … 888 888 return Complex.getInstance(obj.car(), obj.cadr()); 889 889 // Error. 890 FastStringBuffer sb = new FastStringBuffer("Invalid complex number format");890 StringBuilder sb = new StringBuilder("Invalid complex number format"); 891 891 if (this instanceof FileStream) { 892 892 Pathname p = ((FileStream)this).getPathname(); … … 915 915 return Complex.getInstance(obj.car(), obj.cadr()); 916 916 // Error. 917 FastStringBuffer sb = new FastStringBuffer("Invalid complex number format");917 StringBuilder sb = new StringBuilder("Invalid complex number format"); 918 918 if (this instanceof FileStream) { 919 919 Pathname p = ((FileStream)this).getPathname(); … … 935 935 936 936 private String readMultipleEscape(Readtable rt) { 937 FastStringBuffer sb = new FastStringBuffer();937 StringBuilder sb = new StringBuilder(); 938 938 try { 939 939 while (true) { … … 995 995 996 996 { 997 FastStringBuffer sb = new FastStringBuffer(c);997 StringBuilder sb = new StringBuilder(String.valueOf(c)); 998 998 final LispThread thread = LispThread.currentThread(); 999 999 BitSet flags = _readToken(sb, rt); … … 1086 1086 } 1087 1087 1088 private final BitSet _readToken( FastStringBuffer sb, Readtable rt)1088 private final BitSet _readToken(StringBuilder sb, Readtable rt) 1089 1089 1090 1090 { … … 1199 1199 } 1200 1200 } 1201 FastStringBuffer sb = new FastStringBuffer(limit);1201 StringBuilder sb = new StringBuilder(limit); 1202 1202 for (int i = 0; i < limit; i++) { 1203 1203 char c = s.charAt(i); … … 1312 1312 if (length == 0) 1313 1313 return null; 1314 FastStringBuffer sb = new FastStringBuffer();1314 StringBuilder sb = new StringBuilder(); 1315 1315 int i = 0; 1316 1316 boolean maybe = false; … … 1374 1374 1375 1375 public LispObject readRadix(int radix) { 1376 FastStringBuffer sb = new FastStringBuffer();1376 StringBuilder sb = new StringBuilder(); 1377 1377 final LispThread thread = LispThread.currentThread(); 1378 1378 final Readtable rt = … … 1403 1403 1404 1404 public LispObject faslReadRadix(int radix) { 1405 FastStringBuffer sb = new FastStringBuffer();1405 StringBuilder sb = new StringBuilder(); 1406 1406 final LispThread thread = LispThread.currentThread(); 1407 1407 final Readtable rt = FaslReadtable.getInstance(); … … 1472 1472 { 1473 1473 final LispThread thread = LispThread.currentThread(); 1474 FastStringBuffer sb = new FastStringBuffer();1474 StringBuilder sb = new StringBuilder(); 1475 1475 try { 1476 1476 while (true) { -
trunk/abcl/src/org/armedbear/lisp/StringFunctions.java
r12290 r12431 585 585 if (start > end) 586 586 return error(new TypeError("Start (" + start + ") is greater than end (" + end + ").")); 587 FastStringBuffer sb = new FastStringBuffer(length);587 StringBuilder sb = new StringBuilder(length); 588 588 char[] array = s.getStringChars(); 589 589 int i; … … 620 620 if (start > end) 621 621 return error(new TypeError("Start (" + start + ") is greater than end (" + end + ").")); 622 FastStringBuffer sb = new FastStringBuffer(length);622 StringBuilder sb = new StringBuilder(length); 623 623 char[] array = s.getStringChars(); 624 624 int i; … … 656 656 if (start > end) 657 657 return error(new TypeError("Start (" + start + ") is greater than end (" + end + ").")); 658 FastStringBuffer sb = new FastStringBuffer(length);658 StringBuilder sb = new StringBuilder(length); 659 659 char[] array = s.getStringChars(); 660 660 boolean lastCharWasAlphanumeric = false; … … 814 814 final int n = Fixnum.getValue(size); 815 815 if (n < 0 || n >= ARRAY_DIMENSION_MAX) { 816 FastStringBuffer sb = new FastStringBuffer();816 StringBuilder sb = new StringBuilder(); 817 817 sb.append("The size specified for this string ("); 818 818 sb.append(n); -
trunk/abcl/src/org/armedbear/lisp/StructureObject.java
r12362 r12431 378 378 private LispObject badIndex(int n) 379 379 { 380 FastStringBuffer sb = new FastStringBuffer("Invalid slot index ");380 StringBuilder sb = new StringBuilder("Invalid slot index "); 381 381 sb.append(Fixnum.getInstance(n).writeToString()); 382 382 sb.append(" for "); … … 432 432 if (currentLevel >= maxLevel && slots.length > 0) 433 433 return "#"; 434 FastStringBuffer sb = new FastStringBuffer("#S(");434 StringBuilder sb = new StringBuilder("#S("); 435 435 sb.append(structureClass.getSymbol().writeToString()); 436 436 if (currentLevel < maxLevel) -
trunk/abcl/src/org/armedbear/lisp/Symbol.java
r12422 r12431 119 119 try 120 120 { 121 FastStringBuffer sb = new FastStringBuffer("The symbol ");121 StringBuilder sb = new StringBuilder("The symbol "); 122 122 sb.append(name.writeToString()); 123 123 sb.append(" at #x"); … … 258 258 if (pkg == PACKAGE_KEYWORD) 259 259 return ":".concat(n); 260 FastStringBuffer sb = new FastStringBuffer(((Package)pkg).getName());260 StringBuilder sb = new StringBuilder(((Package)pkg).getName()); 261 261 if (((Package)pkg).findExternalSymbol(name) != null) 262 262 sb.append(':'); … … 445 445 printCase != Keyword.UPCASE) 446 446 { 447 FastStringBuffer sb = new FastStringBuffer();447 StringBuilder sb = new StringBuilder(); 448 448 if (pkg == PACKAGE_KEYWORD) 449 449 { … … 573 573 } 574 574 } 575 FastStringBuffer sb = new FastStringBuffer(packageName);575 StringBuilder sb = new StringBuilder(packageName); 576 576 if (((Package)pkg).findExternalSymbol(name) != null 577 577 && DOUBLE_COLON_PACKAGE_SEPARATORS.symbolValue(thread) == NIL) … … 608 608 } 609 609 } 610 FastStringBuffer sb = new FastStringBuffer(limit);610 StringBuilder sb = new StringBuilder(limit); 611 611 for (int i = 0; i < limit; i++) 612 612 { … … 696 696 private static final String multipleEscape(String s) 697 697 { 698 FastStringBuffer sb = new FastStringBuffer("|");698 StringBuilder sb = new StringBuilder("|"); 699 699 final int limit = s.length(); 700 700 for (int i = 0; i < limit; i++) … … 714 714 return s; 715 715 final int limit = s.length(); 716 FastStringBuffer sb = new FastStringBuffer(limit);716 StringBuilder sb = new StringBuilder(limit); 717 717 boolean lastCharWasAlphanumeric = false; 718 718 for (int i = 0; i < limit; i++) -
trunk/abcl/src/org/armedbear/lisp/Time.java
r12290 r12431 63 63 checkCharacterOutputStream(Symbol.TRACE_OUTPUT.symbolValue()); 64 64 out.freshLine(); 65 FastStringBuffer sb = new FastStringBuffer();65 StringBuilder sb = new StringBuilder(); 66 66 sb.append(String.valueOf((float)realElapsed / 1000)); 67 67 sb.append(" seconds real time"); -
trunk/abcl/src/org/armedbear/lisp/TypeError.java
r12298 r12431 139 139 final LispObject datum = getDatum(); 140 140 final LispObject expectedType = getExpectedType(); 141 FastStringBuffer sb = new FastStringBuffer();141 StringBuilder sb = new StringBuilder(); 142 142 String name = datum != null ? datum.writeToString() : null; 143 143 String type = null; -
trunk/abcl/src/org/armedbear/lisp/UnboundSlot.java
r12288 r12431 76 76 thread.bindSpecial(Symbol.PRINT_ESCAPE, T); 77 77 try { 78 FastStringBuffer sb = new FastStringBuffer("The slot ");78 StringBuilder sb = new StringBuilder("The slot "); 79 79 sb.append(getCellName().writeToString()); 80 80 sb.append(" is unbound in the object "); -
trunk/abcl/src/org/armedbear/lisp/UndefinedFunction.java
r12288 r12431 73 73 public String getMessage() 74 74 { 75 FastStringBuffer sb = new FastStringBuffer("The function ");75 StringBuilder sb = new StringBuilder("The function "); 76 76 sb.append(getCellName().writeToString()); 77 77 sb.append(" is undefined."); -
trunk/abcl/src/org/armedbear/lisp/WrongNumberOfArgumentsException.java
r12350 r12431 72 72 return message; 73 73 } 74 FastStringBuffer sb =75 new FastStringBuffer("Wrong number of arguments");74 StringBuilder sb = 75 new StringBuilder("Wrong number of arguments"); 76 76 LispObject lambdaName = operator.getLambdaName(); 77 77 if (lambdaName != null && lambdaName != NIL) { -
trunk/abcl/src/org/armedbear/lisp/clos.lisp
r12425 r12431 538 538 (getf canonical-slot :name)) 539 539 540 (defun ensure-class (name &rest all-keys 541 &key (metaclass 'standard-class) &allow-other-keys) 542 543 ;; Don't pass METACLASS on to the initialization routines 544 ;; This only works because we *know* ABCL conses up new &rest lists 545 ;; every time; otherwise, modifying the argument list is discouraged by the spec 546 (remf all-keys :metaclass) 547 540 (defun ensure-class (name &rest all-keys &allow-other-keys) 548 541 ;; Check for duplicate slots. 549 542 (let ((slots (getf all-keys :direct-slots))) … … 590 583 old-class))) 591 584 (t 592 (let ((class (apply (if (eq metaclass 'standard-class) 593 #'make-instance-standard-class 594 #'make-instance) 595 (or (when (symbolp metaclass) 596 (find-class metaclass)) 597 metaclass) 585 (let ((class (apply #'make-instance-standard-class 586 (find-class 'standard-class) 598 587 :name name all-keys))) 599 588 (%set-find-class name class) -
trunk/abcl/src/org/armedbear/lisp/delete_file.java
r12288 r12431 78 78 } 79 79 Pathname truename = new Pathname(file.getAbsolutePath()); 80 FastStringBuffer sb = new FastStringBuffer("Unable to delete ");80 StringBuilder sb = new StringBuilder("Unable to delete "); 81 81 sb.append(file.isDirectory() ? "directory " : "file "); 82 82 sb.append(truename.writeToString()); -
trunk/abcl/src/org/armedbear/lisp/make_array.java
r12288 r12431 127 127 if (size < 0 || size >= ARRAY_DIMENSION_MAX) 128 128 { 129 FastStringBuffer sb = new FastStringBuffer();129 StringBuilder sb = new StringBuilder(); 130 130 sb.append("The size specified for this array ("); 131 131 sb.append(size);
Note: See TracChangeset
for help on using the changeset viewer.