comparison src/fns.c @ 17182:47bfc66eb7f1

(map_char_table): Handle multibyte characters.

17181:156896ccc86e

#undef vector
#define vector *****

#include "lisp.h"
#include "commands.h"

#include "buffer.h"
#include "keyboard.h"
#include "intervals.h"
#include "frame.h"

map_char_table (c_function, function, chartable, depth, indices)
     Lisp_Object (*c_function) (), function, chartable, *indices;
     int depth;
{
  int i;
  int size = CHAR_TABLE_ORDINARY_SLOTS;

  /* Make INDICES longer if we are about to fill it up.  */
  if ((depth % 10) == 9)
    {
      Lisp_Object *new_indices
	= (Lisp_Object *) alloca ((depth += 10) * sizeof (Lisp_Object));
      bcopy (indices, new_indices, depth * sizeof (Lisp_Object));
      indices = new_indices;
    }

  for (i = 0; i < size; i++)
    {
      Lisp_Object elt;
      indices[depth] = i;
      elt = XCHAR_TABLE (chartable)->contents[i];
      if (CHAR_TABLE_P (elt))
	map_char_table (c_function, function, chartable, depth + 1, indices);
      else if (c_function)
	(*c_function) (depth + 1, indices, elt);
      /* Here we should handle all cases where the range is a single character
	 by passing that character as a number.  Currently, that is
	 all the time, but with the MULE code this will have to be changed.  */
      else if (depth == 0)
	call2 (function, make_number (i), elt);
      else
	call2 (function, Fvector (depth + 1, indices), elt);
    }
}

DEFUN ("map-char-table", Fmap_char_table, Smap_char_table,
  2, 2, 0,

17182:47bfc66eb7f1

#undef vector
#define vector *****

#include "lisp.h"
#include "commands.h"
#include "charset.h"

#include "buffer.h"
#include "keyboard.h"
#include "intervals.h"
#include "frame.h"

map_char_table (c_function, function, chartable, depth, indices)
     Lisp_Object (*c_function) (), function, chartable, *indices;
     int depth;
{
  int i;
  int from, to;

  if (depth == 0)
    from = 0, to = CHAR_TABLE_ORDINARY_SLOTS;
  else
    from = 32, to = 128;
  /* Make INDICES longer if we are about to fill it up.  */
  if ((depth % 10) == 9)
    {
      Lisp_Object *new_indices
	= (Lisp_Object *) alloca ((depth += 10) * sizeof (Lisp_Object));
      bcopy (indices, new_indices, depth * sizeof (Lisp_Object));
      indices = new_indices;
    }

  for (i = from; i < to; i++)
    {
      Lisp_Object elt;
      indices[depth] = i;
      elt = XCHAR_TABLE (chartable)->contents[i];
      if (CHAR_TABLE_P (elt))
	map_char_table (c_function, function, elt, depth + 1, indices);
      else if (c_function)
	(*c_function) (depth + 1, indices, elt);
      else if (depth == 0 && i < 256)
	/* This is an ASCII or 8-bit European character.  */
	call2 (function, make_number (i), elt);
      else
	{
	  /* This is an entry for multibyte characters.  */
	  unsigned int charset = XFASTINT (indices[0]) - 128, c1, c2, c;
	  if (CHARSET_DEFINED_P (charset))
	    {
	      c1 = depth < 1 ? 0 : XFASTINT (indices[1]);
	      c2 = depth < 2 ? 0 : XFASTINT (indices[2]);
	      c = MAKE_NON_ASCII_CHAR (charset, c1, c2);
	      call2 (function, make_number (c), elt);
	    }
	}	  
    }
}

DEFUN ("map-char-table", Fmap_char_table, Smap_char_table,
  2, 2, 0,