mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

* eval.c (scm_deval): Removed some old code.

Browse source 
(ENTER_APPLY): Bugfix: Reset apply-frame trap on trap as is done
with the others.
(ENTER_APPLY, scm_deval): Reset trace flag on apply-frame and
exit-frame traps.
This commit is contained in:
Mikael Djurfeldt 1997-03-01 14:23:27 +00:00
parent c7ec19832b
commit c6a4fbce36
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/ChangeLog
View file

@ -1,5 +1,11 @@
Sat Mar 1 00:09:15 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se> Sat Mar 1 00:09:15 1997 Mikael Djurfeldt <mdj@mdj.nada.kth.se>
* eval.c (scm_deval): Removed some old code.
(ENTER_APPLY): Bugfix: Reset apply-frame trap on trap as is done
with the others.
(ENTER_APPLY, scm_deval): Reset trace flag on apply-frame and
exit-frame traps.
* symbols.c (msymbolize): Bugfix: Must initialize property list to * symbols.c (msymbolize): Bugfix: Must initialize property list to
SCM_EOL. SCM_EOL.

21
libguile/eval.c
View file

@ -1221,7 +1221,10 @@ safe_setjmp (jmp_buf env)
if (SCM_APPLY_FRAME_P || (SCM_TRACE_P && PROCTRACEP (proc)))\ if (SCM_APPLY_FRAME_P || (SCM_TRACE_P && PROCTRACEP (proc)))\
{\ {\
SCM tmp, tail = SCM_TRACED_FRAME_P (debug) ? SCM_BOOL_T : SCM_BOOL_F;\ SCM tmp, tail = SCM_TRACED_FRAME_P (debug) ? SCM_BOOL_T : SCM_BOOL_F;\
SCM_SET_TRACED_FRAME (debug);\ SCM_SET_TRACED_FRAME (debug); \
SCM_APPLY_FRAME_P = 0; \
SCM_TRACE_P = 0; \
SCM_RESET_DEBUG_MODE; \
if (SCM_CHEAPTRAPS_P)\ if (SCM_CHEAPTRAPS_P)\
{\ {\
tmp = scm_make_debugobj (&debug);\ tmp = scm_make_debugobj (&debug);\
@ -1388,21 +1391,6 @@ loopnoap:
PREP_APPLY (SCM_UNDEFINED, SCM_EOL); PREP_APPLY (SCM_UNDEFINED, SCM_EOL);
loop: loop:
#ifdef DEVAL #ifdef DEVAL
#if 0 /* This will probably never have any practical use ... */
if (CHECK_EXIT)
{
if (SINGLE_STEP || (SCM_TRACE_P && SCM_TRACED_FRAME_P (debug)))
{
SINGLE_STEP = 0;
SCM_RESET_DEBUG_MODE;
SCM_CLEAR_TRACED_FRAME (debug);
scm_make_cont (&t.arg1);
if (!safe_setjmp (SCM_JMPBUF (t.arg1)))
scm_ithrow (scm_i_exit_tail, scm_cons (t.arg1, SCM_EOL), 0);
}
}
nextframe:
#endif
SCM_CLEAR_ARGSREADY (debug); SCM_CLEAR_ARGSREADY (debug);
if (SCM_OVERFLOWP (debug)) if (SCM_OVERFLOWP (debug))
--debug.info; --debug.info;
@ -2204,6 +2192,7 @@ exit:
if (SCM_EXIT_FRAME_P || (SCM_TRACE_P && SCM_TRACED_FRAME_P (debug))) if (SCM_EXIT_FRAME_P || (SCM_TRACE_P && SCM_TRACED_FRAME_P (debug)))
{ {
SCM_EXIT_FRAME_P = 0; SCM_EXIT_FRAME_P = 0;
SCM_TRACE_P = 0;
SCM_RESET_DEBUG_MODE; SCM_RESET_DEBUG_MODE;
SCM_CLEAR_TRACED_FRAME (debug); SCM_CLEAR_TRACED_FRAME (debug);
if (SCM_CHEAPTRAPS_P) if (SCM_CHEAPTRAPS_P)