comparison src/chartab.c @ 89334:0b3ed65e4e97

(char_table_ascii): Check if the char table contents is sub-char-table or not. (char_table_set): Fix argument to char_table_ascii. (char_table_set_range): Likewise.
author Kenichi Handa <handa@m17n.org>
date Mon, 06 Jan 2003 13:26:04 +0000
parents cd3317b3e1a9
children 7020f4f73751
comparison
equal deleted inserted replaced
89333:bbd8c0d60afb 89334:0b3ed65e4e97
112 Lisp_Object table; 112 Lisp_Object table;
113 { 113 {
114 Lisp_Object sub; 114 Lisp_Object sub;
115 115
116 sub = XCHAR_TABLE (table)->contents[0]; 116 sub = XCHAR_TABLE (table)->contents[0];
117 if (! SUB_CHAR_TABLE_P (sub))
118 return sub;
117 sub = XSUB_CHAR_TABLE (sub)->contents[0]; 119 sub = XSUB_CHAR_TABLE (sub)->contents[0];
120 if (! SUB_CHAR_TABLE_P (sub))
121 return sub;
118 return XSUB_CHAR_TABLE (sub)->contents[0]; 122 return XSUB_CHAR_TABLE (sub)->contents[0];
119 } 123 }
120 124
121 Lisp_Object 125 Lisp_Object
122 copy_sub_char_table (table) 126 copy_sub_char_table (table)
413 sub = make_sub_char_table (1, i * chartab_chars[0], sub); 417 sub = make_sub_char_table (1, i * chartab_chars[0], sub);
414 tbl->contents[i] = sub; 418 tbl->contents[i] = sub;
415 } 419 }
416 sub_char_table_set (sub, c, val); 420 sub_char_table_set (sub, c, val);
417 if (ASCII_CHAR_P (c)) 421 if (ASCII_CHAR_P (c))
418 tbl->ascii = char_table_ascii (tbl); 422 tbl->ascii = char_table_ascii (table);
419 } 423 }
420 return val; 424 return val;
421 } 425 }
422 426
423 static void 427 static void
470 for (i = CHARTAB_IDX (from, 0, 0), min_char = i * chartab_chars[0]; 474 for (i = CHARTAB_IDX (from, 0, 0), min_char = i * chartab_chars[0];
471 min_char <= to; 475 min_char <= to;
472 i++, min_char += chartab_chars[0]) 476 i++, min_char += chartab_chars[0])
473 sub_char_table_set_range (contents + i, 0, min_char, from, to, val); 477 sub_char_table_set_range (contents + i, 0, min_char, from, to, val);
474 if (ASCII_CHAR_P (from)) 478 if (ASCII_CHAR_P (from))
475 tbl->ascii = char_table_ascii (tbl); 479 tbl->ascii = char_table_ascii (table);
476 } 480 }
477 return val; 481 return val;
478 } 482 }
479 483
480 484