mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-28 19:19:53 +00:00
Code Issues 1 Releases Wiki Activity

Add string number functionality

Browse Source
This commit is contained in:
Calvin Rose 2018-09-12 11:44:34 -04:00
parent bcb79ec9b2
commit 3fd6ce5b10
1 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/core/string.c
View File

@ -107,8 +107,7 @@ const uint8_t *janet_cstring(const char *str) {
#define BUFSIZE 64
static int32_t real_to_string_impl(uint8_t *buf, double x) {
/* Use 16 decimal places to ignore one ulp errors for now */
int count = snprintf((char *) buf, BUFSIZE, "%.16gR", x);
int count = snprintf((char *) buf, BUFSIZE, "%.17gr", x);
return (int32_t) count;
}
@ -979,7 +978,54 @@ static int cfun_join(JanetArgs args) {
out += chunklen;
}
JANET_RETURN_STRING(args, janet_string_end(buf));
}
struct formatter {
const char *lead;
const char *f1;
const char *f2;
} formatters[] = {
{":g", "%g", "%.*g"},
{":G", "%G", "%.*G"},
{":e", "%e", "%.*e"},
{":E", "%E", "%.*E"},
{":f", "%f", "%.*f"},
{":F", "%F", "%.*F"}
};
static int cfun_number(JanetArgs args) {
struct formatter fmter = formatters[0];
char buf[100];
double x;
int formatNargs = 1;
int32_t precision = 0;
JANET_MINARITY(args, 1);
JANET_MAXARITY(args, 4);
JANET_ARG_NUMBER(x, args, 0);
if (args.n >= 2) {
const uint8_t *flag;
JANET_ARG_SYMBOL(flag, args, 1);
for (int i = 0; i < 6; i++) {
struct formatter fmttest = formatters[i];
if (!janet_cstrcmp(flag, fmttest.lead)) {
fmter = fmttest;
break;
}
}
}
if (args.n >= 3) {
JANET_ARG_INTEGER(precision, args, 2);
formatNargs++;
}
if (formatNargs == 1) {
snprintf(buf, sizeof(buf), fmter.f1, x);
} else if (formatNargs == 2) {
snprintf(buf, sizeof(buf), fmter.f2, precision, x);
}
JANET_RETURN_CSTRING(args, buf);
}
static const JanetReg cfuns[] = {
@ -997,6 +1043,7 @@ static const JanetReg cfuns[] = {
{"string.split", cfun_split},
{"string.check-set", cfun_checkset},
{"string.join", cfun_join},
{"string.number", cfun_number},
{NULL, NULL}
};