fix: lastcr idx could be larger than the value of (string.length-1). so appends remai...
authoryeom <yeom>
Wed, 15 Dec 2010 23:48:04 +0000 (23:48 +0000)
committeryeom <yeom>
Wed, 15 Dec 2010 23:48:04 +0000 (23:48 +0000)
Robust/src/Util/CodePrinter.java

index 2d317a10894fbc34d945b222dad56a0c5b46eea3..cafc05635d1ca6ab8268f48d833f5f26ff0be74e 100644 (file)
@@ -112,45 +112,45 @@ public class CodePrinter extends PrintWriter {
   }
 
   public void addString(String str) {
-    char[] string=str.toCharArray();
-    int lastcr=0;
+    char[] string = str.toCharArray();
+    int lastcr = 0;
 
-    for(int i=0;i<string.length;i++) {
-      char c=string[i];
+    for (int i = 0; i < string.length; i++) {
+      char c = string[i];
 
-      switch(c) {
+      switch (c) {
       case '\n': {
-       //get the cr
-       sb.append(string, lastcr, (i-lastcr)+1);
-       super.write(sb.toString());
-       sb=genSpacing();
-       lastcr=i+1;//skip carriage return
-       seenChar=false;
-       break;
+        // get the cr
+        sb.append(string, lastcr, (i - lastcr) + 1);
+        super.write(sb.toString());
+        sb = genSpacing();
+        lastcr = i + 1;// skip carriage return
+        seenChar = false;
+        break;
       }
       case '{':
-       braceCount++;
-       seenChar=true;
-       break;
+        braceCount++;
+        seenChar = true;
+        break;
       case '}':
-       braceCount--;
-       //fix up close brace...
-       if (!seenChar)
-         sb=genSpacing();
-       seenChar=true;
-       break;
+        braceCount--;
+        // fix up close brace...
+        if (!seenChar)
+          sb = genSpacing();
+        seenChar = true;
+        break;
       case ' ':
-       //skip leading whitespace
-       if (!seenChar)
-         lastcr=i+1;
-       break;
+        // skip leading whitespace
+        if (!seenChar)
+          lastcr = i + 1;
+        break;
       default:
-       seenChar=true;
+        seenChar = true;
       }
     }
-    if (lastcr!=(string.length-1)) {
-      //dump string
-      sb.append(string, lastcr, string.length-lastcr);
+    if (lastcr < string.length) {
+      // dump string
+      sb.append(string, lastcr, string.length - lastcr);
     }
   }