mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-01-13 00:50:26 +00:00
Code Issues 1 Releases Wiki Activity

Remove duplicate functionality in string.c

Browse Source
This commit is contained in:
Calvin Rose 2019-01-05 21:23:44 -05:00
parent 1f98eff33a
commit 0fdd404a71
3 changed files with 60 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/corelib.c
View File

@ -95,12 +95,8 @@ static Janet janet_core_print(int32_t argc, Janet *argv) {
static Janet janet_core_describe(int32_t argc, Janet *argv) { static Janet janet_core_describe(int32_t argc, Janet *argv) {
JanetBuffer b; JanetBuffer b;
janet_buffer_init(&b, 0); janet_buffer_init(&b, 0);
for (int32_t i = 0; i < argc; ++i) { for (int32_t i = 0; i < argc; ++i)
int32_t len; janet_description_b(&b, argv[i]);
const uint8_t *str = janet_description(argv[i]);
len = janet_string_length(str);
janet_buffer_push_bytes(&b, str, len);
}
Janet ret = janet_stringv(b.data, b.count); Janet ret = janet_stringv(b.data, b.count);
janet_buffer_deinit(&b); janet_buffer_deinit(&b);
return ret; return ret;
@ -109,56 +105,37 @@ static Janet janet_core_describe(int32_t argc, Janet *argv) {
static Janet janet_core_string(int32_t argc, Janet *argv) { static Janet janet_core_string(int32_t argc, Janet *argv) {
JanetBuffer b; JanetBuffer b;
janet_buffer_init(&b, 0); janet_buffer_init(&b, 0);
for (int32_t i = 0; i < argc; ++i) { for (int32_t i = 0; i < argc; ++i)
int32_t len; janet_to_string_b(&b, argv[i]);
const uint8_t *str = janet_to_string(argv[i]);
len = janet_string_length(str);
janet_buffer_push_bytes(&b, str, len);
}
Janet ret = janet_stringv(b.data, b.count); Janet ret = janet_stringv(b.data, b.count);
janet_buffer_deinit(&b); janet_buffer_deinit(&b);
return ret; return ret;
} }
static Janet janet_core_symbol(int32_t argc, Janet *argv) { static Janet janet_core_symbol(int32_t argc, Janet *argv) {
int32_t i;
JanetBuffer b; JanetBuffer b;
janet_buffer_init(&b, 0); janet_buffer_init(&b, 0);
for (i = 0; i < argc; ++i) { for (int32_t i = 0; i < argc; ++i)
int32_t len; janet_to_string_b(&b, argv[i]);
const uint8_t *str = janet_to_string(argv[i]);
len = janet_string_length(str);
janet_buffer_push_bytes(&b, str, len);
}
Janet ret = janet_symbolv(b.data, b.count); Janet ret = janet_symbolv(b.data, b.count);
janet_buffer_deinit(&b); janet_buffer_deinit(&b);
return ret; return ret;
} }
static Janet janet_core_keyword(int32_t argc, Janet *argv) { static Janet janet_core_keyword(int32_t argc, Janet *argv) {
int32_t i;
JanetBuffer b; JanetBuffer b;
janet_buffer_init(&b, 0); janet_buffer_init(&b, 0);
for (i = 0; i < argc; ++i) { for (int32_t i = 0; i < argc; ++i)
int32_t len; janet_to_string_b(&b, argv[i]);
const uint8_t *str = janet_to_string(argv[i]);
len = janet_string_length(str);
janet_buffer_push_bytes(&b, str, len);
}
Janet ret = janet_keywordv(b.data, b.count); Janet ret = janet_keywordv(b.data, b.count);
janet_buffer_deinit(&b); janet_buffer_deinit(&b);
return ret; return ret;
} }
static Janet janet_core_buffer(int32_t argc, Janet *argv) { static Janet janet_core_buffer(int32_t argc, Janet *argv) {
int32_t i;
JanetBuffer *b = janet_buffer(0); JanetBuffer *b = janet_buffer(0);
for (i = 0; i < argc; ++i) { for (int32_t i = 0; i < argc; ++i)
int32_t len; janet_to_string_b(b, argv[i]);
const uint8_t *str = janet_to_string(argv[i]);
len = janet_string_length(str);
janet_buffer_push_bytes(b, str, len);
}
return janet_wrap_buffer(b); return janet_wrap_buffer(b);
} }

216
src/core/string.c
View File

@ -106,19 +106,10 @@ const uint8_t *janet_cstring(const char *str) {
/* Temporary buffer size */ /* Temporary buffer size */
#define BUFSIZE 64 #define BUFSIZE 64
static int32_t number_to_string_impl(uint8_t *buf, double x) {
int count = snprintf((char *) buf, BUFSIZE, "%g", x);
return (int32_t) count;
}
static void number_to_string_b(JanetBuffer *buffer, double x) { static void number_to_string_b(JanetBuffer *buffer, double x) {
janet_buffer_ensure(buffer, buffer->count + BUFSIZE, 2); janet_buffer_ensure(buffer, buffer->count + BUFSIZE, 2);
buffer->count += number_to_string_impl(buffer->data + buffer->count, x); int count = snprintf((char *) buffer->data + buffer->count, BUFSIZE, "%g", x);
} buffer->count += count;
static const uint8_t *number_to_string(double x) {
uint8_t buf[BUFSIZE];
return janet_string(buf, number_to_string_impl(buf, x));
} }
/* expects non positive x */ /* expects non positive x */
@ -134,13 +125,17 @@ static int count_dig10(int32_t x) {
} }
} }
static int32_t integer_to_string_impl(uint8_t *buf, int32_t x) { static void integer_to_string_b(JanetBuffer *buffer, int32_t x) {
janet_buffer_extra(buffer, BUFSIZE);
uint8_t *buf = buffer->data + buffer->count;
int32_t neg = 0; int32_t neg = 0;
int32_t len = 0; int32_t len = 0;
if (x == 0) { if (x == 0) {
buf[0] = '0'; buf[0] = '0';
return 1; buffer->count++;
} else if (x > 0) { return;
}
if (x > 0) {
x = -x; x = -x;
} else { } else {
neg = 1; neg = 1;
@ -153,20 +148,16 @@ static int32_t integer_to_string_impl(uint8_t *buf, int32_t x) {
*(--buf) = '0' + digit; *(--buf) = '0' + digit;
x /= 10; x /= 10;
} }
return len + neg; buffer->count += len + neg;
}
static void integer_to_string_b(JanetBuffer *buffer, int32_t x) {
janet_buffer_extra(buffer, BUFSIZE);
buffer->count += integer_to_string_impl(buffer->data + buffer->count, x);
} }
#define HEX(i) (((uint8_t *) janet_base64)[(i)]) #define HEX(i) (((uint8_t *) janet_base64)[(i)])
/* Returns a string description for a pointer. Truncates /* Returns a string description for a pointer. Truncates
* title to 32 characters */ * title to 32 characters */
static int32_t string_description_impl(uint8_t *buf, const char *title, void *pointer) { static void string_description_b(JanetBuffer *buffer, const char *title, void *pointer) {
uint8_t *c = buf; janet_buffer_ensure(buffer, buffer->count + BUFSIZE, 2);
uint8_t *c = buffer->data + buffer->count;
int32_t i; int32_t i;
union { union {
uint8_t bytes[sizeof(void *)]; uint8_t bytes[sizeof(void *)];
@ -192,118 +183,57 @@ static int32_t string_description_impl(uint8_t *buf, const char *title, void *po
*c++ = HEX(byte & 0xF); *c++ = HEX(byte & 0xF);
} }
*c++ = '>'; *c++ = '>';
return (int32_t) (c - buf); buffer->count = c - buffer->data;
#undef POINTSIZE #undef POINTSIZE
} }
static void string_description_b(JanetBuffer *buffer, const char *title, void *pointer) {
janet_buffer_ensure(buffer, buffer->count + BUFSIZE, 2);
buffer->count += string_description_impl(buffer->data + buffer->count, title, pointer);
}
/* Describes a pointer with a title (string_description("bork", myp) returns
* a string "<bork 0x12345678>") */
static const uint8_t *string_description(const char *title, void *pointer) {
uint8_t buf[BUFSIZE];
return janet_string(buf, string_description_impl(buf, title, pointer));
}
#undef HEX #undef HEX
#undef BUFSIZE #undef BUFSIZE
/* TODO - add more characters to escape. static void janet_escape_string_impl(JanetBuffer *buffer, const uint8_t *str, int32_t len) {
* janet_buffer_push_u8(buffer, '"');
* When more escapes are added, they must correspond for (int32_t i = 0; i < len; ++i) {
* to janet_escape_string_impl exactly or a buffer overrun could occur. */
static int32_t janet_escape_string_length(const uint8_t *str, int32_t slen) {
int32_t len = 2;
int32_t i;
for (i = 0; i < slen; ++i) {
switch (str[i]) {
case '"':
case '\n':
case '\r':
case '\0':
case '\\':
len += 2;
break;
default:
if (str[i] < 32 || str[i] > 127)
len += 4;
else
len += 1;
break;
}
}
return len;
}
static void janet_escape_string_impl(uint8_t *buf, const uint8_t *str, int32_t len) {
int32_t i, j;
buf[0] = '"';
for (i = 0, j = 1; i < len; ++i) {
uint8_t c = str[i]; uint8_t c = str[i];
switch (c) { switch (c) {
case '"': case '"':
buf[j++] = '\\'; janet_buffer_push_bytes(buffer, (const uint8_t *)"\\\"", 2);
buf[j++] = '"';
break; break;
case '\n': case '\n':
buf[j++] = '\\'; janet_buffer_push_bytes(buffer, (const uint8_t *)"\\n", 2);
buf[j++] = 'n';
break; break;
case '\r': case '\r':
buf[j++] = '\\'; janet_buffer_push_bytes(buffer, (const uint8_t *)"\\r", 2);
buf[j++] = 'r';
break; break;
case '\0': case '\0':
buf[j++] = '\\'; janet_buffer_push_bytes(buffer, (const uint8_t *)"\\0", 2);
buf[j++] = '0';
break; break;
case '\\': case '\\':
buf[j++] = '\\'; janet_buffer_push_bytes(buffer, (const uint8_t *)"\\\\", 2);
buf[j++] = '\\';
break; break;
default: default:
if (c < 32 || c > 127) { if (c < 32 || c > 127) {
buf[j++] = '\\'; uint8_t buf[4];
buf[j++] = 'x'; buf[0] = '\\';
buf[j++] = janet_base64[(c >> 4) & 0xF]; buf[1] = 'x';
buf[j++] = janet_base64[c & 0xF]; buf[2] = janet_base64[(c >> 4) & 0xF];
buf[3] = janet_base64[c & 0xF];
janet_buffer_push_bytes(buffer, buf, 4);
} else { } else {
buf[j++] = c; janet_buffer_push_u8(buffer, c);
} }
break; break;
} }
} }
buf[j++] = '"'; janet_buffer_push_u8(buffer, '"');
} }
void janet_escape_string_b(JanetBuffer *buffer, const uint8_t *str) { static void janet_escape_string_b(JanetBuffer *buffer, const uint8_t *str) {
int32_t len = janet_string_length(str); janet_escape_string_impl(buffer, str, janet_string_length(str));
int32_t elen = janet_escape_string_length(str, len);
janet_buffer_extra(buffer, elen);
janet_escape_string_impl(buffer->data + buffer->count, str, len);
buffer->count += elen;
}
const uint8_t *janet_escape_string(const uint8_t *str) {
int32_t len = janet_string_length(str);
int32_t elen = janet_escape_string_length(str, len);
uint8_t *buf = janet_string_begin(elen);
janet_escape_string_impl(buf, str, len);
return janet_string_end(buf);
} }
static void janet_escape_buffer_b(JanetBuffer *buffer, JanetBuffer *bx) { static void janet_escape_buffer_b(JanetBuffer *buffer, JanetBuffer *bx) {
int32_t elen = janet_escape_string_length(bx->data, bx->count);
janet_buffer_push_u8(buffer, '@'); janet_buffer_push_u8(buffer, '@');
janet_buffer_extra(buffer, elen); janet_escape_string_impl(buffer, bx->data, bx->count);
janet_escape_string_impl(
buffer->data + buffer->count,
bx->data,
bx->count);
buffer->count += elen;
} }
void janet_description_b(JanetBuffer *buffer, Janet x) { void janet_description_b(JanetBuffer *buffer, Janet x) {
@ -337,9 +267,7 @@ void janet_description_b(JanetBuffer *buffer, Janet x) {
case JANET_ABSTRACT: case JANET_ABSTRACT:
{ {
const char *n = janet_abstract_type(janet_unwrap_abstract(x))->name; const char *n = janet_abstract_type(janet_unwrap_abstract(x))->name;
string_description_b(buffer, string_description_b(buffer, n, janet_unwrap_abstract(x));
n[0] == ':' ? n + 1 : n,
janet_unwrap_abstract(x));
return; return;
} }
case JANET_CFUNCTION: case JANET_CFUNCTION:
@ -370,7 +298,7 @@ void janet_description_b(JanetBuffer *buffer, Janet x) {
} }
fallthrough: fallthrough:
default: default:
string_description_b(buffer, janet_type_names[janet_type(x)] + 1, janet_unwrap_pointer(x)); string_description_b(buffer, janet_type_names[janet_type(x)], janet_unwrap_pointer(x));
break; break;
} }
} }
@ -396,65 +324,12 @@ void janet_to_string_b(JanetBuffer *buffer, Janet x) {
} }
const uint8_t *janet_description(Janet x) { const uint8_t *janet_description(Janet x) {
switch (janet_type(x)) { JanetBuffer b;
case JANET_NIL: janet_buffer_init(&b, 10);
return janet_cstring("nil"); janet_description_b(&b, x);
case JANET_TRUE: const uint8_t *ret = janet_string(b.data, b.count);
return janet_cstring("true"); janet_buffer_deinit(&b);
case JANET_FALSE: return ret;
return janet_cstring("false");
case JANET_NUMBER:
return number_to_string(janet_unwrap_number(x));
case JANET_SYMBOL:
return janet_unwrap_symbol(x);
case JANET_KEYWORD:
{
const uint8_t *kw = janet_unwrap_keyword(x);
uint8_t *str = janet_string_begin(janet_string_length(kw) + 1);
memcpy(str + 1, kw, janet_string_length(kw) + 1);
str[0] = ':';
return janet_string_end(str);
}
case JANET_STRING:
return janet_escape_string(janet_unwrap_string(x));
case JANET_BUFFER:
{
JanetBuffer b;
const uint8_t *ret;
janet_buffer_init(&b, 3);
janet_escape_buffer_b(&b, janet_unwrap_buffer(x));
ret = janet_string(b.data, b.count);
janet_buffer_deinit(&b);
return ret;
}
case JANET_ABSTRACT:
{
const char *n = janet_abstract_type(janet_unwrap_abstract(x))->name;
return string_description(
n[0] == ':' ? n + 1 : n,
janet_unwrap_abstract(x));
}
case JANET_CFUNCTION:
{
Janet check = janet_table_get(janet_vm_registry, x);
if (janet_checktype(check, JANET_SYMBOL)) {
return janet_formatc("<cfunction %V>", check);
}
goto fallthrough;
}
case JANET_FUNCTION:
{
JanetFunction *fun = janet_unwrap_function(x);
JanetFuncDef *def = fun->def;
if (def->name) {
return janet_formatc("<function %S>", def->name);
}
goto fallthrough;
}
fallthrough:
default:
return string_description(janet_type_names[janet_type(x)] + 1, janet_unwrap_pointer(x));
}
} }
/* Convert any value to a janet string. Similar to description, but /* Convert any value to a janet string. Similar to description, but
@ -462,7 +337,14 @@ const uint8_t *janet_description(Janet x) {
const uint8_t *janet_to_string(Janet x) { const uint8_t *janet_to_string(Janet x) {
switch (janet_type(x)) { switch (janet_type(x)) {
default: default:
return janet_description(x); {
JanetBuffer b;
janet_buffer_init(&b, 10);
janet_to_string_b(&b, x);
const uint8_t *ret = janet_string(b.data, b.count);
janet_buffer_deinit(&b);
return ret;
}
case JANET_BUFFER: case JANET_BUFFER:
return janet_string(janet_unwrap_buffer(x)->data, janet_unwrap_buffer(x)->count); return janet_string(janet_unwrap_buffer(x)->data, janet_unwrap_buffer(x)->count);
case JANET_STRING: case JANET_STRING:

4
src/include/janet/janet.h
View File

@ -998,12 +998,10 @@ JANET_API const uint8_t *janet_cstring(const char *cstring);
JANET_API int janet_string_compare(const uint8_t *lhs, const uint8_t *rhs); JANET_API int janet_string_compare(const uint8_t *lhs, const uint8_t *rhs);
JANET_API int janet_string_equal(const uint8_t *lhs, const uint8_t *rhs); JANET_API int janet_string_equal(const uint8_t *lhs, const uint8_t *rhs);
JANET_API int janet_string_equalconst(const uint8_t *lhs, const uint8_t *rhs, int32_t rlen, int32_t rhash); JANET_API int janet_string_equalconst(const uint8_t *lhs, const uint8_t *rhs, int32_t rlen, int32_t rhash);
JANET_API const uint8_t *janet_string_unique(const uint8_t *buf, int32_t len);
JANET_API const uint8_t *janet_cstring_unique(const char *s);
JANET_API const uint8_t *janet_description(Janet x); JANET_API const uint8_t *janet_description(Janet x);
JANET_API const uint8_t *janet_to_string(Janet x); JANET_API const uint8_t *janet_to_string(Janet x);
JANET_API void janet_to_string_b(JanetBuffer *buffer, Janet x); JANET_API void janet_to_string_b(JanetBuffer *buffer, Janet x);
JANET_API void janet_to_description_b(JanetBuffer *buffer, Janet x); JANET_API void janet_description_b(JanetBuffer *buffer, Janet x);
#define janet_cstringv(cstr) janet_wrap_string(janet_cstring(cstr)) #define janet_cstringv(cstr) janet_wrap_string(janet_cstring(cstr))
#define janet_stringv(str, len) janet_wrap_string(janet_string((str), (len))) #define janet_stringv(str, len) janet_wrap_string(janet_string((str), (len)))
JANET_API const uint8_t *janet_formatc(const char *format, ...); JANET_API const uint8_t *janet_formatc(const char *format, ...);