[armedbear-cvs] r11539 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Jan  4 14:27:54 2009
New Revision: 11539

Log:
Empty statements cleanup:

 * Remove unintentional empty statements
 * Replace empty statements with empty blocks if necessary
 * Leave empty statements which need fixing

Note: Removes orange blocks from the right margin in NetBeans.


Modified:
   trunk/abcl/src/org/armedbear/lisp/CellError.java
   trunk/abcl/src/org/armedbear/lisp/LispCharacter.java
   trunk/abcl/src/org/armedbear/lisp/LispThread.java
   trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java
   trunk/abcl/src/org/armedbear/lisp/Pathname.java
   trunk/abcl/src/org/armedbear/lisp/Primitives.java
   trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java
   trunk/abcl/src/org/armedbear/lisp/Stream.java
   trunk/abcl/src/org/armedbear/lisp/Symbol.java

Modified: trunk/abcl/src/org/armedbear/lisp/CellError.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/CellError.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/CellError.java	Sun Jan  4 14:27:54 2009
@@ -55,7 +55,7 @@
             LispObject first = initArgs.car();
             initArgs = initArgs.cdr();
             if (first == Keyword.NAME) {
-                name = initArgs.car();;
+                name = initArgs.car();
                 break;
             }
             initArgs = initArgs.cdr();

Modified: trunk/abcl/src/org/armedbear/lisp/LispCharacter.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispCharacter.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/LispCharacter.java	Sun Jan  4 14:27:54 2009
@@ -367,7 +367,7 @@
           }
         catch (ClassCastException e)
           {
-            ; // SBCL signals a type-error here: "not of type (UNSIGNED-BYTE 8)"
+              // SBCL signals a type-error here: "not of type (UNSIGNED-BYTE 8)"
           }
         return NIL;
       }

Modified: trunk/abcl/src/org/armedbear/lisp/LispThread.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispThread.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/LispThread.java	Sun Jan  4 14:27:54 2009
@@ -108,7 +108,7 @@
                     funcall(fun, new LispObject[0], LispThread.this);
                 }
                 catch (ThreadDestroyed ignored) {
-                    ; // Might happen.
+                      // Might happen.
                 }
                 catch (Throwable t) {
                     if (isInterrupted()) {

Modified: trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/LogicalPathname.java	Sun Jan  4 14:27:54 2009
@@ -205,9 +205,8 @@
         if (directory != NIL) {
             LispObject temp = directory;
             LispObject part = temp.car();
-            if (part == Keyword.ABSOLUTE)
-                ;
-            else if (part == Keyword.RELATIVE)
+            if (part == Keyword.ABSOLUTE) {
+            } else if (part == Keyword.RELATIVE)
                 sb.append(';');
             else
                 error(new FileError("Unsupported directory component " + part.writeToString() + ".",

Modified: trunk/abcl/src/org/armedbear/lisp/Pathname.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Pathname.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Pathname.java	Sun Jan  4 14:27:54 2009
@@ -308,11 +308,9 @@
             else
               sb.append(File.separatorChar);
         }
-        if (device == NIL)
-            ;
-        else if (device == Keyword.UNSPECIFIC)
-            ;
-        else if (device instanceof AbstractString) {
+        if (device == NIL) {
+        } else if (device == Keyword.UNSPECIFIC) {
+        } else if (device instanceof AbstractString) {
             sb.append(device.getStringValue());
             if (this instanceof LogicalPathname
                 || host == NIL)
@@ -387,8 +385,8 @@
                     // #p"./"
                     sb.append('.');
                     sb.append(separatorChar);
-                } else
-                    ; // Nothing to do.
+                }
+                // else: Nothing to do.
             } else {
                 error(new FileError("Unsupported directory component " +
                                     part.writeToString() + ".",
@@ -855,7 +853,7 @@
             } else if (key == Keyword.DEFAULTS) {
                 defaults = coerceToPathname(value);
             } else if (key == Keyword.CASE) {
-                ; // Ignored.
+                  // Ignored.
             }
         }
         if (defaults != null) {

Modified: trunk/abcl/src/org/armedbear/lisp/Primitives.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Primitives.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Primitives.java	Sun Jan  4 14:27:54 2009
@@ -3329,9 +3329,9 @@
             while (list != NIL)
               {
                 LispObject obj = list.car();
-                if (obj instanceof Package)
-                  ; // OK.
-                else
+                if (obj instanceof Package) {
+                  // OK.
+                } else
                   {
                     String s = javaString(obj);
                     Package p = Packages.findPackage(s);

Modified: trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/SimpleBitVector.java	Sun Jan  4 14:27:54 2009
@@ -54,9 +54,8 @@
         this(s.length());
         for (int i = capacity; i-- > 0;) {
             char c = s.charAt(i);
-            if (c == '0')
-                ;
-            else if (c == '1')
+            if (c == '0') {
+            } else if (c == '1')
                 setBit(i);
             else
                 Debug.assertTrue(false);

Modified: trunk/abcl/src/org/armedbear/lisp/Stream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Stream.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Stream.java	Sun Jan  4 14:27:54 2009
@@ -295,8 +295,7 @@
           else if (eol == keywordCRLF)
               eolStyle = EolStyle.CRLF;
           else if (eol != keywordRAW)
-              //###FIXME: raise an error
-              ;
+              ; //###FIXME: raise an error
           
       } else
         enc = format;
@@ -314,8 +313,7 @@
       else if (enc instanceof Symbol)
           encoding = ((Symbol)enc).getName();
       else
-          //###FIXME: raise an error!
-          ;
+          ; //###FIXME: raise an error!
       
       if (encIsCp)
           encoding = "Cp" + encoding;

Modified: trunk/abcl/src/org/armedbear/lisp/Symbol.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Symbol.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Symbol.java	Sun Jan  4 14:27:54 2009
@@ -467,8 +467,7 @@
     String symbolName = escapeSymbolName ? multipleEscape(n) : n;
     if (!escapeSymbolName)
       {
-        if (readtableCase == Keyword.PRESERVE)
-          ;
+        if (readtableCase == Keyword.PRESERVE) { }
         else if (readtableCase == Keyword.INVERT)
           symbolName = invert(symbolName);
         else if (printCase == Keyword.DOWNCASE)