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

changed do_throw() to clear the class stack when the exception is empty

Browse Source
This commit is contained in:
hyung-hwan 2021-12-24 05:10:50 +00:00
parent 3d4e161a5f
commit c230355e90
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/exec.c
View File

@ -2075,6 +2075,10 @@ static HCL_INLINE int do_throw (hcl_t* hcl, hcl_oop_t val, hcl_ooi_t ip)
if (HCL_EXSTACK_ISEMPTY(hcl)) if (HCL_EXSTACK_ISEMPTY(hcl))
{ {
/* the exception stack is empty.
* clear the class stack if it is not empty */
while (!HCL_CLSTACK_ISEMPTY(hcl)) HCL_CLSTACK_POP (hcl);
if (hcl->active_function->dbgi != hcl->_nil) if (hcl->active_function->dbgi != hcl->_nil)
{ {
hcl_dbgi_t* dbgi; hcl_dbgi_t* dbgi;
@ -2087,13 +2091,14 @@ static HCL_INLINE int do_throw (hcl_t* hcl, hcl_oop_t val, hcl_ooi_t ip)
HCL_LOG0 (hcl, HCL_LOG_IC | HCL_LOG_WARN, "Warning - exception not handled"); HCL_LOG0 (hcl, HCL_LOG_IC | HCL_LOG_WARN, "Warning - exception not handled");
hcl_seterrbfmt (hcl, HCL_EEXCEPT, "exception not handled"); hcl_seterrbfmt (hcl, HCL_EEXCEPT, "exception not handled");
} }
/* exception not handled. terminate the active process */ /* exception not handled. terminate the active process */
/*terminate_process (hcl, hcl->processor->active); <- the vm cleanup code will do this */ /*terminate_process (hcl, hcl->processor->active); <- the vm cleanup code will do this */
return -1; return -1;
} }
/* TODO: unwind the nested class stack */
/* must rewind context */ /* must rewind context */
HCL_EXSTACK_POP_TO(hcl, catch_ctx, catch_ip); HCL_EXSTACK_POP_TO(hcl, catch_ctx, catch_ip);