/* GNU Emacs routines to deal with case tables.
- Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc.
Author: Howard Gayle
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <setjmp.h>
+
#include "lisp.h"
-#include "buffer.h"
#include "character.h"
+#include "buffer.h"
-Lisp_Object Qcase_table_p, Qcase_table;
-Lisp_Object Vascii_downcase_table, Vascii_upcase_table;
-Lisp_Object Vascii_canon_table, Vascii_eqv_table;
-
-/* Used as a temporary in DOWNCASE and other macros in lisp.h. No
- need to mark it, since it is used only very temporarily. */
-int case_temp1;
-Lisp_Object case_temp2;
+static Lisp_Object Qcase_table_p, Qcase_table;
+Lisp_Object Vascii_downcase_table;
+static Lisp_Object Vascii_upcase_table;
+Lisp_Object Vascii_canon_table;
+static Lisp_Object Vascii_eqv_table;
-static void set_canon ();
-static void set_identity ();
-static void shuffle ();
+static void set_canon (Lisp_Object case_table, Lisp_Object range, Lisp_Object elt);
+static void set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt);
+static void shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt);
DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0,
doc: /* Return t if OBJECT is a case table.
See `set-case-table' for more information on these data structures. */)
- (object)
- Lisp_Object object;
+ (Lisp_Object object)
{
Lisp_Object up, canon, eqv;
}
static Lisp_Object
-check_case_table (obj)
- Lisp_Object obj;
+check_case_table (Lisp_Object obj)
{
CHECK_TYPE (!NILP (Fcase_table_p (obj)), Qcase_table_p, obj);
return (obj);
DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0,
doc: /* Return the case table of the current buffer. */)
- ()
+ (void)
{
- return current_buffer->downcase_table;
+ return BVAR (current_buffer, downcase_table);
}
DEFUN ("standard-case-table", Fstandard_case_table, Sstandard_case_table, 0, 0, 0,
doc: /* Return the standard case table.
This is the one used for new buffers. */)
- ()
+ (void)
{
return Vascii_downcase_table;
}
-static Lisp_Object set_case_table ();
+static Lisp_Object set_case_table (Lisp_Object, bool);
DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0,
doc: /* Select a new case table for the current buffer.
any two characters that are related by case-conversion have the same
canonical equivalent character; it may be nil, in which case it is
deduced from DOWNCASE and UPCASE.
-EQUIVALENCES is a map that cyclicly permutes each equivalence class
+EQUIVALENCES is a map that cyclically permutes each equivalence class
(of characters with the same canonical equivalent); it may be nil,
in which case it is deduced from CANONICALIZE. */)
- (table)
- Lisp_Object table;
+ (Lisp_Object table)
{
return set_case_table (table, 0);
}
-DEFUN ("set-standard-case-table", Fset_standard_case_table, Sset_standard_case_table, 1, 1, 0,
+DEFUN ("set-standard-case-table", Fset_standard_case_table,
+ Sset_standard_case_table, 1, 1, 0,
doc: /* Select a new standard case table for new buffers.
See `set-case-table' for more info on case tables. */)
- (table)
- Lisp_Object table;
+ (Lisp_Object table)
{
return set_case_table (table, 1);
}
static Lisp_Object
-set_case_table (table, standard)
- Lisp_Object table;
- int standard;
+set_case_table (Lisp_Object table, bool standard)
{
Lisp_Object up, canon, eqv;
up = Fmake_char_table (Qcase_table, Qnil);
map_char_table (set_identity, Qnil, table, up);
map_char_table (shuffle, Qnil, table, up);
- XCHAR_TABLE (table)->extras[0] = up;
+ set_char_table_extras (table, 0, up);
}
if (NILP (canon))
{
canon = Fmake_char_table (Qcase_table, Qnil);
- XCHAR_TABLE (table)->extras[1] = canon;
+ set_char_table_extras (table, 1, canon);
map_char_table (set_canon, Qnil, table, table);
}
eqv = Fmake_char_table (Qcase_table, Qnil);
map_char_table (set_identity, Qnil, canon, eqv);
map_char_table (shuffle, Qnil, canon, eqv);
- XCHAR_TABLE (table)->extras[2] = eqv;
+ set_char_table_extras (table, 2, eqv);
}
/* This is so set_image_of_range_1 in regex.c can find the EQV table. */
- XCHAR_TABLE (canon)->extras[2] = eqv;
+ set_char_table_extras (canon, 2, eqv);
if (standard)
{
}
else
{
- current_buffer->downcase_table = table;
- current_buffer->upcase_table = up;
- current_buffer->case_canon_table = canon;
- current_buffer->case_eqv_table = eqv;
+ bset_downcase_table (current_buffer, table);
+ bset_upcase_table (current_buffer, up);
+ bset_case_canon_table (current_buffer, canon);
+ bset_case_eqv_table (current_buffer, eqv);
}
return table;
CASE_TABLE. */
static void
-set_canon (case_table, range, elt)
- Lisp_Object case_table, range, elt;
+set_canon (Lisp_Object case_table, Lisp_Object range, Lisp_Object elt)
{
Lisp_Object up = XCHAR_TABLE (case_table)->extras[0];
Lisp_Object canon = XCHAR_TABLE (case_table)->extras[1];
character. This is called in map_char_table. */
static void
-set_identity (table, c, elt)
- Lisp_Object table, c, elt;
+set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt)
{
if (NATNUMP (elt))
{
}
else
from = to = XINT (c);
- for (; from <= to; from++)
+
+ to++;
+ for (; from < to; from++)
CHAR_TABLE_SET (table, from, make_number (from));
}
}
operated. */
static void
-shuffle (table, c, elt)
- Lisp_Object table, c, elt;
+shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt)
{
if (NATNUMP (elt))
{
else
from = to = XINT (c);
- for (; from <= to; from++)
+ to++;
+ for (; from < to; from++)
{
Lisp_Object tem = Faref (table, elt);
Faset (table, elt, make_number (from));
}
\f
void
-init_casetab_once ()
+init_casetab_once (void)
{
register int i;
- Lisp_Object down, up;
- Qcase_table = intern_c_string ("case-table");
- staticpro (&Qcase_table);
-
- /* Intern this now in case it isn't already done.
- Setting this variable twice is harmless.
- But don't staticpro it here--that is done in alloc.c. */
- Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
+ Lisp_Object down, up, eqv;
- /* Now we are ready to set up this property, so we can
- create char tables. */
+ DEFSYM (Qcase_table, "case-table");
Fput (Qcase_table, Qchar_table_extra_slots, make_number (3));
down = Fmake_char_table (Qcase_table, Qnil);
Vascii_downcase_table = down;
- XCHAR_TABLE (down)->purpose = Qcase_table;
+ set_char_table_purpose (down, Qcase_table);
for (i = 0; i < 128; i++)
{
CHAR_TABLE_SET (down, i, make_number (c));
}
- XCHAR_TABLE (down)->extras[1] = Fcopy_sequence (down);
+ set_char_table_extras (down, 1, Fcopy_sequence (down));
up = Fmake_char_table (Qcase_table, Qnil);
- XCHAR_TABLE (down)->extras[0] = up;
+ set_char_table_extras (down, 0, up);
for (i = 0; i < 128; i++)
{
+ int c = (i >= 'a' && i <= 'z') ? i + ('A' - 'a') : i;
+ CHAR_TABLE_SET (up, i, make_number (c));
+ }
+
+ eqv = Fmake_char_table (Qcase_table, Qnil);
+
+ for (i = 0; i < 128; i++)
+ {
int c = ((i >= 'A' && i <= 'Z') ? i + ('a' - 'A')
: ((i >= 'a' && i <= 'z') ? i + ('A' - 'a')
: i));
- CHAR_TABLE_SET (up, i, make_number (c));
+ CHAR_TABLE_SET (eqv, i, make_number (c));
}
- XCHAR_TABLE (down)->extras[2] = Fcopy_sequence (up);
+ set_char_table_extras (down, 2, eqv);
/* Fill in what isn't filled in. */
set_case_table (down, 1);
}
void
-syms_of_casetab ()
+syms_of_casetab (void)
{
- Qcase_table_p = intern_c_string ("case-table-p");
- staticpro (&Qcase_table_p);
+#include "casetab.x"
+
+ DEFSYM (Qcase_table_p, "case-table-p");
staticpro (&Vascii_canon_table);
staticpro (&Vascii_downcase_table);
staticpro (&Vascii_eqv_table);
staticpro (&Vascii_upcase_table);
-
- defsubr (&Scase_table_p);
- defsubr (&Scurrent_case_table);
- defsubr (&Sstandard_case_table);
- defsubr (&Sset_case_table);
- defsubr (&Sset_standard_case_table);
}
-
-/* arch-tag: e06388ad-99fe-40ec-ba67-9d010fcc4916
- (do not change this comment) */