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

fixed an escaping problem in printing a character or a string object

Browse Source
This commit is contained in:
hyung-hwan 2018-03-29 04:47:03 +00:00
parent 3fb9b31192
commit dae10ef59c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/print.c
View File

@ -124,10 +124,14 @@ static struct
static HCL_INLINE int print_single_char (hcl_t* hcl, int mask, hcl_ooch_t ch, hcl_outbfmt_t outbfmt) static HCL_INLINE int print_single_char (hcl_t* hcl, int mask, hcl_ooch_t ch, hcl_outbfmt_t outbfmt)
{ {
hcl_oochu_t chu = (hcl_oochu_t)ch; hcl_oochu_t chu = (hcl_oochu_t)ch;
if (chu == '\\' || chu == '\"')
{
if (outbfmt(hcl, mask, "\\%jc", chu) <= -1) return -1;
}
#if defined(HCL_OOCH_IS_UCH) #if defined(HCL_OOCH_IS_UCH)
if (chu < ' ') else if (chu < ' ')
#else #else
if (chu < ' ' || chu >= 0x80) else if (chu < ' ' || chu >= 0x80)
#endif #endif
{ {
hcl_oochu_t escaped; hcl_oochu_t escaped;
@ -168,7 +172,7 @@ static HCL_INLINE int print_single_char (hcl_t* hcl, int mask, hcl_ooch_t ch, hc
#if (HCL_SIZEOF_OOCH_T >= 4) #if (HCL_SIZEOF_OOCH_T >= 4)
if (chu >= 0x10000u) if (chu >= 0x10000u)
{ {
if (outbfmt(hcl, mask, "\\U%X", chu) <= -1) return -1; if (outbfmt(hcl, mask, "\\U%08X", chu) <= -1) return -1;
} }
else else
#endif #endif
@ -176,12 +180,12 @@ static HCL_INLINE int print_single_char (hcl_t* hcl, int mask, hcl_ooch_t ch, hc
#if (HCL_SIZEOF_OOCH_T >= 2) #if (HCL_SIZEOF_OOCH_T >= 2)
if (chu >= 0x100u) if (chu >= 0x100u)
{ {
if (outbfmt(hcl, mask, "\\u%X", chu) <= -1) return -1; if (outbfmt(hcl, mask, "\\u%04X", chu) <= -1) return -1;
} }
else else
#endif #endif
{ {
if (outbfmt(hcl, mask, "\\x%X", chu) <= -1) return -1; if (outbfmt(hcl, mask, "\\x%02X", chu) <= -1) return -1;
} }
} }
} }
@ -336,7 +340,7 @@ next:
for (i = 0; i < HCL_OBJ_GET_SIZE(obj); i++) for (i = 0; i < HCL_OBJ_GET_SIZE(obj); i++)
{ {
ch = ((hcl_oop_char_t)obj)->slot[i]; ch = ((hcl_oop_char_t)obj)->slot[i];
if (ch < ' ') if (ch < ' ' || ch == '\"' || ch == '\\')
{ {
escape = 1; escape = 1;
break; break;