hyung-hwan/hcl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed the wrong word output for #nil in the json format

Browse Source
This commit is contained in:
hyung-hwan 2018-03-02 07:58:37 +00:00
parent 60a32bf642
commit 5aee382e9e
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/print.c
View File

@ -83,6 +83,10 @@ enum
WORD_TRUE, WORD_TRUE,
WORD_FALSE, WORD_FALSE,
WORD_NIL_JSON, /* this must be greater than WORD_NIL by 3 */
WORD_TRUE_JSON, /* this must be greater than WORD_TRUE by 3 */
WORD_FALSE_JSON, /* this must be greater than WORD_FALSE by 3 */
WORD_SET, WORD_SET,
WORD_CFRAME, WORD_CFRAME,
WORD_PRIM, WORD_PRIM,
@ -103,6 +107,10 @@ static struct
{ 5, { '#','t', 'r', 'u', 'e' } }, { 5, { '#','t', 'r', 'u', 'e' } },
{ 6, { '#','f', 'a', 'l', 's', 'e' } }, { 6, { '#','f', 'a', 'l', 's', 'e' } },
{ 4, { 'n', 'u', 'l', 'l' } },
{ 4, { 't', 'r', 'u', 'e' } },
{ 5, { 'f', 'a', 'l', 's', 'e' } },
{ 6, { '#','<','S','E','T','>' } }, { 6, { '#','<','S','E','T','>' } },
{ 9, { '#','<','C','F','R','A','M','E','>' } }, { 9, { '#','<','C','F','R','A','M','E','>' } },
{ 7, { '#','<','P','R','I','M','>' } }, { 7, { '#','<','P','R','I','M','>' } },
@ -196,7 +204,6 @@ static HCL_INLINE int outfmt_obj (hcl_t* hcl, int mask, hcl_oop_t obj, hcl_outbf
print_stack_t ps; print_stack_t ps;
int brand; int brand;
int word_index; int word_index;
int word_offset;
int json; int json;
static const hcl_bch_t *opening_parens[][2] = static const hcl_bch_t *opening_parens[][2] =
@ -250,18 +257,15 @@ next:
} }
case HCL_BRAND_NIL: case HCL_BRAND_NIL:
word_index = WORD_NIL; word_index = WORD_NIL + (json * 3);
word_offset = json;
goto print_word; goto print_word;
case HCL_BRAND_TRUE: case HCL_BRAND_TRUE:
word_index = WORD_TRUE; word_index = WORD_TRUE + (json * 3);
word_offset = json;
goto print_word; goto print_word;
case HCL_BRAND_FALSE: case HCL_BRAND_FALSE:
word_index = WORD_FALSE; word_index = WORD_FALSE + (json * 3);
word_offset = json;
goto print_word; goto print_word;
case HCL_BRAND_PBIGINT: case HCL_BRAND_PBIGINT:
@ -624,7 +628,7 @@ next:
return -1; return -1;
print_word: print_word:
if (outbfmt(hcl, mask, "%.*js", word[word_index].len - word_offset, word[word_index].ptr + word_offset) <= -1) return -1; if (outbfmt(hcl, mask, "%.*js", word[word_index].len, word[word_index].ptr) <= -1) return -1;
break; break;
} }

5
lib/read.c
View File

@ -284,10 +284,11 @@ static HCL_INLINE int is_alnumchar (hcl_ooci_t c)
static HCL_INLINE int is_delimiter (hcl_ooci_t c) static HCL_INLINE int is_delimiter (hcl_ooci_t c)
{ {
return c == '(' || c == ')' || c == '[' || c == ']' || c == '{' || c == '}' || c == '\"' || c == '\'' || c == '#' || c == ';' || c == '|' || c == '.' || is_spacechar(c) || c == HCL_UCI_EOF; return c == '(' || c == ')' || c == '[' || c == ']' || c == '{' || c == '}' ||
c == '\"' || c == '\'' || c == '#' || c == ';' || c == '|' || c == '.' ||
c == ',' || c == ':' || is_spacechar(c) || c == HCL_UCI_EOF;
} }
static int copy_string_to (hcl_t* hcl, const hcl_oocs_t* src, hcl_oocs_t* dst, hcl_oow_t* dst_capa, int append, hcl_ooch_t add_delim) static int copy_string_to (hcl_t* hcl, const hcl_oocs_t* src, hcl_oocs_t* dst, hcl_oow_t* dst_capa, int append, hcl_ooch_t add_delim)
{ {
hcl_oow_t len, pos; hcl_oow_t len, pos;