Merge pull request natural#20 from iuliux/master

natural · natural · commit 6e4801596321 · 2012-05-14T06:56:38.000-07:00
String formatting (2nd iteration)
diff --git a/java2python/mod/transform.py b/java2python/mod/transform.py
@@ -101,12 +101,38 @@ def formatSyntaxTransf(match):
         inside a format specifier string.
     """
     groups = match.groupdict()
+    if groups['convers'] == 'n':
+        # Means platform-specific line separator
+        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
 
@@ -124,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>[scdoxefg])',
+            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/Format0.java b/test/Format0.java
@@ -2,7 +2,7 @@ public class Format0 {
   public static void main(String[] args) {
     int i = 22;
     String s = "text";
-    String r = String.format("> (%1$d) %2$s", i, s);
+    String r = String.format("> (%1$d) %n %2$s", i, s);
 
     System.out.println(r);
   }
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);
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ public class Format0 {`
`2`	`2`	`public static void main(String[] args) {`
`3`	`3`	`int i = 22;`
`4`	`4`	`String s = "text";`
`5`		`- String r = String.format("> (%1$d) %2$s", i, s);`
	`5`	`+ String r = String.format("> (%1$d) %n %2$s", i, s);`
`6`	`6`
`7`	`7`	`System.out.println(r);`
`8`	`8`	`}`