Handle flags, width and precision implemented (string formatting)

iuliux · iuliux · commit 2c82742327af · 2012-05-13T17:48:08.000+03:00
diff --git a/java2python/mod/transform.py b/java2python/mod/transform.py
@@ -106,11 +106,33 @@ def formatSyntaxTransf(match):
         return '\\n' # Py converts \n to os.linesep
 
     result = '{'
-    # TODO: add flags, width and precision
+    thous_sep = ''
+
     if(groups['idx']):
         idx = int(groups['idx'][:-1])
         result += str(idx - 1) # Py starts count from 0
-    result += ':' + groups['convers'] + '}'
+    result += ':'
+
+    if(groups['flags']):
+        if ',' in groups['flags']:
+            thous_sep = ','
+        if '+' in groups['flags']:
+            result += '+'
+        elif ' ' in groups['flags']:
+            result += ' '
+        if '#' in groups['flags']:
+            result += '#'
+        if '0' in groups['flags']:
+            result += '0'
+
+    if(groups['width']):
+        result += groups['width']
+    result += thous_sep
+
+    if(groups['precision']):
+        result += groups['precision']
+
+    result += groups['convers'] + '}'
 
     return result
 
@@ -128,7 +150,7 @@ def formatString(node, config):
     format = call_args[0].firstChildOfType(tokens.STRING_LITERAL)
     if format:
         format.token.text =  \
-            re.sub(r'%(?P<idx>\d+\$)?(?P<convers>[scdoxefgn])',
+            re.sub(r'%(?P<idx>\d+\$)?(?P<flags>[-+# 0,]+)?(?P<width>[0-9]+)?(?P<precision>\.[0-9]+)?(?P<convers>[scdoxefgn])',
                     formatSyntaxTransf,
                     format.token.text,
                     flags=re.IGNORECASE)
diff --git a/test/Format1.java b/test/Format1.java
@@ -0,0 +1,19 @@
+public class Format1 {
+  public static void main(String[] args) {
+    long n = 461012;
+	String f1 = String.format("%d%n", n);      //  -->  "461012"
+	String f2 = String.format("%08d%n", n);    //  -->  "00461012"
+	String f3 = String.format("%+8d%n", n);    //  -->  " +461012"
+	String f4 = String.format("%,8d%n", n);    // -->  " 461,012"
+	String f5 = String.format("%+,8d%n", n); //  -->  "+461,012"
+
+	System.out.println(f1 + f2 + f3 + f4 + f5);
+
+	double pi = 3.14159265;
+	String pf1 = String.format("%f%n", pi);       // -->  "3.141593"
+	String pf2 = String.format("%.3f%n", pi);     // -->  "3.142"
+	String pf3 = String.format("%10.3f%n", pi);   // -->  "     3.142"
+
+	System.out.println(pf1 + pf2 + pf3);
+  }
+}
