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

added error handling in formatting fucntions

Browse Source
This commit is contained in:
hyunghwan.chung 2018-02-05 15:59:58 +00:00
parent 15ebf5537f
commit 51e68fcee4
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
moo/lib/logfmt.c
View File

@ -376,35 +376,35 @@ redo:
typedef moo_ooi_t (*outbfmt_t) (moo_t* moo, moo_oow_t mask, const moo_bch_t* fmt, ...); typedef moo_ooi_t (*outbfmt_t) (moo_t* moo, moo_oow_t mask, const moo_bch_t* fmt, ...);
static void print_object (moo_t* moo, moo_oow_t mask, moo_oop_t oop, outbfmt_t outbfmt) static int print_object (moo_t* moo, moo_oow_t mask, moo_oop_t oop, outbfmt_t outbfmt)
{ {
if (oop == moo->_nil) if (oop == moo->_nil)
{ {
outbfmt (moo, mask, "nil"); if (outbfmt(moo, mask, "nil") <= -1) return -1;
} }
else if (oop == moo->_true) else if (oop == moo->_true)
{ {
outbfmt (moo, mask, "true"); if (outbfmt(moo, mask, "true") <= -1) return -1;
} }
else if (oop == moo->_false) else if (oop == moo->_false)
{ {
outbfmt (moo, mask, "false"); if (outbfmt(moo, mask, "false") <= -1) return -1;
} }
else if (MOO_OOP_IS_SMOOI(oop)) else if (MOO_OOP_IS_SMOOI(oop))
{ {
outbfmt (moo, mask, "%zd", MOO_OOP_TO_SMOOI(oop)); if (outbfmt(moo, mask, "%zd", MOO_OOP_TO_SMOOI(oop)) <= -1) return -1;
} }
else if (MOO_OOP_IS_SMPTR(oop)) else if (MOO_OOP_IS_SMPTR(oop))
{ {
outbfmt (moo, mask, "%p", MOO_OOP_TO_SMPTR(oop)); if (outbfmt(moo, mask, "%p", MOO_OOP_TO_SMPTR(oop)) <= -1) return -1;
} }
else if (MOO_OOP_IS_CHAR(oop)) else if (MOO_OOP_IS_CHAR(oop))
{ {
outbfmt (moo, mask, "$%.1C", MOO_OOP_TO_CHAR(oop)); if (outbfmt(moo, mask, "$%.1jc", MOO_OOP_TO_CHAR(oop)) <= -1) return -1;
} }
else if (MOO_OOP_IS_ERROR(oop)) else if (MOO_OOP_IS_ERROR(oop))
{ {
outbfmt (moo, mask, "error(%zd)", MOO_OOP_TO_ERROR(oop)); if (outbfmt(moo, mask, "error(%zd)", MOO_OOP_TO_ERROR(oop)) <= -1) return -1;
} }
else else
{ {
@ -417,26 +417,26 @@ static void print_object (moo_t* moo, moo_oow_t mask, moo_oop_t oop, outbfmt_t o
if (c == moo->_large_negative_integer) if (c == moo->_large_negative_integer)
{ {
moo_oow_t i; moo_oow_t i;
outbfmt (moo, mask, "-16r"); if (outbfmt (moo, mask, "-16r") <= -1) return -1;
for (i = MOO_OBJ_GET_SIZE(oop); i > 0;) for (i = MOO_OBJ_GET_SIZE(oop); i > 0;)
{ {
outbfmt (moo, mask, "%0*lX", (int)(MOO_SIZEOF(moo_liw_t) * 2), (unsigned long)((moo_oop_liword_t)oop)->slot[--i]); if (outbfmt(moo, mask, "%0*lX", (int)(MOO_SIZEOF(moo_liw_t) * 2), (unsigned long)((moo_oop_liword_t)oop)->slot[--i]) <= -1) return -1;
} }
} }
else if (c == moo->_large_positive_integer) else if (c == moo->_large_positive_integer)
{ {
moo_oow_t i; moo_oow_t i;
outbfmt (moo, mask, "16r"); if (outbfmt (moo, mask, "16r") <= -1) return -1;
for (i = MOO_OBJ_GET_SIZE(oop); i > 0;) for (i = MOO_OBJ_GET_SIZE(oop); i > 0;)
{ {
outbfmt (moo, mask, "%0*lX", (int)(MOO_SIZEOF(moo_liw_t) * 2), (unsigned long)((moo_oop_liword_t)oop)->slot[--i]); if (outbfmt(moo, mask, "%0*lX", (int)(MOO_SIZEOF(moo_liw_t) * 2), (unsigned long)((moo_oop_liword_t)oop)->slot[--i]) <= -1) return -1;
} }
} }
else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_CHAR) else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_CHAR)
{ {
if (c == moo->_symbol) if (c == moo->_symbol)
{ {
outbfmt (moo, mask, "#%.*js", MOO_OBJ_GET_SIZE(oop), ((moo_oop_char_t)oop)->slot); if (outbfmt(moo, mask, "#%.*js", MOO_OBJ_GET_SIZE(oop), MOO_OBJ_GET_CHAR_SLOT(oop)) <= -1) return -1;
} }
else /*if ((moo_oop_t)c == moo->_string)*/ else /*if ((moo_oop_t)c == moo->_string)*/
{ {
@ -457,7 +457,7 @@ static void print_object (moo_t* moo, moo_oow_t mask, moo_oop_t oop, outbfmt_t o
{ {
moo_ooch_t escaped; moo_ooch_t escaped;
outbfmt (moo, mask, "S'"); if (outbfmt(moo, mask, "S'") <= -1) return -1;
for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++) for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++)
{ {
ch = ((moo_oop_char_t)oop)->slot[i]; ch = ((moo_oop_char_t)oop)->slot[i];
@ -495,76 +495,82 @@ static void print_object (moo_t* moo, moo_oow_t mask, moo_oop_t oop, outbfmt_t o
} }
if (escaped == ch) if (escaped == ch)
outbfmt (moo, mask, "\\x%X", ch); {
else if (outbfmt(moo, mask, "\\x%X", ch) <= -1) return -1;
outbfmt (moo, mask, "\\%jc", escaped);
} }
else else
{ {
outbfmt (moo, mask, "%jc", ch); if (outbfmt(moo, mask, "\\%jc", escaped) <= -1) return -1;
}
}
else
{
if (outbfmt(moo, mask, "%jc", ch) <= -1) return -1;
} }
} }
outbfmt (moo, mask, "'"); if (outbfmt(moo, mask, "'") <= -1) return -1;
} }
else else
{ {
outbfmt (moo, mask, "'%.*js'", MOO_OBJ_GET_SIZE(oop), ((moo_oop_char_t)oop)->slot); if (outbfmt(moo, mask, "'%.*js'", MOO_OBJ_GET_SIZE(oop), MOO_OBJ_GET_CHAR_SLOT(oop)) <= -1) return -1;
} }
} }
} }
else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_BYTE) else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_BYTE)
{ {
outbfmt (moo, mask, "#["); if (outbfmt(moo, mask, "#[") <= -1) return -1;
for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++) for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++)
{ {
outbfmt (moo, mask, " %d", ((moo_oop_byte_t)oop)->slot[i]); if (outbfmt(moo, mask, " %d", ((moo_oop_byte_t)oop)->slot[i]) <= -1) return -1;
} }
outbfmt (moo, mask, "]"); if (outbfmt(moo, mask, "]") <= -1) return -1;
} }
else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_HALFWORD) else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_HALFWORD)
{ {
outbfmt (moo, mask, "#[["); /* TODO: fix this symbol/notation */ if (outbfmt(moo, mask, "#[[") <= -1) return -1;; /* TODO: fix this symbol/notation */
for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++) for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++)
{ {
outbfmt (moo, mask, " %zX", (moo_oow_t)((moo_oop_halfword_t)oop)->slot[i]); if (outbfmt(moo, mask, " %zX", (moo_oow_t)((moo_oop_halfword_t)oop)->slot[i]) <= -1) return -1;
} }
outbfmt (moo, mask, "]]"); outbfmt (moo, mask, "]]");
} }
else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_WORD) else if (MOO_OBJ_GET_FLAGS_TYPE(oop) == MOO_OBJ_TYPE_WORD)
{ {
outbfmt (moo, mask, "#[[["); /* TODO: fix this symbol/notation */ if (outbfmt(moo, mask, "#[[[") <= -1) return -1;; /* TODO: fix this symbol/notation */
for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++) for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++)
{ {
outbfmt (moo, mask, " %zX", ((moo_oop_word_t)oop)->slot[i]); if (outbfmt(moo, mask, " %zX", ((moo_oop_word_t)oop)->slot[i]) <= -1) return -1;
} }
outbfmt (moo, mask, "]]]"); if (outbfmt(moo, mask, "]]]") <= -1) return -1;
} }
else if (c == moo->_array) else if (c == moo->_array)
{ {
outbfmt (moo, mask, "#("); if (outbfmt(moo, mask, "#(") <= -1) return -1;
for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++) for (i = 0; i < MOO_OBJ_GET_SIZE(oop); i++)
{ {
outbfmt (moo, mask, " "); if (outbfmt(moo, mask, " ") <= -1) return -1;
print_object (moo, mask, ((moo_oop_oop_t)oop)->slot[i], outbfmt); if (print_object(moo, mask, ((moo_oop_oop_t)oop)->slot[i], outbfmt) <= -1) return -1;
} }
outbfmt (moo, mask, ")"); if (outbfmt(moo, mask, ")") <= -1) return -1;
} }
else if (c == moo->_class) else if (c == moo->_class)
{ {
/* print the class name */ /* print the class name */
outbfmt (moo, mask, "%.*js", MOO_OBJ_GET_SIZE(((moo_oop_class_t)oop)->name), ((moo_oop_class_t)oop)->name->slot); if (outbfmt(moo, mask, "%.*js", MOO_OBJ_GET_SIZE(((moo_oop_class_t)oop)->name), ((moo_oop_class_t)oop)->name->slot) <= -1) return -1;
} }
else if (c == moo->_association) else if (c == moo->_association)
{ {
outbfmt (moo, mask, "%O -> %O", ((moo_oop_association_t)oop)->key, ((moo_oop_association_t)oop)->value); if (outbfmt(moo, mask, "%O -> %O", ((moo_oop_association_t)oop)->key, ((moo_oop_association_t)oop)->value) <= -1) return -1;
} }
else else
{ {
outbfmt (moo, mask, "<<%.*js>>", MOO_OBJ_GET_SIZE(c->name), ((moo_oop_char_t)c->name)->slot); if (outbfmt(moo, mask, "<<%.*js>>", MOO_OBJ_GET_SIZE(c->name), ((moo_oop_char_t)c->name)->slot) <= -1) return -1;
} }
} }
return 0;
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */

2
moo/lib/logfmtv.h
View File

@ -553,7 +553,7 @@ reswitch:
} }
case 'O': /* object - ignore precision, width, adjustment */ case 'O': /* object - ignore precision, width, adjustment */
print_object (moo, data->mask, va_arg(ap, moo_oop_t), outbfmt); if (print_object(moo, data->mask, va_arg(ap, moo_oop_t), outbfmt) <= -1) goto oops;
break; break;
#if 0 #if 0