Skip to content

fixed floating number leading zeroes serialization #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions jim2.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void jim_bool(Jim *jim, int boolean)
jim_element_end(jim);
}

static void jim_integer_no_element(Jim *jim, long long int x)
static void jim_integer_no_element(Jim *jim, long long int x, int lzeros, int rtrim)
{
if (x < 0) {
jim_write_cstr(jim, "-");
Expand All @@ -169,20 +169,32 @@ static void jim_integer_no_element(Jim *jim, long long int x)
x /= 10;
}

while (lzeros > 0) {
buffer[count++] = '0';
--lzeros;
}

for (size_t i = 0; i < count / 2; ++i) {
char t = buffer[i];
buffer[i] = buffer[count - i - 1];
buffer[count - i - 1] = t;
}

if (rtrim && count != 0) {
while (count != 1 && buffer[count - 1] == '0') {
buffer[count - 1] = '\0';
--count;
}
}

jim_write(jim, buffer, count);
}
}

void jim_integer(Jim *jim, long long int x)
{
jim_element_begin(jim);
jim_integer_no_element(jim, x);
jim_integer_no_element(jim, x, 0, 0);
jim_element_end(jim);
}

Expand All @@ -199,18 +211,20 @@ void jim_float(Jim *jim, double x, int precision)
} else {
jim_element_begin(jim);

jim_integer_no_element(jim, (long long int) x);
jim_integer_no_element(jim, (long long int) x, 0, 0);
x -= (double) (long long int) x;
int lzeros = 0;
while (precision-- > 0) {
x *= 10.0;
lzeros += -1 < x && x < 1;
}
jim_write_cstr(jim, ".");

long long int y = (long long int) x;
if (y < 0) {
y = -y;
}
jim_integer_no_element(jim, y);
jim_integer_no_element(jim, y, lzeros, 1);

jim_element_end(jim);
}
Expand Down