xemacs-beta: src/chartab.c comparison

comparison src/chartab.c @ 181:bfd6434d15b3 r20-3b17

Import from CVS: tag r20-3b17

author	cvs
date	Mon, 13 Aug 2007 09:53:19 +0200
parents	fe104dbd9147
children	e121b013d1f0

comparison

equal deleted inserted replaced

-:add28d59e586
+:bfd6434d15b3
 `valid-char-table-type-p', `char-table-type-list', `valid-char-table-value-p',
 and `check-char-table-value'.
 */
 (object))
 {
-return (CHAR_TABLEP (object) ? Qt : Qnil);
+return CHAR_TABLEP (object) ? Qt : Qnil;
 }
 DEFUN ("char-table-type-list", Fchar_table_type_list, 0, 0, 0, /*
 Return a list of the recognized char table types.
 See `valid-char-table-type-p'.
 	working with syntax tables.  The valid values are integers.
 */
 (type))
 {
-if (EQ (type, Qchar)
+return (EQ (type, Qchar)     ||
 #ifdef MULE
-|| EQ (type, Qcategory)
+	  EQ (type, Qcategory) ||
 #endif
-|| EQ (type, Qdisplay)
+	  EQ (type, Qdisplay)  ||
-|| EQ (type, Qgeneric)
+	  EQ (type, Qgeneric)  ||
-|| EQ (type, Qsyntax))
+	  EQ (type, Qsyntax)) ? Qt : Qnil;
-return Qt;
-return Qnil;
 }
 DEFUN ("char-table-type", Fchar_table_type, 1, 1, 0, /*
 Return the type of char table TABLE.
 See `valid-char-table-type-p'.
 CHECK_CHAR_TABLE (table);
 ct = XCHAR_TABLE (table);
 CHECK_CHAR_COERCE_INT (ch);
 chr = XCHAR(ch);
-return (get_char_table (chr, ct));
+return get_char_table (chr, ct);
 }
 DEFUN ("get-range-char-table", Fget_range_char_table, 2, 3, 0, /*
 Find value for a range in TABLE.
 If there is more than one value, return MULTI (defaults to nil).
 map_over_other_charset (struct Lisp_Char_Table *ct, int lb,
 			int (*fn) (struct chartab_range *range,
 				   Lisp_Object val, void *arg),
 			void *arg)
 {
-Lisp_Object charset;
+Lisp_Object val = ct->level1[lb - MIN_LEADING_BYTE];
-Lisp_Object val;
+Lisp_Object charset = CHARSET_BY_LEADING_BYTE (lb);
-val = ct->level1[lb - MIN_LEADING_BYTE];
+if (!CHARSETP (charset)
+|| lb == LEADING_BYTE_ASCII
-charset = CHARSET_BY_LEADING_BYTE (lb);
-if (!CHARSETP (charset) || lb == LEADING_BYTE_ASCII
 || lb == LEADING_BYTE_CONTROL_1)
 return 0;
 if (!CHAR_TABLE_ENTRYP (val))
 {
 struct chartab_range rainj;
 rainj.type = CHARTAB_RANGE_CHARSET;
 rainj.charset = charset;
 return (fn) (&rainj, val, arg);
 }
-else if (XCHARSET_DIMENSION (charset) == 1)
 {
-int i;
+struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
-struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
+int charset94_p = (XCHARSET_CHARS (charset) == 94);
-int start, stop;
+int start = charset94_p ?  33 :  32;
+int stop  = charset94_p ? 127 : 128;
-if (XCHARSET_CHARS (charset) == 94)
+int i, retval;
-	{
-	  start = 33;
+if (XCHARSET_DIMENSION (charset) == 1)
-	  stop = 127;
-	}
-else
-	{
-	  start = 32;
-	  stop = 128;
-	}
 for (i = start; i < stop; i++)
 	{
-	  int retval;
 	  struct chartab_range rainj;
 	  rainj.type = CHARTAB_RANGE_CHAR;
 	  rainj.ch = MAKE_CHAR (charset, i, 0);
 	  retval = (fn) (&rainj, cte->level2[i - 32], arg);
 	  if (retval)
 	    return retval;
 	}
-}
+else
-else
-{
-int i;
-struct Lisp_Char_Table_Entry *cte = XCHAR_TABLE_ENTRY (val);
-int start, stop;
-if (XCHARSET_CHARS (charset) == 94)
-	{
-	  start = 33;
-	  stop = 127;
-	}
-else
-	{
-	  start = 32;
-	  stop = 128;
-	}
 for (i = start; i < stop; i++)
 	{
-	  int retval =
+	  retval = map_over_charset_row (cte, charset, i, fn, arg);
-	    map_over_charset_row (cte, charset, i, fn, arg);
 	  if (retval)
 	    return retval;
 	}
 }
 return 0;
 }
 #endif /* MULE */
 	      retval = map_over_other_charset (ct, i, fn, arg);
 	      if (retval)
 		return retval;
 	    }
 	}
-#endif
+#endif /* MULE */
 }
 break;
 #ifdef MULE
 case CHARTAB_RANGE_CHARSET:
 ctbl = XCHAR_TABLE(table);
 temp = get_char_table(ch, ctbl);
 if (EQ (temp, Qnil)) return not;
 designator -= ' ';
-return (bit_vector_bit(XBIT_VECTOR (temp), designator) ? !not : not);
+return bit_vector_bit(XBIT_VECTOR (temp), designator) ? !not : not;
 }
 DEFUN ("check-category-at", Fcheck_category_at, 2, 4, 0, /*
 Return t if category of a character at POS includes DESIGNATOR,
 else return nil. Optional third arg specifies which buffer
 CHECK_INT (pos);
 CHECK_CATEGORY_DESIGNATOR (designator);
 des = XREALINT(designator);
 ctbl = check_category_table (category_table, Vstandard_category_table);
 ch = BUF_FETCH_CHAR (buf, XINT(pos));
-return (check_category_char(ch, ctbl, des, 0)
+return check_category_char(ch, ctbl, des, 0) ? Qt : Qnil;
-	  ? Qt : Qnil);
 }
 DEFUN ("char-in-category-p", Fchar_in_category_p, 2, 3, 0, /*
 Return t if category of character CHR includes DESIGNATOR, else
 return nil. Optional third arg specifies the CATEGORY-TABLE to use,
 CHECK_CATEGORY_DESIGNATOR (designator);
 des = XREALINT(designator);
 CHECK_CHAR(chr);
 ch = XCHAR(chr);
 ctbl = check_category_table (category_table, Vstandard_category_table);
-return (check_category_char(ch, ctbl, des, 0)
+return check_category_char(ch, ctbl, des, 0) ? Qt : Qnil;
-	  ? Qt : Qnil);
 }
 DEFUN ("category-table", Fcategory_table, 0, 1, 0, /*
 Return the current category table.
 This is the one specified by the current buffer, or by BUFFER if it
 DEFUN ("category-designator-p", Fcategory_designator_p, 1, 1, 0, /*
 Return t if ARG is a category designator (a char in the range ' ' to '~').
 */
 (obj))
 {
-if (CATEGORY_DESIGNATORP (obj))
+return CATEGORY_DESIGNATORP (obj) ? Qt : Qnil;
-return Qt;
-return Qnil;
 }
 DEFUN ("category-table-value-p", Fcategory_table_value_p, 1, 1, 0, /*
 Return t if ARG is a category table value.
 Valid values are nil or a bit vector of size 95.
 */
 (obj))
 {
-if (CATEGORY_TABLE_VALUEP (obj))
+return CATEGORY_TABLE_VALUEP (obj) ? Qt : Qnil;
-return Qt;
-return Qnil;
 }
 #endif /* MULE */

Mercurial > hg > xemacs-beta

comparison src/chartab.c @ 181:bfd6434d15b3 r20-3b17