diff --git a/src/eval-apply.c b/src/eval-apply.c index 1af5a5bf..4d85808b 100644 --- a/src/eval-apply.c +++ b/src/eval-apply.c @@ -432,7 +432,7 @@ eval_apply: else if (R3 == cell_unspecified) return R1; else - error (cell_symbol_system_error, make_string0 ("eval/apply unknown continuation")); + assert_msg (0, "eval/apply unknown continuation"); evlis: if (R1 == cell_nil) @@ -873,7 +873,11 @@ begin_expand: else if (TYPE (R1) == TPORT) input = set_current_input_port (R1); else - assert_msg (0, "0"); + { + eputs ("begin_expand failed, R1="); + display_error_ (R1); + assert_msg (0, "begin-expand-boom 0"); + } push_cc (input, R2, R0, cell_vm_return); x = read_input_file_env (R0); diff --git a/src/hash.c b/src/hash.c index 9b9dddd7..34122adb 100644 --- a/src/hash.c +++ b/src/hash.c @@ -46,24 +46,27 @@ hashq_ (SCM x, long size) int hash_ (SCM x, long size) { - if (TYPE (x) == TSTRING) - return hash_cstring (cell_bytes (STRING (x)), size); - assert_msg (0, "0"); - return hashq_ (x, size); + if (TYPE (x) != TSTRING) + { + eputs ("hash_ failed, not a string:"); + display_error_ (x); + assert_msg (0, "0"); + } + return hash_cstring (cell_bytes (STRING (x)), size); } SCM hashq (SCM x, SCM size) { + eputs ("hashq not supporteed\n"); assert_msg (0, "0"); - return make_number (hashq_ (x, VALUE (size))); } SCM hash (SCM x, SCM size) { + eputs ("hash not supporteed\n"); assert_msg (0, "0"); - return make_number (hash_ (x, VALUE (size))); } SCM diff --git a/src/mes.c b/src/mes.c index eca6ec58..233c900e 100644 --- a/src/mes.c +++ b/src/mes.c @@ -178,16 +178,16 @@ length (SCM x) SCM error (SCM key, SCM x) { -#if !__MESC_MES__ - SCM throw; - if ((throw = module_ref (R0, cell_symbol_throw)) != cell_undefined) +#if !__MESC_MES__ && !__M2_PLANET__ + SCM throw = module_ref (R0, cell_symbol_throw); + if (throw != cell_undefined) return apply (throw, cons (key, cons (x, cell_nil)), R0); #endif display_error_ (key); eputs (": "); write_error_ (x); eputs ("\n"); - assert_msg (0, "0"); + assert_msg (0, "ERROR"); exit (1); }