mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-07-04 11:02:55 +00:00
Code Issues 1 Releases Wiki Activity

Whitspace and style changes.

Browse Source
This commit is contained in:
Calvin Rose 2019-02-16 13:40:51 -05:00
parent 0f0c415bcf
commit 00020ba8ab
1 changed files with 89 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
src/core/string.c
View File

@ -502,7 +502,6 @@ static Janet cfun_string_pretty(int32_t argc, Janet *argv) {
return janet_wrap_buffer(buffer); return janet_wrap_buffer(buffer);
} }
/* /*
* code adapted from lua/lstrlib.c http://lua.org * code adapted from lua/lstrlib.c http://lua.org
*/ */
@ -511,27 +510,31 @@ static Janet cfun_string_pretty(int32_t argc, Janet *argv) {
#define FMT_FLAGS "-+ #0" #define FMT_FLAGS "-+ #0"
#define MAX_FORMAT 32 #define MAX_FORMAT 32
static const char *scanformat(const char *strfrmt, char *form,char width[3], char precision[3]) { static const char *scanformat(
const char *strfrmt,
char *form,
char width[3],
char precision[3]) {
const char *p = strfrmt; const char *p = strfrmt;
memset(width, '\0', 3); memset(width, '\0', 3);
memset(precision, '\0', 3); memset(precision, '\0', 3);
while (*p != '\0' && strchr(FMT_FLAGS, *p) != NULL) while (*p != '\0' && strchr(FMT_FLAGS, *p) != NULL)
p++; /* skip flags */ p++; /* skip flags */
if ((size_t) (p - strfrmt) >= sizeof(FMT_FLAGS) / sizeof(char)) if ((size_t) (p - strfrmt) >= sizeof(FMT_FLAGS) / sizeof(char))
janet_panic("invalid format (repeated flags)"); janet_panic("invalid format (repeated flags)");
if (isdigit((int) (*p))) if (isdigit((int) (*p)))
width[0] = *p++; /* skip width */ width[0] = *p++; /* skip width */
if (isdigit((int) (*p))) if (isdigit((int) (*p)))
width[1] = *p++; /* (2 digits at most) */ width[1] = *p++; /* (2 digits at most) */
if (*p == '.') { if (*p == '.') {
p++; p++;
if (isdigit((int) (*p))) if (isdigit((int) (*p)))
precision[0] = *p++; /* skip precision */ precision[0] = *p++; /* skip precision */
if (isdigit((int) (*p))) if (isdigit((int) (*p)))
precision[1] = *p++; /* (2 digits at most) */ precision[1] = *p++; /* (2 digits at most) */
} }
if (isdigit((int) (*p))) if (isdigit((int) (*p)))
janet_panic("invalid format (width or precision too long)"); janet_panic("invalid format (width or precision too long)");
*(form++) = '%'; *(form++) = '%';
memcpy(form, strfrmt, ((p - strfrmt) + 1) * sizeof(char)); memcpy(form, strfrmt, ((p - strfrmt) + 1) * sizeof(char));
form += (p - strfrmt) + 1; form += (p - strfrmt) + 1;
@ -539,7 +542,7 @@ static const char *scanformat(const char *strfrmt, char *form,char width[3], cha
return p; return p;
} }
static Janet cfun_string_format(int32_t argc, Janet * argv) { static Janet cfun_string_format(int32_t argc, Janet *argv) {
janet_arity(argc, 2, -1); janet_arity(argc, 2, -1);
JanetBuffer *b = janet_getbuffer(argv, 0); JanetBuffer *b = janet_getbuffer(argv, 0);
const char *strfrmt = (const char *) janet_getstring(argv, 1); const char *strfrmt = (const char *) janet_getstring(argv, 1);
@ -550,85 +553,85 @@ static Janet cfun_string_format(int32_t argc, Janet * argv) {
if (*strfrmt != '%') if (*strfrmt != '%')
janet_buffer_push_u8(b, (uint8_t) * strfrmt++); janet_buffer_push_u8(b, (uint8_t) * strfrmt++);
else if (*++strfrmt == '%') else if (*++strfrmt == '%')
janet_buffer_push_u8(b, (uint8_t) * strfrmt++); /* %% */ janet_buffer_push_u8(b, (uint8_t) * strfrmt++); /* %% */
else { /* format item */ else { /* format item */
char form[MAX_FORMAT],item[MAX_ITEM]; char form[MAX_FORMAT],item[MAX_ITEM];
char width[3], precision[3]; char width[3], precision[3];
int nb = 0; /* number of bytes in added item */ int nb = 0; /* number of bytes in added item */
if (++arg >= argc) if (++arg >= argc)
janet_panic("no enough value for format"); janet_panic("not enough values for format");
strfrmt = scanformat(strfrmt, form, width, precision); strfrmt = scanformat(strfrmt, form, width, precision);
switch (*strfrmt++) { switch (*strfrmt++) {
case 'c': case 'c':
{ {
nb = snprintf(item, MAX_ITEM, form, (int) nb = snprintf(item, MAX_ITEM, form, (int)
janet_getinteger(argv, arg)); janet_getinteger(argv, arg));
break; break;
} }
case 'd': case 'd':
case 'i': case 'i':
case 'o': case 'o':
case 'u': case 'u':
case 'x': case 'x':
case 'X': case 'X':
{ {
int32_t n = janet_getinteger(argv, arg); int32_t n = janet_getinteger(argv, arg);
nb = snprintf(item, MAX_ITEM, form, n); nb = snprintf(item, MAX_ITEM, form, n);
break; break;
} }
case 'a': case 'a':
case 'A': case 'A':
case 'e': case 'e':
case 'E': case 'E':
case 'f': case 'f':
case 'g': case 'g':
case 'G': case 'G':
{ {
double d = janet_getnumber(argv, arg); double d = janet_getnumber(argv, arg);
nb = snprintf(item, MAX_ITEM, form, d); nb = snprintf(item, MAX_ITEM, form, d);
break; break;
} }
case 's': case 's':
{ {
const uint8_t *s = janet_getstring(argv, arg); const uint8_t *s = janet_getstring(argv, arg);
size_t l = janet_string_length(s); size_t l = janet_string_length(s);
if (form[2] == '\0') if (form[2] == '\0')
janet_buffer_push_bytes(b, s, l); janet_buffer_push_bytes(b, s, l);
else { else {
if (l != strlen((const char *) s)) if (l != strlen((const char *) s))
janet_panic("string contains zeros"); janet_panic("string contains zeros");
if (!strchr(form, '.') && l >= 100) { if (!strchr(form, '.') && l >= 100) {
janet_panic janet_panic
("no precision and string is too long to be formatted"); ("no precision and string is too long to be formatted");
} else { } else {
nb = snprintf(item, MAX_ITEM, form, s); nb = snprintf(item, MAX_ITEM, form, s);
} }
}
break;
}
case 'V':
{
janet_to_string_b(b, argv[arg]);
break;
}
case 'v':
{
janet_description_b(b, argv[arg]);
break;
}
case 'p': /* janet pretty , precision = depth */
{
int depth = atoi(precision);
if (depth < 1)
depth = 4;
janet_pretty(b, depth, argv[arg]);
break;
}
default:
{ /* also treat cases 'nLlh' */
janet_panicf("invalid conversion '%s' to 'format'",
form);
} }
break;
}
case 'V':
{
janet_to_string_b(b, argv[arg]);
break;
}
case 'v':
{
janet_description_b(b, argv[arg]);
break;
}
case 'p': /* janet pretty , precision = depth */
{
int depth = atoi(precision);
if (depth < 1)
depth = 4;
janet_pretty(b, depth, argv[arg]);
break;
}
default:
{ /* also treat cases 'nLlh' */
janet_panicf("invalid conversion '%s' to 'format'",
form);
}
} }
if (nb >= MAX_ITEM) if (nb >= MAX_ITEM)
janet_panicf("format buffer overflow", form); janet_panicf("format buffer overflow", form);
@ -639,11 +642,6 @@ static Janet cfun_string_format(int32_t argc, Janet * argv) {
return janet_wrap_buffer(b); return janet_wrap_buffer(b);
} }
static const JanetReg string_cfuns[] = { static const JanetReg string_cfuns[] = {
{ {
"string/slice", cfun_string_slice, "string/slice", cfun_string_slice,