X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FStringUtil.java;h=d3efb24c950d59cea996ae95e85d24f2966349bb;hb=a2008a0c57702f49ed7f8be682e4e29484fded38;hp=fc8f8e1a0ebf809ca990e66050544e64bd1658a7;hpb=0a0227b9180534d2a431f3d6e08a398bde2244c4;p=sbp.git

diff --git a/src/edu/berkeley/sbp/util/StringUtil.java b/src/edu/berkeley/sbp/util/StringUtil.java
index fc8f8e1..d3efb24 100644
--- a/src/edu/berkeley/sbp/util/StringUtil.java
+++ b/src/edu/berkeley/sbp/util/StringUtil.java
@@ -1,7 +1,22 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.util;
 
 /** miscellaneous string utilities */
 public class StringUtil {
+
+    public static String pad(int i,String s) {
+        return s.length() >= i ? s : pad(i-1,s)+" ";
+    }
+
+    public static String join(String[] s, String sep) {
+        StringBuffer ret = new StringBuffer();
+        for(int i=0; i<s.length; i++) {
+            if (i>0) ret.append(sep);
+            ret.append(s[i]);
+        }
+        return ret.toString();
+    }
     public static String toJavaString(String s) {
         StringBuffer sb = new StringBuffer();
         for(int i=0; i<s.length(); i++) {
@@ -12,6 +27,7 @@ public class StringUtil {
                 case '\'': sb.append("\\\'");  break;
                 case '\n':  sb.append("\\n");  break;
                 case '\r':  sb.append("\\r");  break;
+                case '\t':  sb.append("\\t");  break;
                 default: sb.append(c); break;
             }
         }
@@ -27,6 +43,7 @@ public class StringUtil {
                 switch(c) {
                     case 'r': c = '\r'; break;
                     case 'n': c = '\n'; break;
+                    case 't': c = '\t'; break;
                     default: break;
                 }
             }
@@ -40,8 +57,9 @@ public class StringUtil {
                 case '}':  sb.append("\\}");  break;
                 case ':':  sb.append("\\:");  break;
     */
-    public static String escapify(String s) { return escapify(s, "\\\n\r"); }
+    public static String escapify(String s) { return escapify(s, "\\\n\r\t"); }
     public static String escapify(String s, String illegal) {
+        if (s==null) return null;
         StringBuffer sb = new StringBuffer();
         for(int i=0; i<s.length(); i++) {
             char c = s.charAt(i);
@@ -49,10 +67,28 @@ public class StringUtil {
                 switch(c) {
                     case '\n':  sb.append("\\n"); continue;
                     case '\r':  sb.append("\\r"); continue;
+                    case '\t':  sb.append("\\t"); continue;
                     default:    sb.append('\\');  break;
                 }
-            sb.append(c);
+            else if (c < 32 || c >= 127) {
+                sb.append("\\x"+((int)c));
+            } else {
+                sb.append(c);
+            }
         }
         return sb.toString();
     }
+
+    public static String indent(String s, int indent) {
+        if (s.indexOf('\n')==-1) return s;
+        StringBuffer ret = new StringBuffer();
+        for(int i=0; i<s.length(); i++) {
+            char c = s.charAt(i);
+            ret.append(c);
+            if (c=='\n')
+                for(int j=0; j<indent; j++)
+                    ret.append(' ');
+        }
+        return ret.toString();
+    }
 }