comparison src/fns.c @ 81794:c1184a3d99c9

(map_char_table): Use an array of int for `indices' rather than an array of Lisp_Objects (which are only ever integers anyway).

81793:935816f951c9

   ARG is passed to C_FUNCTION when that is called.  */

void
map_char_table (c_function, function, table, subtable, arg, depth, indices)
     void (*c_function) P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
     Lisp_Object function, table, subtable, arg, *indices;
     int depth;
{
  int i, to;
  struct gcpro gcpro1, gcpro2,  gcpro3, gcpro4;

  GCPRO4 (arg, table, subtable, function);

#endif
      to = CHAR_TABLE_ORDINARY_SLOTS;
    }
  else
    {
      int charset = XFASTINT (indices[0]) - 128;

      i = 32;
      to = SUB_CHAR_TABLE_ORDINARY_SLOTS;
      if (CHARSET_CHARS (charset) == 94)
	i++, to--;

    {
      Lisp_Object elt;
      int charset;

      elt = XCHAR_TABLE (subtable)->contents[i];
      XSETFASTINT (indices[depth], i);
      charset = XFASTINT (indices[0]) - 128;
      if (depth == 0
	  && (!CHARSET_DEFINED_P (charset)
	      || charset == CHARSET_8_BIT_CONTROL
	      || charset == CHARSET_8_BIT_GRAPHIC))
	continue;

	}
      else
	{
	  int c1, c2, c;

	  c1 = depth >= 1 ? XFASTINT (indices[1]) : 0;
	  c2 = depth >= 2 ? XFASTINT (indices[2]) : 0;
	  c = MAKE_CHAR (charset, c1, c2);

	  if (NILP (elt))
	    elt = XCHAR_TABLE (subtable)->defalt;
	  if (NILP  (elt))

The key is always a possible IDX argument to `aref'.  */)
     (function, char_table)
     Lisp_Object function, char_table;
{
  /* The depth of char table is at most 3. */
  Lisp_Object indices[3];

  CHECK_CHAR_TABLE (char_table);

  /* When Lisp_Object is represented as a union, `call2' cannot directly
     be passed to map_char_table because it returns a Lisp_Object rather
     than returning nothing.
     Casting leads to crashes on some architectures.  -stef  */
  map_char_table (void_call2, Qnil, char_table, char_table, function, 0, indices);
  return Qnil;
}

/* Return a value for character C in char-table TABLE.  Store the

81794:c1184a3d99c9

   ARG is passed to C_FUNCTION when that is called.  */

void
map_char_table (c_function, function, table, subtable, arg, depth, indices)
     void (*c_function) P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
     Lisp_Object function, table, subtable, arg;
     int depth, *indices;
{
  int i, to;
  struct gcpro gcpro1, gcpro2,  gcpro3, gcpro4;

  GCPRO4 (arg, table, subtable, function);

#endif
      to = CHAR_TABLE_ORDINARY_SLOTS;
    }
  else
    {
      int charset = indices[0] - 128;

      i = 32;
      to = SUB_CHAR_TABLE_ORDINARY_SLOTS;
      if (CHARSET_CHARS (charset) == 94)
	i++, to--;

    {
      Lisp_Object elt;
      int charset;

      elt = XCHAR_TABLE (subtable)->contents[i];
      indices[depth] = i;
      charset = indices[0] - 128;
      if (depth == 0
	  && (!CHARSET_DEFINED_P (charset)
	      || charset == CHARSET_8_BIT_CONTROL
	      || charset == CHARSET_8_BIT_GRAPHIC))
	continue;

	}
      else
	{
	  int c1, c2, c;

	  c1 = depth >= 1 ? indices[1] : 0;
	  c2 = depth >= 2 ? indices[2] : 0;
	  c = MAKE_CHAR (charset, c1, c2);

	  if (NILP (elt))
	    elt = XCHAR_TABLE (subtable)->defalt;
	  if (NILP  (elt))

The key is always a possible IDX argument to `aref'.  */)
     (function, char_table)
     Lisp_Object function, char_table;
{
  /* The depth of char table is at most 3. */
  int indices[3];

  CHECK_CHAR_TABLE (char_table);

  /* When Lisp_Object is represented as a union, `call2' cannot directly
     be passed to map_char_table because it returns a Lisp_Object rather
     than returning nothing.
     Casting leads to crashes on some architectures.  --Stef  */
  map_char_table (void_call2, Qnil, char_table, char_table, function, 0, indices);
  return Qnil;
}

/* Return a value for character C in char-table TABLE.  Store the