Mercurial > hg > xemacs-beta

comparison src/casetab.c @ 5027:22179cd0fe15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Wed, 10 Feb 2010 07:25:19 -0600
parents ae48681c47fa
children b5df3737028a
comparison
equal deleted inserted replaced
5026:46cf825f6158 5027:22179cd0fe15
302 302
303 static int 303 static int
304 compute_canon_mapper (struct chartab_range *range, 304 compute_canon_mapper (struct chartab_range *range,
305 Lisp_Object UNUSED (table), Lisp_Object val, void *arg) 305 Lisp_Object UNUSED (table), Lisp_Object val, void *arg)
306 { 306 {
307 Lisp_Object casetab = VOID_TO_LISP (arg); 307 Lisp_Object casetab = GET_LISP_FROM_VOID (arg);
308 if (range->type == CHARTAB_RANGE_CHAR) 308 if (range->type == CHARTAB_RANGE_CHAR)
309 SET_TRT_TABLE_OF (XCASE_TABLE_CANON (casetab), range->ch, 309 SET_TRT_TABLE_OF (XCASE_TABLE_CANON (casetab), range->ch,
310 TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (casetab), 310 TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (casetab),
311 TRT_TABLE_OF (XCASE_TABLE_UPCASE (casetab), 311 TRT_TABLE_OF (XCASE_TABLE_UPCASE (casetab),
312 XCHAR (val)))); 312 XCHAR (val))));
317 static int 317 static int
318 initialize_identity_mapper (struct chartab_range *range, 318 initialize_identity_mapper (struct chartab_range *range,
319 Lisp_Object UNUSED (table), 319 Lisp_Object UNUSED (table),
320 Lisp_Object UNUSED (val), void *arg) 320 Lisp_Object UNUSED (val), void *arg)
321 { 321 {
322 Lisp_Object trt = VOID_TO_LISP (arg); 322 Lisp_Object trt = GET_LISP_FROM_VOID (arg);
323 if (range->type == CHARTAB_RANGE_CHAR) 323 if (range->type == CHARTAB_RANGE_CHAR)
324 SET_TRT_TABLE_OF (trt, range->ch, range->ch); 324 SET_TRT_TABLE_OF (trt, range->ch, range->ch);
325 325
326 return 0; 326 return 0;
327 } 327 }
329 static int 329 static int
330 compute_up_or_eqv_mapper (struct chartab_range *range, 330 compute_up_or_eqv_mapper (struct chartab_range *range,
331 Lisp_Object UNUSED (table), 331 Lisp_Object UNUSED (table),
332 Lisp_Object val, void *arg) 332 Lisp_Object val, void *arg)
333 { 333 {
334 Lisp_Object inverse = VOID_TO_LISP (arg); 334 Lisp_Object inverse = GET_LISP_FROM_VOID (arg);
335 Ichar toch = XCHAR (val); 335 Ichar toch = XCHAR (val);
336 336
337 if (range->type == CHARTAB_RANGE_CHAR && range->ch != toch) 337 if (range->type == CHARTAB_RANGE_CHAR && range->ch != toch)
338 { 338 {
339 Ichar c = TRT_TABLE_OF (inverse, toch); 339 Ichar c = TRT_TABLE_OF (inverse, toch);
359 range.type = CHARTAB_RANGE_ALL; 359 range.type = CHARTAB_RANGE_ALL;
360 /* Turn off dirty flag first so we don't get infinite recursion when 360 /* Turn off dirty flag first so we don't get infinite recursion when
361 retrieving the values below! */ 361 retrieving the values below! */
362 XCASE_TABLE (casetab)->dirty = 0; 362 XCASE_TABLE (casetab)->dirty = 0;
363 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, 363 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range,
364 compute_canon_mapper, LISP_TO_VOID (casetab)); 364 compute_canon_mapper, STORE_LISP_IN_VOID (casetab));
365 map_char_table (XCASE_TABLE_CANON (casetab), &range, 365 map_char_table (XCASE_TABLE_CANON (casetab), &range,
366 initialize_identity_mapper, 366 initialize_identity_mapper,
367 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); 367 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab)));
368 map_char_table (XCASE_TABLE_CANON (casetab), &range, 368 map_char_table (XCASE_TABLE_CANON (casetab), &range,
369 compute_up_or_eqv_mapper, 369 compute_up_or_eqv_mapper,
370 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); 370 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab)));
371 } 371 }
372 372
373 DEFUN ("current-case-table", Fcurrent_case_table, 0, 1, 0, /* 373 DEFUN ("current-case-table", Fcurrent_case_table, 0, 1, 0, /*
374 Return the case table of BUFFER, which defaults to the current buffer. 374 Return the case table of BUFFER, which defaults to the current buffer.
375 */ 375 */
434 434
435 if (NILP (up)) 435 if (NILP (up))
436 { 436 {
437 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, 437 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range,
438 initialize_identity_mapper, 438 initialize_identity_mapper,
439 LISP_TO_VOID (XCASE_TABLE_UPCASE (casetab))); 439 STORE_LISP_IN_VOID (XCASE_TABLE_UPCASE (casetab)));
440 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, 440 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range,
441 compute_up_or_eqv_mapper, 441 compute_up_or_eqv_mapper,
442 LISP_TO_VOID (XCASE_TABLE_UPCASE (casetab))); 442 STORE_LISP_IN_VOID (XCASE_TABLE_UPCASE (casetab)));
443 } 443 }
444 else 444 else
445 convert_old_style_syntax_string (XCASE_TABLE_UPCASE (casetab), up); 445 convert_old_style_syntax_string (XCASE_TABLE_UPCASE (casetab), up);
446 446
447 if (NILP (canon)) 447 if (NILP (canon))
448 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, 448 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range,
449 compute_canon_mapper, LISP_TO_VOID (casetab)); 449 compute_canon_mapper, STORE_LISP_IN_VOID (casetab));
450 else 450 else
451 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), canon); 451 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), canon);
452 452
453 if (NILP (eqv)) 453 if (NILP (eqv))
454 { 454 {
455 map_char_table (XCASE_TABLE_CANON (casetab), &range, 455 map_char_table (XCASE_TABLE_CANON (casetab), &range,
456 initialize_identity_mapper, 456 initialize_identity_mapper,
457 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); 457 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab)));
458 map_char_table (XCASE_TABLE_CANON (casetab), &range, 458 map_char_table (XCASE_TABLE_CANON (casetab), &range,
459 compute_up_or_eqv_mapper, 459 compute_up_or_eqv_mapper,
460 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); 460 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab)));
461 } 461 }
462 else 462 else
463 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), eqv); 463 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), eqv);
464 } 464 }
465 465