comparison src/casetab.c @ 13276:a09ec2a2f6dd

(Fcase_table_p, Fcurrent_case_table): Delete unused local variables. (set_case_table): Delete obsolete local variable `down'; use `table' directly where referenced. Fix assignment to `canon' when nil. Store eqv in extras[2], not extras[0]. (init_casetab_once): Case-tables have 3 extra slots, not 4.

13275:33bdb63a2c59

  "Return t iff ARG is a case table.\n\
See `set-case-table' for more information on these data structures.")
  (table)
     Lisp_Object table;
{
  Lisp_Object down, up, canon, eqv;

  if (! CHAR_TABLE_P (table))
    return Qnil;
  if (! EQ (XCHAR_TABLE (table)->purpose, Qcase_table))
    return Qnil;

DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0,
  "Return the case table of the current buffer.")
  ()
{
  Lisp_Object down, up, canon, eqv;
  
  return current_buffer->downcase_table;
}

DEFUN ("standard-case-table", Fstandard_case_table, Sstandard_case_table, 0, 0, 0,
  "Return the standard case table.\n\

static Lisp_Object
set_case_table (table, standard)
     Lisp_Object table;
     int standard;
{
  Lisp_Object down, up, canon, eqv;

  check_case_table (table);

  up = XCHAR_TABLE (table)->extras[0];
  canon = XCHAR_TABLE (table)->extras[1];
  eqv = XCHAR_TABLE (table)->extras[2];

  if (NILP (up))
    {
      up = Fmake_char_table (Qcase_table, Qnil);
      compute_trt_inverse (XCHAR_TABLE (down), XCHAR_TABLE (up));
      XCHAR_TABLE (table)->extras[0] = up;
    }

  if (NILP (canon))
    {
      register int i;
      Lisp_Object *upvec = XCHAR_TABLE (up)->contents;
      Lisp_Object *downvec = XCHAR_TABLE (down)->contents;

      up = Fmake_char_table (Qcase_table, Qnil);

      /* Set up the CANON vector; for each character,
	 this sequence of upcasing and downcasing ought to
	 get the "preferred" lowercase equivalent.  */
      for (i = 0; i < 256; i++)

  if (NILP (eqv))
    {
      eqv = Fmake_char_table (Qcase_table, Qnil);
      compute_trt_inverse (XCHAR_TABLE (canon), XCHAR_TABLE (eqv));
      XCHAR_TABLE (table)->extras[0] = eqv;
    }

  if (standard)
    Vascii_downcase_table = down;
  else
    current_buffer->downcase_table = down;

  return table;
}

/* Given a translate table TRT, store the inverse mapping into INVERSE.

     But don't staticpro it here--that is done in alloc.c.  */
  Qchar_table_extra_slots = intern ("char-table-extra-slots");

  /* Now we are ready to set up this property, so we can
     create char tables.  */
  Fput (Qcase_table, Qchar_table_extra_slots, make_number (4));

  down = Fmake_char_table (Qcase_table, Qnil);
  Vascii_downcase_table = down;

  for (i = 0; i < 256; i++)

13276:a09ec2a2f6dd

  "Return t iff ARG is a case table.\n\
See `set-case-table' for more information on these data structures.")
  (table)
     Lisp_Object table;
{
  Lisp_Object up, canon, eqv;

  if (! CHAR_TABLE_P (table))
    return Qnil;
  if (! EQ (XCHAR_TABLE (table)->purpose, Qcase_table))
    return Qnil;

DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0,
  "Return the case table of the current buffer.")
  ()
{
  return current_buffer->downcase_table;
}

DEFUN ("standard-case-table", Fstandard_case_table, Sstandard_case_table, 0, 0, 0,
  "Return the standard case table.\n\

static Lisp_Object
set_case_table (table, standard)
     Lisp_Object table;
     int standard;
{
  Lisp_Object up, canon, eqv;

  check_case_table (table);

  up = XCHAR_TABLE (table)->extras[0];
  canon = XCHAR_TABLE (table)->extras[1];
  eqv = XCHAR_TABLE (table)->extras[2];

  if (NILP (up))
    {
      up = Fmake_char_table (Qcase_table, Qnil);
      compute_trt_inverse (XCHAR_TABLE (table), XCHAR_TABLE (up));
      XCHAR_TABLE (table)->extras[0] = up;
    }

  if (NILP (canon))
    {
      register int i;
      Lisp_Object *upvec = XCHAR_TABLE (up)->contents;
      Lisp_Object *downvec = XCHAR_TABLE (table)->contents;

      canon = Fmake_char_table (Qcase_table, Qnil);

      /* Set up the CANON vector; for each character,
	 this sequence of upcasing and downcasing ought to
	 get the "preferred" lowercase equivalent.  */
      for (i = 0; i < 256; i++)

  if (NILP (eqv))
    {
      eqv = Fmake_char_table (Qcase_table, Qnil);
      compute_trt_inverse (XCHAR_TABLE (canon), XCHAR_TABLE (eqv));
      XCHAR_TABLE (table)->extras[2] = eqv;
    }

  if (standard)
    Vascii_downcase_table = table;
  else
    current_buffer->downcase_table = table;

  return table;
}

/* Given a translate table TRT, store the inverse mapping into INVERSE.

     But don't staticpro it here--that is done in alloc.c.  */
  Qchar_table_extra_slots = intern ("char-table-extra-slots");

  /* Now we are ready to set up this property, so we can
     create char tables.  */
  Fput (Qcase_table, Qchar_table_extra_slots, make_number (3));

  down = Fmake_char_table (Qcase_table, Qnil);
  Vascii_downcase_table = down;

  for (i = 0; i < 256; i++)