SF.net SVN: geany: [871] trunk

[ntrel at users.sourceforge.net]

Revision: 871
          http://svn.sourceforge.net/geany/?rev=871&view=rev
Author:   ntrel
Date:     2006-10-08 05:53:33 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
Only parse tags once for simple parsers

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tagmanager/tm_source_file.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-10-06 23:40:58 UTC (rev 870)
+++ trunk/ChangeLog	2006-10-08 12:53:33 UTC (rev 871)
@@ -1,3 +1,9 @@
+2006-10-08  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * tagmanager/tm_source_file.c:
+   Only parse tags once for simple parsers.
+
+
 2006-10-06  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * tagmanager/python.c: Improved Python parser to support nested classes.

Modified: trunk/tagmanager/tm_source_file.c
===================================================================
--- trunk/tagmanager/tm_source_file.c	2006-10-06 23:40:58 UTC (rev 870)
+++ trunk/tagmanager/tm_source_file.c	2006-10-08 12:53:33 UTC (rev 871)
@@ -121,16 +121,18 @@
 	if (source_file->lang < 0 || ! LanguageTable [source_file->lang]->enabled)
 		return status;
 
-	//while ((TRUE == status) && (passCount < 3))
-	// parse files only once instead of three times until we know why
-	while ((TRUE == status) && (passCount < 1))
+	while ((TRUE == status) && (passCount < 3))
 	{
 		if (source_file->work_object.tags_array)
 			tm_tags_array_free(source_file->work_object.tags_array, FALSE);
 		if (fileOpen (file_name, source_file->lang))
 		{
 			if (LanguageTable [source_file->lang]->parser != NULL)
+			{
 				LanguageTable [source_file->lang]->parser ();
+				fileClose ();
+				break;
+			}
 			else if (LanguageTable [source_file->lang]->parser2 != NULL)
 				status = LanguageTable [source_file->lang]->parser2 (passCount);
 			fileClose ();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.