@@ -152,11 +152,16 @@ static PkRef build(PkJsonDecoder *decoder, PkASTNode *node, PkError **errorPtr) if (PK_AST_NODE_UNARY_OP(node) != '-' || !operand || PK_AST_NODE_TYPE(operand) != kPkASTNodeNumber) { - PkAbort2( - "The unary minus operator applied to unsigned integer is only allowed: " - "operator='%c', operand=%d", - PK_AST_NODE_UNARY_OP(node), - PK_AST_NODE_TYPE(operand)); + if (errorPtr != NULL) { + *errorPtr = PkErrorCreateWithFormat( + kPkErrorBuiltinDomain, + kPkErrorSemanticError, + "The unary minus operator applied to unsigned integer is only allowed: " + "operator='%c', operand=%d", + PK_AST_NODE_UNARY_OP(node), + PK_AST_NODE_TYPE(operand)); + } + return NULL; } return PkNumberNagate(PK_AST_NODE_NUMBER_NUMBER(operand)); @@ -215,7 +220,13 @@ static PkRef build(PkJsonDecoder *decoder, PkASTNode *node, PkError **errorPtr) return array; } default: - PkAbort1("Unrecognized node:%d", PK_AST_NODE_TYPE(node)); + if (errorPtr != NULL) { + *errorPtr = PkErrorCreateWithFormat( + kPkErrorBuiltinDomain, + kPkErrorSemanticError, + "Unrecognized node:%d", + PK_AST_NODE_TYPE(node)); + } break; } @@ -230,10 +241,14 @@ PkRef PkJsonDecoderDecode(PkJsonDecoder *decoder, PkError **errorPtr) { const PkASTNodeType type = PK_AST_NODE_TYPE(node); if (type != kPkASTNodeObject && type != kPkASTNodeArray) { - PkAbort1( - "Top level has to be an object {...} or array [...], " - "but was an unrecognized node (type: %d)", - type); + if (errorPtr != NULL) { + *errorPtr = PkErrorCreateWithFormat( + kPkErrorBuiltinDomain, + kPkErrorSemanticError, + "Top level has to be an object {...} or array [...], " + "but was an unrecognized node (type: %d)", + type); + } } else { value = build(decoder, node, errorPtr); } src/json.c 8a0dfa1ca1331d50b51beed387531e790c00cc6d Takanori Ishikawa takanori.ishikawa@gmail.com http://github.com/ishikawa/pekoe/commit/0a49fac68c88c79f758bf60ff5913a123d52681d 0a49fac68c88c79f758bf60ff5913a123d52681d 2009-10-14T07:48:14-07:00 2009-10-14T07:48:14-07:00 Use PkError object instead of assert, PkAbort function in json.c 7f18442d446179130e0f41ca7d350f6aa91061a5 Takanori Ishikawa takanori.ishikawa@gmail.com