comparison src/specifier.c @ 82:6a378aca36af r20-0b91

Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 54cc21c15cbb
children 9f59509498e1
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
2150 make_opaque_ptr ((void *) meths->validate_matchspec_method); 2150 make_opaque_ptr ((void *) meths->validate_matchspec_method);
2151 struct gcpro gcpro1; 2151 struct gcpro gcpro1;
2152 2152
2153 GCPRO1 (opaque); 2153 GCPRO1 (opaque);
2154 retval = call_with_suspended_errors 2154 retval = call_with_suspended_errors
2155 ( (lisp_fn_t) call_validate_matchspec_method, 2155 ((lisp_fn_t) call_validate_matchspec_method,
2156 Qnil, Qspecifier, errb, 2, opaque, matchspec); 2156 Qnil, Qspecifier, errb, 2, opaque, matchspec);
2157 2157
2158 free_opaque_ptr (opaque); 2158 free_opaque_ptr (opaque);
2159 UNGCPRO; 2159 UNGCPRO;
2160 } 2160 }
2161 2161
2274 { 2274 {
2275 Lisp_Object val = XCDR (tagged_inst); 2275 Lisp_Object val = XCDR (tagged_inst);
2276 2276
2277 if (HAS_SPECMETH_P (sp, instantiate)) 2277 if (HAS_SPECMETH_P (sp, instantiate))
2278 val = call_with_suspended_errors 2278 val = call_with_suspended_errors
2279 ( (lisp_fn_t) RAW_SPECMETH (sp, instantiate), 2279 ((lisp_fn_t) RAW_SPECMETH (sp, instantiate),
2280 Qunbound, Qspecifier, errb, 5, specifier, 2280 Qunbound, Qspecifier, errb, 5, specifier,
2281 matchspec, domain, XCDR (tagged_inst), depth); 2281 matchspec, domain, XCDR (tagged_inst), depth);
2282 2282
2283 if (!UNBOUNDP (val)) 2283 if (!UNBOUNDP (val))
2284 { 2284 {
2285 unbind_to (count, Qnil); 2285 unbind_to (count, Qnil);
2286 UNGCPRO; 2286 UNGCPRO;