From d47773730465c04b81d9cff5889a001e1b6eb35f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kochma=C5=84ski?= Date: Thu, 20 Aug 2015 13:08:17 +0200 Subject: [PATCH] serror: move stack error to sys package MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Mark it also as internal API Signed-off-by: Daniel Kochmański --- src/c/stacks.d | 8 ++++---- src/c/symbols_list.h | 2 +- src/c/symbols_list2.h | 2 +- src/h/external.h | 1 - src/h/internal.h | 3 +++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/c/stacks.d b/src/c/stacks.d index 1661391..2ff99fc 100644 --- a/src/c/stacks.d +++ b/src/c/stacks.d @@ -71,12 +71,12 @@ ecl_cs_overflow(void) ecl_unrecoverable_error(env, stack_overflow_msg); if (env->cs_max_size == (cl_index)0 || env->cs_size < env->cs_max_size) - cl_serror(6, make_constant_base_string("Extend stack size"), + si_serror(6, make_constant_base_string("Extend stack size"), @'ext::stack-overflow', @':size', ecl_make_fixnum(size), @':type', @'ext::c-stack'); else - cl_serror(6, ECL_NIL, + si_serror(6, ECL_NIL, @'ext::stack-overflow', @':size', ECL_NIL, @':type', @'ext::c-stack'); @@ -167,7 +167,7 @@ ecl_bds_overflow(void) ecl_unrecoverable_error(env, stack_overflow_msg); } env->bds_limit += margin; - cl_serror(6, make_constant_base_string("Extend stack size"), + si_serror(6, make_constant_base_string("Extend stack size"), @'ext::stack-overflow', @':size', ecl_make_fixnum(size), @':type', @'ext::binding-stack'); ecl_bds_set_size(env, size + (size / 2)); @@ -519,7 +519,7 @@ frs_overflow(void) /* used as condition in list.d */ ecl_unrecoverable_error(env, stack_overflow_msg); } env->frs_limit += margin; - cl_serror(6, make_constant_base_string("Extend stack size"), + si_serror(6, make_constant_base_string("Extend stack size"), @'ext::stack-overflow', @':size', ecl_make_fixnum(size), @':type', @'ext::frame-stack'); frs_set_size(env, size + size / 2); diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h index b0f824b..820df6d 100755 --- a/src/c/symbols_list.h +++ b/src/c/symbols_list.h @@ -292,7 +292,6 @@ cl_symbols[] = { {"CELL-ERROR", CL_ORDINARY, NULL, -1, OBJNULL}, {"CELL-ERROR-NAME", CL_ORDINARY, NULL, -1, OBJNULL}, {"CERROR", CL_ORDINARY, cl_cerror, -1, OBJNULL}, -{SYS_ "SERROR", CL_ORDINARY, cl_serror, -1, OBJNULL}, {"CHAR", CL_ORDINARY, cl_char, 2, OBJNULL}, {"CHAR-CODE", CL_ORDINARY, cl_char_code, 1, OBJNULL}, {"CHAR-CODE-LIMIT", CL_CONSTANT, NULL, -1, ecl_make_fixnum(ECL_CHAR_CODE_LIMIT)}, @@ -1233,6 +1232,7 @@ cl_symbols[] = { {EXT_ "SAFE-EVAL", EXT_ORDINARY, ECL_NAME(si_safe_eval), -1, OBJNULL}, {SYS_ "SCH-FRS-BASE", SI_ORDINARY, si_sch_frs_base, 2, OBJNULL}, {SYS_ "SCHAR-SET", SI_ORDINARY, si_char_set, 3, OBJNULL}, +{SYS_ "SERROR", SI_ORDINARY, si_serror, -1, OBJNULL}, {SYS_ "SHARP-A-READER", SI_ORDINARY, NULL, -1, OBJNULL}, {SYS_ "SHARP-S-READER", SI_ORDINARY, NULL, -1, OBJNULL}, {SYS_ "SELECT-PACKAGE", SI_ORDINARY, si_select_package, 1, OBJNULL}, diff --git a/src/c/symbols_list2.h b/src/c/symbols_list2.h index af2ef27..8a9e314 100644 --- a/src/c/symbols_list2.h +++ b/src/c/symbols_list2.h @@ -292,7 +292,6 @@ cl_symbols[] = { {"CELL-ERROR",NULL}, {"CELL-ERROR-NAME",NULL}, {"CERROR","cl_cerror"}, -{SYS_ "SERROR","cl_serror"}, {"CHAR","cl_char"}, {"CHAR-CODE","cl_char_code"}, {"CHAR-CODE-LIMIT",NULL}, @@ -1233,6 +1232,7 @@ cl_symbols[] = { {EXT_ "SAFE-EVAL","ECL_NAME(si_safe_eval)"}, {SYS_ "SCH-FRS-BASE","si_sch_frs_base"}, {SYS_ "SCHAR-SET","si_char_set"}, +{SYS_ "SERROR","si_serror"}, {SYS_ "SHARP-A-READER",NULL}, {SYS_ "SHARP-S-READER",NULL}, {SYS_ "SELECT-PACKAGE","si_select_package"}, diff --git a/src/h/external.h b/src/h/external.h index 1864ac2..1258583 100755 --- a/src/h/external.h +++ b/src/h/external.h @@ -555,7 +555,6 @@ extern ECL_API cl_object si_bc_join(cl_object lex, cl_object code, cl_object dat extern ECL_API cl_object cl_error _ECL_ARGS((cl_narg narg, cl_object eformat, ...)) ecl_attr_noreturn; extern ECL_API cl_object cl_cerror _ECL_ARGS((cl_narg narg, cl_object cformat, cl_object eformat, ...)); -extern ECL_API cl_object cl_serror _ECL_ARGS((cl_narg narg, cl_object cformat, cl_object eformat, ...)); extern ECL_API void ecl_internal_error(const char *s) ecl_attr_noreturn; extern ECL_API void ecl_unrecoverable_error(cl_env_ptr the_env, const char *message) ecl_attr_noreturn; diff --git a/src/h/internal.h b/src/h/internal.h index e5c7bde..d7b64f7 100755 --- a/src/h/internal.h +++ b/src/h/internal.h @@ -132,6 +132,9 @@ typedef struct cl_compiler_env *cl_compiler_env_ptr; extern void _ecl_unexpected_return() ecl_attr_noreturn; extern cl_object _ecl_strerror(int code); +extern ECL_API cl_object si_serror _ECL_ARGS +((cl_narg narg, cl_object cformat, cl_object eformat, ...)); + /* eval.d */ -- 2.9.0