mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-23 04:52:42 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into mobile

Browse source
This commit is contained in:
Daniel Kochmański 2015-11-07 19:54:36 +01:00
commit 81573a3fe6
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/c/gfun.d
View file

@ -127,21 +127,22 @@ fill_spec_vector(cl_object vector, cl_object frame, cl_object gf)
cl_object spec_how = ECL_CONS_CAR(spec_how_list);
cl_object spec_type = ECL_CONS_CAR(spec_how);
int spec_position = ecl_fixnum(ECL_CONS_CDR(spec_how));
cl_object eql_spec;
unlikely_if (spec_position >= narg)
FEwrong_num_arguments(gf);
unlikely_if (spec_no >= vector->vector.dim)
ecl_internal_error("Too many arguments to fill_spec_vector()");
/* Need to differentiate between EQL specializers and
class specializers, because the EQL value can be a
class, and may classh with a class specializer. */
if (ECL_LISTP(spec_type) && ecl_memql(args[spec_position], spec_type)) {
argtype[spec_no++] = args[spec_position];
argtype[spec_no++] = 1;
class, and may clash with a class specializer.
Store the cons cell containing the EQL value. */
if (ECL_LISTP(spec_type) &&
!Null(eql_spec = ecl_memql(args[spec_position], spec_type))) {
argtype[spec_no++] = eql_spec;
} else {
argtype[spec_no++] = cl_class_of(args[spec_position]);
argtype[spec_no++] = 0;
}
} end_loop_for_on_unsafe(spec_how_list);
vector->vector.fillp = spec_no;
return vector;
@ -244,9 +245,9 @@ _ecl_standard_dispatch(cl_object frame, cl_object gf)
* compute the applicable methods. We must save
* the keys and recompute the cache location if
* it was filled. */
cl_object keys = cl_copy_seq(vector);
func = compute_applicable_method(env, frame, gf);
if (env->values[1] != ECL_NIL) {
cl_object keys = cl_copy_seq(vector);
if (e->key != OBJNULL) {
e = ecl_search_cache(cache);
}

4
src/c/main.d
View file

@ -169,9 +169,7 @@ ecl_init_env(cl_env_ptr env)
((struct ecl_fficall*)env->fficall)->registers = 0;
#endif
/* Needs 128 elements for 64 entries to differentiate between
EQL specializers and class specializers */
env->method_cache = ecl_make_cache(128, 4096);
env->method_cache = ecl_make_cache(64, 4096);
env->slot_cache = ecl_make_cache(3, 4096);
env->pending_interrupt = ECL_NIL;
{

4
src/lsp/top.lsp
View file

@ -844,7 +844,9 @@ Use special code 0 to cancel this operation.")
(t
(function-lambda-list (fdefinition function)))))
((typep function 'generic-function)
(values (clos:generic-function-lambda-list function) t))
(if (slot-boundp function 'clos::lambda-list)
(values (clos:generic-function-lambda-list function) t)
(values nil nil)))
;; Use the lambda list from the function definition, if available,
;; but remove &aux arguments.
((let ((f (function-lambda-expression function)))