1
0

Fix FORMAT$

This commit is contained in:
otya128
2016-12-08 23:37:57 +09:00
parent 715c617b8e
commit 9feb911a95

View File

@@ -1448,6 +1448,7 @@ class BuiltinFunction
} }
} }
int d1, d2 = 6; int d1, d2 = 6;
bool d2f;
wstring a1 = format[i..$]; wstring a1 = format[i..$];
if (a1[0] >= '0' && a1[0] <= '9') if (a1[0] >= '0' && a1[0] <= '9')
{ {
@@ -1459,6 +1460,7 @@ class BuiltinFunction
if (a1[0] >= '0' && a1[0] <= '9') if (a1[0] >= '0' && a1[0] <= '9')
{ {
d2 = parse!(int, wstring)(a1); d2 = parse!(int, wstring)(a1);
d2f = true;
} }
} }
wstring buf; wstring buf;
@@ -1488,7 +1490,8 @@ class BuiltinFunction
{ {
auto val = args[j].castInteger; auto val = args[j].castInteger;
spec.width = d1; spec.width = d1;
spec.precision = d2; if (d2f)
spec.precision = d2;
spec.flDash = left; spec.flDash = left;
spec.flZero = zero; spec.flZero = zero;
spec.flPlus = sign; spec.flPlus = sign;