Mercurial > hg > xemacs-beta

diff src/chartab.c @ 800:a5954632b187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-31 08:27:14 by ben] more fixes, first crack at finishing behavior implementation TODO.ben-mule-21-5: Update. configure.in: Fix for new error-checking types. make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code to force errors when nonintercepted Windows calls issued. behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs. Correct :title to :short-doc in accordance with behavior-defs.el. Add a submenu under Options for turning on/off behaviors. cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and add support for bit-vector iteration. lisp-mode.el: Rearrange and add items for macro expanding. menubar-items.el: Document connection between these two functions. window.el: Port stuff from GNU 21.1. config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking. s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS. alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK -> ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in config.h.in. Fix code to follow docs. Fix *_checking_assert() in accordance with new names. Attempt to fix periodic redisplay crash freeing display line structures. Add first implementation of sledgehammer redisplay check. Redo print_*() to use write_fmt_string(), write_fmt_string_lisp(). Fix bug in md5 handling. Rename character-to-unicode to char-to-unicode; same for unicode-to-char{acter}. Move chartab documentation to `make-char-table'. Some header cleanup. Clean up remaining places where nonintercepted Windows calls are being used. automated/mule-tests.el: Fix for new Unicode support.
author ben
date Sun, 31 Mar 2002 08:30:17 +0000
parents e38acbeb1cae
children 2b676dc88c66
line wrap: on
line diff
--- a/src/chartab.c	Sat Mar 30 04:46:48 2002 +0000
+++ b/src/chartab.c	Sun Mar 31 08:30:17 2002 +0000
@@ -222,19 +222,10 @@
 		     Lisp_Object printcharfun)
 {
   if (first != last)
-    {
-      write_c_string (" (", printcharfun);
-      print_internal (make_char (first), printcharfun, 0);
-      write_c_string (" ", printcharfun);
-      print_internal (make_char (last), printcharfun, 0);
-      write_c_string (") ", printcharfun);
-    }
+    write_fmt_string_lisp (printcharfun, " (%s %s)", 2,
+			   make_char (first), make_char (last));
   else
-    {
-      write_c_string (" ", printcharfun);
-      print_internal (make_char (first), printcharfun, 0);
-      write_c_string (" ", printcharfun);
-    }
+    write_fmt_string_lisp (printcharfun, " %s ", 1, make_char (first));
   print_internal (val, printcharfun, 1);
 }
 
@@ -302,13 +293,9 @@
 
       if (!CHAR_TABLE_ENTRYP (jen))
 	{
-	  char buf[100];
-
-	  write_c_string (" [", printcharfun);
-	  print_internal (XCHARSET_NAME (charset), printcharfun, 0);
-	  sprintf (buf, " %d] ", i);
-	  write_c_string (buf, printcharfun);
-	  print_internal (jen, printcharfun, 0);
+	  write_fmt_string_lisp (printcharfun, " [%s %d] %s",
+				 3, XCHARSET_NAME (charset),
+				 make_int (i), jen);
 	}
       else
 	print_chartab_charset_row (charset, i, XCHAR_TABLE_ENTRY (jen),
@@ -368,11 +355,8 @@
 	  continue;
 	if (!CHAR_TABLE_ENTRYP (ann))
 	  {
-	    write_c_string (" ", printcharfun);
-	    print_internal (XCHARSET_NAME (charset),
-			    printcharfun, 0);
-	    write_c_string (" ", printcharfun);
-	    print_internal (ann, printcharfun, 0);
+	    write_fmt_string_lisp (printcharfun, " %s %s", 2,
+				   XCHARSET_NAME (charset), ann);
 	  }
 	else
 	  {
@@ -445,36 +429,6 @@
 
 DEFUN ("char-table-p", Fchar_table_p, 1, 1, 0, /*
 Return non-nil if OBJECT is a char table.
-
-A char table is a table that maps characters (or ranges of characters)
-to values.  Char tables are specialized for characters, only allowing
-particular sorts of ranges to be assigned values.  Although this
-loses in generality, it makes for extremely fast (constant-time)
-lookups, and thus is feasible for applications that do an extremely
-large number of lookups (e.g. scanning a buffer for a character in
-a particular syntax, where a lookup in the syntax table must occur
-once per character).
-
-When Mule support exists, the types of ranges that can be assigned
-values are
-
--- all characters
--- an entire charset
--- a single row in a two-octet charset
--- a single character
-
-When Mule support is not present, the types of ranges that can be
-assigned values are
-
--- all characters
--- a single character
-
-To create a char table, use `make-char-table'.
-To modify a char table, use `put-char-table' or `remove-char-table'.
-To retrieve the value for a particular character, use `get-char-table'.
-See also `map-char-table', `clear-char-table', `copy-char-table',
-`valid-char-table-type-p', `char-table-type-list',
-`valid-char-table-value-p', and `check-char-table-value'.
 */
        (object))
 {
@@ -483,7 +437,7 @@
 
 DEFUN ("char-table-type-list", Fchar_table_type_list, 0, 0, 0, /*
 Return a list of the recognized char table types.
-See `valid-char-table-type-p'.
+See `make-char-table'.
 */
        ())
 {
@@ -496,31 +450,7 @@
 
 DEFUN ("valid-char-table-type-p", Fvalid_char_table_type_p, 1, 1, 0, /*
 Return t if TYPE if a recognized char table type.
-
-Each char table type is used for a different purpose and allows different
-sorts of values.  The different char table types are
-
-`category'
-	Used for category tables, which specify the regexp categories
-	that a character is in.  The valid values are nil or a
-	bit vector of 95 elements.  Higher-level Lisp functions are
-	provided for working with category tables.  Currently categories
-	and category tables only exist when Mule support is present.
-`char'
-	A generalized char table, for mapping from one character to
-	another.  Used for case tables, syntax matching tables,
-	`keyboard-translate-table', etc.  The valid values are characters.
-`generic'
-        An even more generalized char table, for mapping from a
-	character to anything.
-`display'
-	Used for display tables, which specify how a particular character
-	is to appear when displayed.  #### Not yet implemented.
-`syntax'
-	Used for syntax tables, which specify the syntax of a particular
-	character.  Higher-level Lisp functions are provided for
-	working with syntax tables.  The valid values are integers.
-
+See `make-char-table'.
 */
        (type))
 {
@@ -535,7 +465,7 @@
 
 DEFUN ("char-table-type", Fchar_table_type, 1, 1, 0, /*
 Return the type of CHAR-TABLE.
-See `valid-char-table-type-p'.
+See `make-char-table'.
 */
        (char_table))
 {
@@ -595,8 +525,60 @@
 
 DEFUN ("make-char-table", Fmake_char_table, 1, 1, 0, /*
 Return a new, empty char table of type TYPE.
-Currently recognized types are 'char, 'category, 'display, 'generic,
-and 'syntax.  See `valid-char-table-type-p'.
+
+A char table is a table that maps characters (or ranges of characters)
+to values.  Char tables are specialized for characters, only allowing
+particular sorts of ranges to be assigned values.  Although this
+loses in generality, it makes for extremely fast (constant-time)
+lookups, and thus is feasible for applications that do an extremely
+large number of lookups (e.g. scanning a buffer for a character in
+a particular syntax, where a lookup in the syntax table must occur
+once per character).
+
+When Mule support exists, the types of ranges that can be assigned
+values are
+
+-- all characters
+-- an entire charset
+-- a single row in a two-octet charset
+-- a single character
+
+When Mule support is not present, the types of ranges that can be
+assigned values are
+
+-- all characters
+-- a single character
+
+To create a char table, use `make-char-table'.
+To modify a char table, use `put-char-table' or `remove-char-table'.
+To retrieve the value for a particular character, use `get-char-table'.
+See also `map-char-table', `clear-char-table', `copy-char-table',
+`char-table-p', `valid-char-table-type-p', `char-table-type-list',
+`valid-char-table-value-p', and `check-char-table-value'.
+
+Each char table type is used for a different purpose and allows different
+sorts of values.  The different char table types are
+
+`category'
+	Used for category tables, which specify the regexp categories
+	that a character is in.  The valid values are nil or a
+	bit vector of 95 elements.  Higher-level Lisp functions are
+	provided for working with category tables.  Currently categories
+	and category tables only exist when Mule support is present.
+`char'
+	A generalized char table, for mapping from one character to
+	another.  Used for case tables, syntax matching tables,
+	`keyboard-translate-table', etc.  The valid values are characters.
+`generic'
+        An even more generalized char table, for mapping from a
+	character to anything.
+`display'
+	Used for display tables, which specify how a particular character
+	is to appear when displayed.  #### Not yet implemented.
+`syntax'
+	Used for syntax tables, which specify the syntax of a particular
+	character.  Higher-level Lisp functions are provided for
+	working with syntax tables.  The valid values are integers.
 */
        (type))
 {
@@ -1149,7 +1131,7 @@
 -- A single character
 
 VALUE must be a value appropriate for the type of CHAR-TABLE.
-See `valid-char-table-type-p'.
+See `make-char-table'.
 */
        (range, value, char_table))
 {
@@ -1619,10 +1601,8 @@
 {
   REGISTER Lisp_Object temp;
   Lisp_Char_Table *ctbl;
-#ifdef ERROR_CHECK_TYPECHECK
   if (NILP (Fcategory_table_p (table)))
     wtaerror ("Expected category table", table);
-#endif
   ctbl = XCHAR_TABLE (table);
   temp = get_char_table (ch, ctbl);
   if (NILP (temp))