Changeset 13444

Timestamp:

08/06/11 13:51:26 (9 years ago)

Author:

ehuelsmann

Message:

Reduce the number of required unreadableString() methods by removing
the ones taking a symbol argument: all invocations involved a constant
parameter, now replaced with a constant string instead.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• EndOfFile.java (modified) (1 diff)
• Environment.java (modified) (1 diff)
• FileStream.java (modified) (1 diff)
• Layout.java (modified) (1 diff)
• LispObject.java (modified) (2 diffs)
• RandomState.java (modified) (1 diff)
• TwoWayStream.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/EndOfFile.java

@@ -75 +75 @@
     public String getMessage()
     {
-        return unreadableString(Symbol.END_OF_FILE);
+        return unreadableString("END-OF-STREAM");
     }
 }

trunk/abcl/src/org/armedbear/lisp/Environment.java

@@ -248 +248 @@
   public String printObject()
   {
-    return unreadableString(Symbol.ENVIRONMENT);
+    return unreadableString("ENVIRONMENT");
   }
 

trunk/abcl/src/org/armedbear/lisp/FileStream.java

@@ -266 +266 @@
     public String printObject()
     {
-        return unreadableString(Symbol.FILE_STREAM);
+        return unreadableString("FILE-STREAM");
     }
 

trunk/abcl/src/org/armedbear/lisp/Layout.java

@@ -138 +138 @@
   public String printObject()
   {
-    return unreadableString(Symbol.LAYOUT);
+    return unreadableString("LAYOUT");
   }
 

trunk/abcl/src/org/armedbear/lisp/LispObject.java

@@ -755 +755 @@
   }
 
+  /** Calls unreadableString(String s, boolean identity) with a default
+   * identity value of 'true'.
+   * 
+   * @param s String representation of this object.
+   * @return String enclosed in the non-readable #< ... > markers
+   */
   public final String unreadableString(String s) {
      return unreadableString(s, true);
   }
-  public final String unreadableString(Symbol sym) {
-     return unreadableString(sym, true);
-  }
-
+
+  /** Creates a non-readably (as per CLHS terminology) representation
+   * of the 'this' object, using string 's'.
+   * 
+   * If the current value of the variable *PRINT-READABLY* is T, a
+   * Lisp error is thrown and no value is returned.
+   * 
+   * @param s
+   * @param identity when 'true', includes Java's identityHash for the object
+   *            in the output.
+   * @return a non reabable string (i.e. one enclosed in the #< > markers)
+   */
   public final String unreadableString(String s, boolean identity)
   {
@@ -773 +787 @@
     sb.append(">");
     return sb.toString();
-  }
-
-  public final String unreadableString(Symbol symbol, boolean identity) 
-
-  {
-    return unreadableString(symbol.printObject(), identity);
   }
 

trunk/abcl/src/org/armedbear/lisp/RandomState.java

@@ -94 +94 @@
     public String printObject()
     {
-        return unreadableString(Symbol.RANDOM_STATE);
+        return unreadableString("RANDOM-STATE");
     }
 

trunk/abcl/src/org/armedbear/lisp/TwoWayStream.java

@@ -217 +217 @@
     public String printObject()
     {
-        return unreadableString(Symbol.TWO_WAY_STREAM);
+        return unreadableString("TWO-WAY-STREAM");
     }