Mercurial > hg > xemacs-beta

diff src/syntax.c @ 1296:87084e8445a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 79c6ff3eef26
children 70921960b980
line wrap: on
line diff
--- a/src/syntax.c	Fri Feb 14 07:54:29 2003 +0000
+++ b/src/syntax.c	Fri Feb 14 09:50:17 2003 +0000
@@ -1,7 +1,7 @@
 /* XEmacs routines to deal with syntax tables; also word and list parsing.
    Copyright (C) 1985-1994 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
-   Copyright (C) 2001, 2002 Ben Wing.
+   Copyright (C) 2001, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -86,6 +86,9 @@
 
 Lisp_Object Vtemp_table_for_use_updating_syntax_tables;
 
+/* A value that is guaranteed not be in a syntax table. */
+Lisp_Object Vbogus_syntax_table_value;
+
 static void syntax_cache_table_was_changed (struct buffer *buf);
 
 /* This is the internal form of the parse state used in parse-partial-sexp.  */
@@ -271,7 +274,9 @@
   cache->object = object;
   cache->buffer = buffer;
   cache->no_syntax_table_prop = 1;
-  cache->current_syntax_table =
+  cache->syntax_table =
+    BUFFER_SYNTAX_TABLE (cache->buffer);
+  cache->mirror_table =
     BUFFER_MIRROR_SYNTAX_TABLE (cache->buffer);
   cache->start = Qnil;
   cache->end = Qnil;
@@ -308,6 +313,9 @@
       if (!(from >= cache->prev_change && from < cache->next_change))
 	update_syntax_cache (cache, from, count);
     }
+#ifdef NOT_WORTH_THE_EFFORT
+  update_mirror_syntax_if_dirty (cache->mirror_table);
+#endif /* NOT_WORTH_THE_EFFORT */
   return cache;
 }
 
@@ -317,6 +325,21 @@
   return setup_syntax_cache (NULL, wrap_buffer (buffer), buffer, from, count);
 }
 
+static const struct memory_description syntax_cache_description_1 [] = {
+  { XD_LISP_OBJECT, offsetof (struct syntax_cache, object) },
+  { XD_LISP_OBJECT, offsetof (struct syntax_cache, buffer) },
+  { XD_LISP_OBJECT, offsetof (struct syntax_cache, syntax_table) },
+  { XD_LISP_OBJECT, offsetof (struct syntax_cache, mirror_table) },
+  { XD_LISP_OBJECT, offsetof (struct syntax_cache, start) },
+  { XD_LISP_OBJECT, offsetof (struct syntax_cache, end) },
+  { XD_END }
+};
+
+const struct sized_memory_description syntax_cache_description = {
+  sizeof (struct syntax_cache),
+  syntax_cache_description_1
+};
+
 void
 mark_buffer_syntax_cache (struct buffer *buf)
 {
@@ -326,7 +349,8 @@
   mark_object (cache->object);
   if (cache->buffer)
     mark_object (wrap_buffer (cache->buffer));
-  mark_object (cache->current_syntax_table);
+  mark_object (cache->syntax_table);
+  mark_object (cache->mirror_table);
   mark_object (cache->start);
   mark_object (cache->end);
 }
@@ -351,7 +375,8 @@
   cache->object = wrap_buffer (buf);
   cache->buffer = buf;
   cache->no_syntax_table_prop = 1;
-  cache->current_syntax_table = BUFFER_MIRROR_SYNTAX_TABLE (cache->buffer);
+  cache->syntax_table = BUFFER_SYNTAX_TABLE (cache->buffer);
+  cache->mirror_table = BUFFER_MIRROR_SYNTAX_TABLE (cache->buffer);
   cache->start = Fmake_marker ();
   cache->end = Fmake_marker ();
   reset_buffer_cache_range (cache, cache->object);
@@ -370,8 +395,12 @@
 {
   struct syntax_cache *cache = buf->syntax_cache;
   if (cache->no_syntax_table_prop)
-    cache->current_syntax_table =
-      BUFFER_MIRROR_SYNTAX_TABLE (buf);
+    {
+      cache->syntax_table =
+	BUFFER_SYNTAX_TABLE (buf);
+      cache->mirror_table =
+	BUFFER_MIRROR_SYNTAX_TABLE (buf);
+    }
 }
 
 /* The syntax-table property on the range covered by EXTENT may be changing,
@@ -495,9 +524,12 @@
   if (!NILP (Fsyntax_table_p (tmp_table)))
     {
       cache->use_code = 0;
-      cache->current_syntax_table =
-	XCHAR_TABLE (tmp_table)->mirror_table;
+      cache->syntax_table = tmp_table;
+      cache->mirror_table = XCHAR_TABLE (tmp_table)->mirror_table;
       cache->no_syntax_table_prop = 0;
+#ifdef NOT_WORTH_THE_EFFORT
+      update_mirror_syntax_if_dirty (cache->mirror_table);
+#endif /* NOT_WORTH_THE_EFFORT */
     } 
   else if (CONSP (tmp_table) && INTP (XCAR (tmp_table)))
     {
@@ -509,8 +541,11 @@
     {
       cache->use_code = 0;
       cache->no_syntax_table_prop = 1;
-      cache->current_syntax_table =
-	BUFFER_MIRROR_SYNTAX_TABLE (cache->buffer);
+      cache->syntax_table = BUFFER_SYNTAX_TABLE (cache->buffer);
+      cache->mirror_table = BUFFER_MIRROR_SYNTAX_TABLE (cache->buffer);
+#ifdef NOT_WORTH_THE_EFFORT
+      update_mirror_syntax_if_dirty (cache->mirror_table);
+#endif /* NOT_WORTH_THE_EFFORT */
     }
 }
 
@@ -1407,7 +1442,7 @@
 		    /* XEmacs change: call syntax_match on character */
 		    Ichar ch = BUF_FETCH_CHAR (buf, from - 1);
 		    Lisp_Object stermobj =
-		      syntax_match (scache->current_syntax_table, ch);
+		      syntax_match (scache->syntax_table, ch);
 
 		if (CHARP (stermobj))
 		  stringterm = XCHAR (stermobj);
@@ -1587,7 +1622,7 @@
 		/* XEmacs change: call syntax_match() on character */
                 Ichar ch = BUF_FETCH_CHAR (buf, from);
 		    Lisp_Object stermobj =
-		      syntax_match (scache->current_syntax_table, ch);
+		      syntax_match (scache->syntax_table, ch);
 
 		if (CHARP (stermobj))
 		  stringterm = XCHAR (stermobj);
@@ -2012,7 +2047,7 @@
 	      /* XEmacs change: call syntax_match() on character */
 	      Ichar ch = BUF_FETCH_CHAR (buf, from - 1);
 	      Lisp_Object stermobj =
-		syntax_match (scache->current_syntax_table, ch);
+		syntax_match (scache->syntax_table, ch);
 
 	      if (CHARP (stermobj))
 		state.instring = XCHAR (stermobj);
@@ -2181,9 +2216,10 @@
 
 /* Updating of the mirror syntax table.
 
-   Each syntax table has a corresponding mirror table in it.
-   Whenever we make a change to a syntax table, we call
-   update_syntax_table() on it.
+   Each syntax table has a corresponding mirror table in it.  Whenever we
+   make a change to a syntax table, we set a dirty flag.  When accessing a
+   value from the mirror table and the table is dirty, we call
+   update_syntax_table() to clean it up.
 
    #### We really only need to map over the changed range.
 
@@ -2208,41 +2244,32 @@
   return 0;
 }
 
-struct cinap
-{
-  Lisp_Object mirrortab;
-  Lisp_Object bogus;
-};
-
 static int
 copy_if_not_already_present (struct chartab_range *range, Lisp_Object table,
 			     Lisp_Object val, void *arg)
 {
-  struct cinap *a = (struct cinap *) arg;
-
+  Lisp_Object mirrortab = VOID_TO_LISP (arg);
   if (CONSP (val))
     val = XCAR (val);
   if (SYNTAX_FROM_CODE (XINT (val)) != Sinherit)
     {
       Lisp_Object existing =
-	get_range_char_table (range, a->mirrortab, a->bogus);
+	updating_mirror_get_range_char_table (range, mirrortab,
+					      Vbogus_syntax_table_value);
       if (NILP (existing))
 	/* nothing at all */
-	put_char_table (a->mirrortab, range, val);
-      else if (!EQ (existing, a->bogus))
+	put_char_table (mirrortab, range, val);
+      else if (!EQ (existing, Vbogus_syntax_table_value))
 	/* full */
 	;
       else
 	{
 	  Freset_char_table (Vtemp_table_for_use_updating_syntax_tables);
 	  copy_char_table_range
-	    (a->mirrortab,
-	     Vtemp_table_for_use_updating_syntax_tables,
-	     range);
-	  put_char_table (a->mirrortab, range, val);
+	    (mirrortab, Vtemp_table_for_use_updating_syntax_tables, range);
+	  put_char_table (mirrortab, range, val);
 	  copy_char_table_range
-	    (Vtemp_table_for_use_updating_syntax_tables,
-	     a->mirrortab, range);
+	    (Vtemp_table_for_use_updating_syntax_tables, mirrortab, range);
 	}
     }
 
@@ -2255,8 +2282,10 @@
   struct chartab_range range;
   Lisp_Object mirrortab = XCHAR_TABLE (table)->mirror_table;
 
+  assert (!XCHAR_TABLE (table)->mirror_table_p);
   range.type = CHARTAB_RANGE_ALL;
   Freset_char_table (mirrortab);
+
   /* First, copy the tables values other than inherit into the mirror
      table.  Then, for tables other than the standard syntax table, map
      over the standard table, copying values into the mirror table only if
@@ -2268,19 +2297,11 @@
   /* second clause catches bootstrapping problems when initializing the
      standard syntax table */
   if (!EQ (table, Vstandard_syntax_table) && !NILP (Vstandard_syntax_table))
-    {
-      struct cinap cinap;
-      struct gcpro gcpro1;
-      cinap.mirrortab = mirrortab;
-      /* Something that won't be in the table. */
-      cinap.bogus = make_float (0.0);
-      GCPRO1 (cinap.bogus);
-      map_char_table (Vstandard_syntax_table, &range,
-		      copy_if_not_already_present, &cinap);
-      UNGCPRO;
-    }
+    map_char_table (Vstandard_syntax_table, &range,
+		    copy_if_not_already_present, LISP_TO_VOID (mirrortab));
   /* The resetting made the default be Qnil.  Put it back to Spunct. */
   set_char_table_default (mirrortab, make_int (Spunct));
+  XCHAR_TABLE (mirrortab)->dirty = 0;
 }
 
 /* Called from chartab.c when a change is made to a syntax table.
@@ -2291,7 +2312,9 @@
 void
 update_syntax_table (Lisp_Object table)
 {
-  if (EQ (table, Vstandard_syntax_table))
+  Lisp_Object nonmirror = XCHAR_TABLE (table)->mirror_table;
+  assert (XCHAR_TABLE (table)->mirror_table_p);
+  if (EQ (nonmirror, Vstandard_syntax_table))
     {
       Lisp_Object syntab;
 
@@ -2300,7 +2323,7 @@
 	update_just_this_syntax_table (syntab);
     }
   else
-    update_just_this_syntax_table (table);
+    update_just_this_syntax_table (nonmirror);
 }
 
 
@@ -2365,6 +2388,9 @@
   words_include_escapes = 0;
 
   no_quit_in_re_search = 0;
+
+  Vbogus_syntax_table_value = make_float (0.0);
+  staticpro (&Vbogus_syntax_table_value);
 }
 
 static void