Mercurial > hg > xemacs-beta
comparison src/specifier.c @ 578:190b164ddcac
[xemacs-hg @ 2001-05-25 11:26:50 by ben]
device-msw.c, eldap.c, emodules.c, hpplay.c, process-unix.c, sound.h, tooltalk.c, win32.c: Revert Martin's attempted compile-warnings fix. It does fix
the warnings, but not the right way. We are trying to eliminate
the raw use of `char' and `unsigned char' absolutely everywhere.
There is never an occasion to reintroduce these.
buffer.h: Instead, we fix these macros so they don't care about the type of
their lvalues. We already do this for the non-C-string
equivalents of these, and it's correct because it should be OK to
pass in an SBufbyte *, for example. In any case, we do not need
any type-correctness checking here -- errors will be caught for
sure as soon as we remove the -Wno-sign-compare switch.
mule-charset.c: Use invalid_argument, not generic signal_error (Qerror, ).
alloc.c, chartab.c, console-gtk.c, console-msw.c, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console.c, console.h, device-x.c, device.c, elhash.c, eval.c, faces.c, faces.h, fns.c, glyphs.c, glyphs.h, gui.c, gui.h, lisp.h, lread.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, process-unix.c, rangetab.c, search.c, specifier.c, toolbar.c, window.c, window.h:
Rename Error_behavior to Error_Behavior, to be consistent with
general naming practices (Lisp_Object, Char_Binary, etc.).
author | ben |
---|---|
date | Fri, 25 May 2001 11:27:01 +0000 |
parents | 183866b06e0b |
children | b39c14581166 |
comparison
equal
deleted
inserted
replaced
577:910449c92002 | 578:190b164ddcac |
---|---|
417 /************************************************************************/ | 417 /************************************************************************/ |
418 /* Creating specifiers */ | 418 /* Creating specifiers */ |
419 /************************************************************************/ | 419 /************************************************************************/ |
420 | 420 |
421 static struct specifier_methods * | 421 static struct specifier_methods * |
422 decode_specifier_type (Lisp_Object type, Error_behavior errb) | 422 decode_specifier_type (Lisp_Object type, Error_Behavior errb) |
423 { | 423 { |
424 int i; | 424 int i; |
425 | 425 |
426 for (i = 0; i < Dynarr_length (the_specifier_type_entry_dynarr); i++) | 426 for (i = 0; i < Dynarr_length (the_specifier_type_entry_dynarr); i++) |
427 { | 427 { |
1158 } | 1158 } |
1159 | 1159 |
1160 static Lisp_Object | 1160 static Lisp_Object |
1161 check_valid_instantiator (Lisp_Object instantiator, | 1161 check_valid_instantiator (Lisp_Object instantiator, |
1162 struct specifier_methods *meths, | 1162 struct specifier_methods *meths, |
1163 Error_behavior errb) | 1163 Error_Behavior errb) |
1164 { | 1164 { |
1165 if (meths->validate_method) | 1165 if (meths->validate_method) |
1166 { | 1166 { |
1167 Lisp_Object retval; | 1167 Lisp_Object retval; |
1168 | 1168 |
1213 return check_valid_instantiator (instantiator, meths, ERROR_ME_NOT); | 1213 return check_valid_instantiator (instantiator, meths, ERROR_ME_NOT); |
1214 } | 1214 } |
1215 | 1215 |
1216 static Lisp_Object | 1216 static Lisp_Object |
1217 check_valid_inst_list (Lisp_Object inst_list, struct specifier_methods *meths, | 1217 check_valid_inst_list (Lisp_Object inst_list, struct specifier_methods *meths, |
1218 Error_behavior errb) | 1218 Error_Behavior errb) |
1219 { | 1219 { |
1220 Lisp_Object rest; | 1220 Lisp_Object rest; |
1221 | 1221 |
1222 LIST_LOOP (rest, inst_list) | 1222 LIST_LOOP (rest, inst_list) |
1223 { | 1223 { |
1272 return check_valid_inst_list (inst_list, meths, ERROR_ME_NOT); | 1272 return check_valid_inst_list (inst_list, meths, ERROR_ME_NOT); |
1273 } | 1273 } |
1274 | 1274 |
1275 static Lisp_Object | 1275 static Lisp_Object |
1276 check_valid_spec_list (Lisp_Object spec_list, struct specifier_methods *meths, | 1276 check_valid_spec_list (Lisp_Object spec_list, struct specifier_methods *meths, |
1277 Error_behavior errb) | 1277 Error_Behavior errb) |
1278 { | 1278 { |
1279 Lisp_Object rest; | 1279 Lisp_Object rest; |
1280 | 1280 |
1281 LIST_LOOP (rest, spec_list) | 1281 LIST_LOOP (rest, spec_list) |
1282 { | 1282 { |
2350 } | 2350 } |
2351 | 2351 |
2352 static Lisp_Object | 2352 static Lisp_Object |
2353 check_valid_specifier_matchspec (Lisp_Object matchspec, | 2353 check_valid_specifier_matchspec (Lisp_Object matchspec, |
2354 struct specifier_methods *meths, | 2354 struct specifier_methods *meths, |
2355 Error_behavior errb) | 2355 Error_Behavior errb) |
2356 { | 2356 { |
2357 if (meths->validate_matchspec_method) | 2357 if (meths->validate_matchspec_method) |
2358 { | 2358 { |
2359 Lisp_Object retval; | 2359 Lisp_Object retval; |
2360 | 2360 |
2465 static Lisp_Object | 2465 static Lisp_Object |
2466 specifier_instance_from_inst_list (Lisp_Object specifier, | 2466 specifier_instance_from_inst_list (Lisp_Object specifier, |
2467 Lisp_Object matchspec, | 2467 Lisp_Object matchspec, |
2468 Lisp_Object domain, | 2468 Lisp_Object domain, |
2469 Lisp_Object inst_list, | 2469 Lisp_Object inst_list, |
2470 Error_behavior errb, int no_quit, | 2470 Error_Behavior errb, int no_quit, |
2471 Lisp_Object depth) | 2471 Lisp_Object depth) |
2472 { | 2472 { |
2473 /* This function can GC */ | 2473 /* This function can GC */ |
2474 Lisp_Specifier *sp; | 2474 Lisp_Specifier *sp; |
2475 Lisp_Object device; | 2475 Lisp_Object device; |
2543 as we can determine. In practice, when called from redisplay the | 2543 as we can determine. In practice, when called from redisplay the |
2544 arg will usually be a window and occasionally a frame. If | 2544 arg will usually be a window and occasionally a frame. If |
2545 triggered by a user call, who knows what it will usually be. */ | 2545 triggered by a user call, who knows what it will usually be. */ |
2546 Lisp_Object | 2546 Lisp_Object |
2547 specifier_instance (Lisp_Object specifier, Lisp_Object matchspec, | 2547 specifier_instance (Lisp_Object specifier, Lisp_Object matchspec, |
2548 Lisp_Object domain, Error_behavior errb, int no_quit, | 2548 Lisp_Object domain, Error_Behavior errb, int no_quit, |
2549 int no_fallback, Lisp_Object depth) | 2549 int no_fallback, Lisp_Object depth) |
2550 { | 2550 { |
2551 Lisp_Object buffer = Qnil; | 2551 Lisp_Object buffer = Qnil; |
2552 Lisp_Object window = Qnil; | 2552 Lisp_Object window = Qnil; |
2553 Lisp_Object frame = Qnil; | 2553 Lisp_Object frame = Qnil; |
2643 } | 2643 } |
2644 #undef CHECK_INSTANCE_ENTRY | 2644 #undef CHECK_INSTANCE_ENTRY |
2645 | 2645 |
2646 Lisp_Object | 2646 Lisp_Object |
2647 specifier_instance_no_quit (Lisp_Object specifier, Lisp_Object matchspec, | 2647 specifier_instance_no_quit (Lisp_Object specifier, Lisp_Object matchspec, |
2648 Lisp_Object domain, Error_behavior errb, | 2648 Lisp_Object domain, Error_Behavior errb, |
2649 int no_fallback, Lisp_Object depth) | 2649 int no_fallback, Lisp_Object depth) |
2650 { | 2650 { |
2651 return specifier_instance (specifier, matchspec, domain, errb, | 2651 return specifier_instance (specifier, matchspec, domain, errb, |
2652 1, no_fallback, depth); | 2652 1, no_fallback, depth); |
2653 } | 2653 } |