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

* eval.c (SCM_CEVAL): Got rid of the last reference to t.lloc.

Browse source 
The next step will be to remove the union 't' and simplify the
code of SCM_CEVAL that way.
This commit is contained in:
Dirk Herrmann 2002-03-13 21:53:46 +00:00
parent c87af2d55b
commit b7798e1067
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/ChangeLog
View file

@ -1,3 +1,9 @@
2002-03-13 Dirk Herrmann <D.Herrmann@tu-bs.de>
* eval.c (SCM_CEVAL): Got rid of the last reference to t.lloc.
The next step will be to remove the union 't' and simplify the
code of SCM_CEVAL that way.
2002-03-12 Neil Jerram <neil@ossau.uklinux.net> 2002-03-12 Neil Jerram <neil@ossau.uklinux.net>
* iselect.c (collisionp, gnfds, greadfds, gwritefds, gexceptfds, * iselect.c (collisionp, gnfds, greadfds, gwritefds, gexceptfds,

19
libguile/eval.c
View file

@ -2688,6 +2688,7 @@ dispatch:
return SCM_APPLY (proc, t.arg1, SCM_EOL); return SCM_APPLY (proc, t.arg1, SCM_EOL);
} }
default: default:
goto badfun; goto badfun;
} }
@ -2734,19 +2735,21 @@ dispatch:
#endif #endif
break; break;
#endif /* ifdef MEMOIZE_LOCALS */ #endif /* ifdef MEMOIZE_LOCALS */
case scm_tcs_cons_nimcar: case scm_tcs_cons_nimcar:
orig_sym = SCM_CAR (x); orig_sym = SCM_CAR (x);
if (SCM_SYMBOLP (orig_sym)) if (SCM_SYMBOLP (orig_sym))
{ {
#ifdef USE_THREADS #ifdef USE_THREADS
t.lloc = scm_lookupcar1 (x, env, 1); {
if (t.lloc == NULL) SCM *location = scm_lookupcar1 (x, env, 1);
{ if (location == NULL)
/* we have lost the race, start again. */ {
goto dispatch; /* we have lost the race, start again. */
} goto dispatch;
proc = *t.lloc; }
proc = *location;
}
#else #else
proc = *scm_lookupcar (x, env, 1); proc = *scm_lookupcar (x, env, 1);
#endif #endif