Commit 190b5e93 authored by Claes Sjofors's avatar Claes Sjofors

java c-format %F allowed

parent fab3b832
...@@ -487,6 +487,7 @@ public class PrintfFormat { ...@@ -487,6 +487,7 @@ public class PrintfFormat {
if (c == 'i') break; if (c == 'i') break;
if (c == 'd') break; if (c == 'd') break;
if (c == 'f') break; if (c == 'f') break;
if (c == 'F') break;
if (c == 'g') break; if (c == 'g') break;
if (c == 'G') break; if (c == 'G') break;
if (c == 'o') break; if (c == 'o') break;
...@@ -1087,6 +1088,7 @@ public class PrintfFormat { ...@@ -1087,6 +1088,7 @@ public class PrintfFormat {
throws IllegalArgumentException { throws IllegalArgumentException {
String s2 = ""; String s2 = "";
switch(conversionCharacter) { switch(conversionCharacter) {
case 'F':
case 'f': case 'f':
s2 = printFFormat(s); s2 = printFFormat(s);
break; break;
...@@ -2774,7 +2776,7 @@ public class PrintfFormat { ...@@ -2774,7 +2776,7 @@ public class PrintfFormat {
conversionCharacter='\0'; conversionCharacter='\0';
if (pos < fmt.length()) { if (pos < fmt.length()) {
char c = fmt.charAt(pos); char c = fmt.charAt(pos);
if (c=='i'||c=='d'||c=='f'||c=='g'||c=='G' if (c=='i'||c=='d'||c=='f'||c=='F'||c=='g'||c=='G'
|| c=='o' || c=='x' || c=='X' || c=='e' || c=='o' || c=='x' || c=='X' || c=='e'
|| c=='E' || c=='c' || c=='s' || c=='%') { || c=='E' || c=='c' || c=='s' || c=='%') {
conversionCharacter = c; conversionCharacter = c;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment