comparison src/casetab.c @ 17807:8a8e26aa76ed

(compute_trt_identity): Use make_sub_char_table. (compute_trt_identity, compute_trt_shuffle): Set up bytes[0] with the charset code. Check for a sub-char-table when deciding to recurse. Terminate the loop properly for a sub-char-table.

17806:96eb40f791e4

     unsigned char *bytes;
     int depth;
     struct Lisp_Char_Table *trt, *inverse;
{
  register int i;

  for (i = 0; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
    {
      if (NATNUMP (trt->contents[i]))
	{
	  bytes[depth] = i;
	  XSETFASTINT (inverse->contents[i],
		       (depth == 0 && i < CHAR_TABLE_SINGLE_BYTE_SLOTS ? i
			: MAKE_NON_ASCII_CHAR (bytes[0]-128,
					       bytes[1], bytes[2])));
	}
      else if (CHAR_TABLE_P (trt->contents[i]))
	{
	  bytes[depth] = i;
	  inverse->contents[i] = Fmake_char_table (Qnil, Qnil);
	  compute_trt_identity (bytes, depth + 1,
				XCHAR_TABLE (trt->contents[i]),
				XCHAR_TABLE (inverse->contents[i]));
	}
      else /* must be Qnil or Qidentity */

     Lisp_Object ibase;
     struct Lisp_Char_Table *trt, *inverse;
{
  register int i;
  Lisp_Object j, tem, q;

  for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++)
    {
      bytes[depth] = i;
      XSETFASTINT (j,
		   (depth == 0 && i < CHAR_TABLE_SINGLE_BYTE_SLOTS ? i
		    : MAKE_NON_ASCII_CHAR (bytes[0]-128,
					   bytes[1], bytes[2])));
      q = trt->contents[i];
      if (NATNUMP (q) && XFASTINT (q) != XFASTINT (j))
	{
	  tem = Faref (ibase, q);
	  Faset (ibase, q, j);
	  Faset (ibase, j, tem);
	}
      else if (CHAR_TABLE_P (q))
	{
	  bytes[depth] = i;
	  compute_trt_shuffle (bytes, depth + 1, ibase,
			       XCHAR_TABLE (trt->contents[i]),
			       XCHAR_TABLE (inverse->contents[i]));
	}
    }

17807:8a8e26aa76ed

     unsigned char *bytes;
     int depth;
     struct Lisp_Char_Table *trt, *inverse;
{
  register int i;
  int lim = (depth == 0 ? CHAR_TABLE_ORDINARY_SLOTS : SUB_CHAR_TABLE_ORDINARY_SLOTS);

  for (i = 0; i < lim; i++)
    {
      if (NATNUMP (trt->contents[i]))
	{
	  bytes[depth] = i;
	  XSETFASTINT (inverse->contents[i],
		       (depth == 0 && i < CHAR_TABLE_SINGLE_BYTE_SLOTS ? i
			: MAKE_NON_ASCII_CHAR (bytes[0], bytes[1], bytes[2])));
	}
      else if (SUB_CHAR_TABLE_P (trt->contents[i]))
	{
	  bytes[depth] = i - 128;
	  inverse->contents[i] = make_sub_char_table (Qnil);
	  compute_trt_identity (bytes, depth + 1,
				XCHAR_TABLE (trt->contents[i]),
				XCHAR_TABLE (inverse->contents[i]));
	}
      else /* must be Qnil or Qidentity */

     Lisp_Object ibase;
     struct Lisp_Char_Table *trt, *inverse;
{
  register int i;
  Lisp_Object j, tem, q;
  int lim = (depth == 0 ? CHAR_TABLE_ORDINARY_SLOTS : SUB_CHAR_TABLE_ORDINARY_SLOTS);

  for (i = 0; i < lim; i++)
    {
      bytes[depth] = i;
      XSETFASTINT (j,
		   (depth == 0 && i < CHAR_TABLE_SINGLE_BYTE_SLOTS ? i
		    : MAKE_NON_ASCII_CHAR (bytes[0], bytes[1], bytes[2])));
      q = trt->contents[i];
      if (NATNUMP (q) && XFASTINT (q) != XFASTINT (j))
	{
	  tem = Faref (ibase, q);
	  Faset (ibase, q, j);
	  Faset (ibase, j, tem);
	}
      else if (SUB_CHAR_TABLE_P (q))
	{
	  bytes[depth] = i - 128;
	  compute_trt_shuffle (bytes, depth + 1, ibase,
			       XCHAR_TABLE (trt->contents[i]),
			       XCHAR_TABLE (inverse->contents[i]));
	}
    }