mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-12-14 12:38:09 +00:00
Code Issues 1 Releases Wiki Activity

Add %M, %m, %N, and %n formatters.

Browse Source 
These will not truncate long values.
This commit is contained in:
Calvin Rose
2020-04-26 13:17:28 -05:00
parent 7b5f40772f
commit f6bd41ada7
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -2,7 +2,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## Unreleased - ??? ## Unreleased - ???
- Add `%M`, `%m`, `%N`, and `%n` formatters to formatting functions. These are the
same as `%Q`, `%q`, `%P`, and `%p`, but will not truncate long values.
- Add beta `net/` module to core for socket based networking. - Add beta `net/` module to core for socket based networking.
- Add the `dedent` function.
- Add the `parse` function to parse strings of source code more conveniently. - Add the `parse` function to parse strings of source code more conveniently.
- Add `jpm rule-tree` subcommand. - Add `jpm rule-tree` subcommand.
- Add `--offline` flag to jpm to force use of the cache. - Add `--offline` flag to jpm to force use of the cache.

29
src/core/pp.c
View File

@@ -527,7 +527,7 @@ static void janet_pretty_one(struct pretty *S, Janet x, int is_dict_value) {
if (!isarray && !(S->flags & JANET_PRETTY_ONELINE) && len >= JANET_PRETTY_IND_ONELINE) if (!isarray && !(S->flags & JANET_PRETTY_ONELINE) && len >= JANET_PRETTY_IND_ONELINE)
janet_buffer_push_u8(S->buffer, ' '); janet_buffer_push_u8(S->buffer, ' ');
if (is_dict_value && len >= JANET_PRETTY_IND_ONELINE) print_newline(S, 0); if (is_dict_value && len >= JANET_PRETTY_IND_ONELINE) print_newline(S, 0);
if (len > JANET_PRETTY_ARRAY_LIMIT) { if (len > JANET_PRETTY_ARRAY_LIMIT && !(S->flags && JANET_PRETTY_NOTRUNC)) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (i) print_newline(S, 0); if (i) print_newline(S, 0);
janet_pretty_one(S, arr[i], 0); janet_pretty_one(S, arr[i], 0);
@@ -591,7 +591,7 @@ static void janet_pretty_one(struct pretty *S, Janet x, int is_dict_value) {
if (is_dict_value && len >= JANET_PRETTY_DICT_ONELINE) print_newline(S, 0); if (is_dict_value && len >= JANET_PRETTY_DICT_ONELINE) print_newline(S, 0);
for (i = 0; i < cap; i++) { for (i = 0; i < cap; i++) {
if (!janet_checktype(kvs[i].key, JANET_NIL)) { if (!janet_checktype(kvs[i].key, JANET_NIL)) {
if (counter == JANET_PRETTY_DICT_LIMIT) { if (counter == JANET_PRETTY_DICT_LIMIT && !(S->flags && JANET_PRETTY_NOTRUNC)) {
print_newline(S, 0); print_newline(S, 0);
janet_buffer_push_cstring(S->buffer, "..."); janet_buffer_push_cstring(S->buffer, "...");
break; break;
@@ -802,6 +802,10 @@ void janet_formatbv(JanetBuffer *b, const char *format, va_list args) {
pushtypes(b, types); pushtypes(b, types);
break; break;
} }
case 'M':
case 'm':
case 'N':
case 'n':
case 'Q': case 'Q':
case 'q': case 'q':
case 'P': case 'P':
@@ -809,11 +813,13 @@ void janet_formatbv(JanetBuffer *b, const char *format, va_list args) {
int depth = atoi(precision); int depth = atoi(precision);
if (depth < 1) depth = 4; if (depth < 1) depth = 4;
char d = c[-1]; char d = c[-1];
int has_color = (d == 'P') || (d == 'Q'); int has_color = (d == 'P') || (d == 'Q') || (d == 'M') || (d == 'N');
int has_oneline = (d == 'Q') || (d == 'q'); int has_oneline = (d == 'Q') || (d == 'q') || (d == 'N') || (d == 'n');
int has_notrunc = (d == 'M') || (d == 'm') || (d == 'N') || (d == 'n');
int flags = 0; int flags = 0;
flags |= has_color ? JANET_PRETTY_COLOR : 0; flags |= has_color ? JANET_PRETTY_COLOR : 0;
flags |= has_oneline ? JANET_PRETTY_ONELINE : 0; flags |= has_oneline ? JANET_PRETTY_ONELINE : 0;
flags |= has_notrunc ? JANET_PRETTY_NOTRUNC : 0;
janet_pretty_(b, depth, flags, va_arg(args, Janet), startlen); janet_pretty_(b, depth, flags, va_arg(args, Janet), startlen);
break; break;
} }
@@ -946,19 +952,24 @@ void janet_buffer_format(
janet_description_b(b, argv[arg]); janet_description_b(b, argv[arg]);
break; break;
} }
case 'M':
case 'm':
case 'N':
case 'n':
case 'Q': case 'Q':
case 'q': case 'q':
case 'P': case 'P':
case 'p': { /* janet pretty , precision = depth */ case 'p': { /* janet pretty , precision = depth */
int depth = atoi(precision); int depth = atoi(precision);
if (depth < 1) if (depth < 1) depth = 4;
depth = 4; char d = strfrmt[-1];
char c = strfrmt[-1]; int has_color = (d == 'P') || (d == 'Q') || (d == 'M') || (d == 'N');
int has_color = (c == 'P') || (c == 'Q'); int has_oneline = (d == 'Q') || (d == 'q') || (d == 'N') || (d == 'n');
int has_oneline = (c == 'Q') || (c == 'q'); int has_notrunc = (d == 'M') || (d == 'm') || (d == 'N') || (d == 'n');
int flags = 0; int flags = 0;
flags |= has_color ? JANET_PRETTY_COLOR : 0; flags |= has_color ? JANET_PRETTY_COLOR : 0;
flags |= has_oneline ? JANET_PRETTY_ONELINE : 0; flags |= has_oneline ? JANET_PRETTY_ONELINE : 0;
flags |= has_notrunc ? JANET_PRETTY_NOTRUNC : 0;
janet_pretty_(b, depth, flags, argv[arg], startlen); janet_pretty_(b, depth, flags, argv[arg], startlen);
break; break;
} }

1
src/include/janet.h
View File

@@ -1362,6 +1362,7 @@ JANET_API int janet_verify(JanetFuncDef *def);
/* Pretty printing */ /* Pretty printing */
#define JANET_PRETTY_COLOR 1 #define JANET_PRETTY_COLOR 1
#define JANET_PRETTY_ONELINE 2 #define JANET_PRETTY_ONELINE 2
#define JANET_PRETTY_NOTRUNC 4
JANET_API JanetBuffer *janet_pretty(JanetBuffer *buffer, int depth, int flags, Janet x); JANET_API JanetBuffer *janet_pretty(JanetBuffer *buffer, int depth, int flags, Janet x);
/* Misc */ /* Misc */