xemacs-beta: src/chartab.c comparison

comparison src/chartab.c @ 1296:87084e8445a7

[xemacs-hg @ 2003-02-14 09:50:15 by ben] syntax-table fixes 1. the updating of mirror tables every time a syntax table was modified was taking up huge amounts of time so i added a dirty flag and made the updating "just-in-time". 2. no-longer-used char-table-entries were not getting "freed", generating tons of garbage. 3. syntax_match() was being incorrectly called on mirror tables in the cache, not the original syntax table. buffer.c, syntax.c: Move syntax table description from buffer.c to syntax.c. chartab.c, chartab.h: Free extra char table entries to avoid excessive garbage. Add flags for dirty and mirror_table_p to char tables. Add a back pointer from mirror tables to the original syntax table. When modifying a syntax table, don't update the mirror table right away, just mark as dirty. Add various asserts to make sure we are dealing with the right type of table (mirror or non-mirror). font-lock.c, syntax.c, syntax.h: Add entry to syntax caches for the non-mirror table. Set it appropriately when initializing the syntax table. Use it, not the mirror table, for calls to syntax_match(). Don't create a bogus float each time, just once at startup. Add some asserts, as in chartab.c. syntax.h: When retrieving the syntax code, check the dirty flag and update the mirror tables as appropriate. Add some asserts, as above.

author	ben
date	Fri, 14 Feb 2003 09:50:17 +0000
parents	e22b0213b713
children	4542b72c005e

comparison

equal deleted inserted replaced

-:064ef1d07d63
+:87084e8445a7
 /* XEmacs routines to deal with char tables.
 Copyright (C) 1992, 1995 Free Software Foundation, Inc.
 Copyright (C) 1995 Sun Microsystems, Inc.
-Copyright (C) 1995, 1996, 2002 Ben Wing.
+Copyright (C) 1995, 1996, 2002, 2003 Ben Wing.
 Copyright (C) 1995, 1997, 1999 Electrotechnical Laboratory, JAPAN.
 Licensed to the Free Software Foundation.
 This file is part of XEmacs.
 {
 CHECK_CHAR_TABLE (char_table);
 return char_table_type_to_symbol (XCHAR_TABLE (char_table)->type);
 }
+static void
+set_char_table_dirty (Lisp_Object table)
+{
+assert (!XCHAR_TABLE (table)->mirror_table_p);
+XCHAR_TABLE (XCHAR_TABLE (table)->mirror_table)->dirty = 1;
+}
 void
 set_char_table_default (Lisp_Object table, Lisp_Object value)
 {
 Lisp_Char_Table *ct = XCHAR_TABLE (table);
 ct->default_ = value;
 if (ct->type == CHAR_TABLE_TYPE_SYNTAX)
-update_syntax_table (table);
+set_char_table_dirty (table);
 }
 static void
 fill_char_table (Lisp_Char_Table *ct, Lisp_Object value)
 {
 for (i = 0; i < NUM_ASCII_CHARS; i++)
 ct->ascii[i] = value;
 #ifdef MULE
 for (i = 0; i < NUM_LEADING_BYTES; i++)
-ct->level1[i] = value;
+{
+/* Don't get stymied when initting the table */
+if (!EQ (ct->level1[i], Qnull_pointer) &&
+	  CHAR_TABLE_ENTRYP (ct->level1[i]))
+	free_lcrecord (ct->level1[i]);
+ct->level1[i] = value;
+}
 #endif /* MULE */
 if (ct->type == CHAR_TABLE_TYPE_SYNTAX)
-update_syntax_table (wrap_char_table (ct));
+set_char_table_dirty (wrap_char_table (ct));
 }
 DEFUN ("reset-char-table", Freset_char_table, 1, 1, 0, /*
 Reset CHAR-TABLE to its default state.
 */
 Lisp_Object obj;
 enum char_table_type ty = symbol_to_char_table_type (type);
 ct = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table);
 ct->type = ty;
+obj = wrap_char_table (ct);
 if (ty == CHAR_TABLE_TYPE_SYNTAX)
 {
 /* Qgeneric not Qsyntax because a syntax table has a mirror table
 	 and we don't want infinite recursion */
 ct->mirror_table = Fmake_char_table (Qgeneric);
 set_char_table_default (ct->mirror_table, make_int (Spunct));
+XCHAR_TABLE (ct->mirror_table)->mirror_table_p = 1;
+XCHAR_TABLE (ct->mirror_table)->mirror_table = obj;
 }
 else
 ct->mirror_table = Qnil;
 ct->next_table = Qnil;
 ct->parent = Qnil;
 ct->default_ = Qnil;
-obj = wrap_char_table (ct);
 if (ty == CHAR_TABLE_TYPE_SYNTAX)
 {
 ct->next_table = Vall_syntax_tables;
 Vall_syntax_tables = obj;
 }
 ct = XCHAR_TABLE (char_table);
 ctnew = alloc_lcrecord_type (Lisp_Char_Table, &lrecord_char_table);
 ctnew->type = ct->type;
 ctnew->parent = ct->parent;
 ctnew->default_ = ct->default_;
+ctnew->mirror_table_p = ct->mirror_table_p;
+obj = wrap_char_table (ctnew);
 for (i = 0; i < NUM_ASCII_CHARS; i++)
 {
 Lisp_Object new = ct->ascii[i];
 #ifdef MULE
 	ctnew->level1[i] = new;
 }
 #endif /* MULE */
-if (CHAR_TABLEP (ct->mirror_table))
+if (!ct->mirror_table_p && CHAR_TABLEP (ct->mirror_table))
-ctnew->mirror_table = Fcopy_char_table (ct->mirror_table);
+{
+ctnew->mirror_table = Fcopy_char_table (ct->mirror_table);
+XCHAR_TABLE (ctnew->mirror_table)->mirror_table = obj;
+}
 else
 ctnew->mirror_table = ct->mirror_table;
 ctnew->next_table = Qnil;
-obj = wrap_char_table (ctnew);
 if (ctnew->type == CHAR_TABLE_TYPE_SYNTAX)
 {
 ctnew->next_table = Vall_syntax_tables;
 Vall_syntax_tables = obj;
 }
 		       struct chartab_range *range)
 {
 map_char_table (from, range, copy_mapper, LISP_TO_VOID (to));
 }
-Lisp_Object
+static Lisp_Object
-get_range_char_table (struct chartab_range *range, Lisp_Object table,
+get_range_char_table_1 (struct chartab_range *range, Lisp_Object table,
-		      Lisp_Object multi)
+			Lisp_Object multi)
 {
 Lisp_Char_Table *ct = XCHAR_TABLE (table);
 Lisp_Object retval = Qnil;
 switch (range->type)
 if (UNBOUNDP (retval))
 return ct->default_;
 return retval;
 }
+Lisp_Object
+get_range_char_table (struct chartab_range *range, Lisp_Object table,
+		      Lisp_Object multi)
+{
+if (range->type == CHARTAB_RANGE_CHAR)
+return get_char_table (range->ch, table);
+else
+return get_range_char_table_1 (range, table, multi);
+}
+#ifdef ERROR_CHECK_TYPES
+/* Only exists so as not to trip an assert in get_char_table(). */
+Lisp_Object
+updating_mirror_get_range_char_table (struct chartab_range *range,
+				      Lisp_Object table,
+				      Lisp_Object multi)
+{
+if (range->type == CHARTAB_RANGE_CHAR)
+return get_char_table_1 (range->ch, table);
+else
+return get_range_char_table_1 (range, table, multi);
+}
+#endif /* ERROR_CHECK_TYPES */
 DEFUN ("get-range-char-table", Fget_range_char_table, 2, 3, 0, /*
 Find value for a range in CHAR-TABLE.
 If there is more than one value, return MULTI (defaults to nil).
 */
 switch (range->type)
 {
 case CHARTAB_RANGE_ALL:
 fill_char_table (ct, val);
-return; /* avoid the duplicate call to update_syntax_table() below,
+return; /* fill_char_table() recorded the table as dirty. */
-		 since fill_char_table() also did that. */
 #ifdef MULE
 case CHARTAB_RANGE_CHARSET:
 if (EQ (range->charset, Vcharset_ascii))
 	{
 	    ct->ascii[i] = val;
 	}
 else
 	{
 	  int lb = XCHARSET_LEADING_BYTE (range->charset) - MIN_LEADING_BYTE;
+	  if (CHAR_TABLE_ENTRYP (ct->level1[lb]))
+	    free_lcrecord (ct->level1[lb]);
 	  ct->level1[lb] = val;
 	}
 break;
 case CHARTAB_RANGE_ROW:
 break;
 #endif /* not MULE */
 }
 if (ct->type == CHAR_TABLE_TYPE_SYNTAX)
-update_syntax_table (wrap_char_table (ct));
+set_char_table_dirty (wrap_char_table (ct));
 }
 DEFUN ("put-char-table", Fput_char_table, 3, 3, 0, /*
 Set the value for chars in RANGE to be VALUE in CHAR-TABLE.

Mercurial > hg > xemacs-beta

comparison src/chartab.c @ 1296:87084e8445a7