open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix format float numbers #17

Merged
Enyby merged 1 commits from patch-9 into master 2018-09-16 06:24:05 +00:00
Conversation 5 Commits 1 Files Changed 1 +10 -2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/org/luaj/vm2/lib/StringLib.java
View File

@@ -343,6 +343,8 @@ public class StringLib extends TwoArgFunction {
public final int conversion; public final int conversion;
public final int length; public final int length;
public final String src;
public FormatDesc(Varargs args, LuaString strfrmt, final int start) { public FormatDesc(Varargs args, LuaString strfrmt, final int start) {
int p = start, n = strfrmt.length(); int p = start, n = strfrmt.length();
int c = 0; int c = 0;
@@ -390,6 +392,7 @@ public class StringLib extends TwoArgFunction {
zeroPad &= !leftAdjust; // '-' overrides '0' zeroPad &= !leftAdjust; // '-' overrides '0'
conversion = c; conversion = c;
length = p - start; length = p - start;
src = strfrmt.substring(start - 1, p).tojstring();
} }
public void format(Buffer buf, byte c) { public void format(Buffer buf, byte c) {
@@ -465,8 +468,13 @@ public class StringLib extends TwoArgFunction {
} }
public void format(Buffer buf, double x) { public void format(Buffer buf, double x) {
// TODO String out;
buf.append( String.valueOf( x ) ); try {
out = String.format(src, x);
} catch (Throwable e) {
out = String.valueOf( x );
}
buf.append( out );
} }
public void format(Buffer buf, LuaString s) { public void format(Buffer buf, LuaString s) {