SF.net SVN: geany:[4420] trunk

[ntrel at users.sourceforge.net]

Revision: 4420
          http://geany.svn.sourceforge.net/geany/?rev=4420&view=rev
Author:   ntrel
Date:     2009-11-10 19:05:51 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
Fix using "other" tag type.

Modified Paths:
--------------
    trunk/HACKING
    trunk/tagmanager/perl.c
    trunk/tagmanager/tm_tag.c

Modified: trunk/HACKING
===================================================================
--- trunk/HACKING	2009-11-10 18:48:14 UTC (rev 4419)
+++ trunk/HACKING	2009-11-10 19:05:51 UTC (rev 4420)
@@ -373,7 +373,6 @@
 
 In foo.c:
 Edit FooKinds 3rd column to match a s_tag_type_names string in tm_tag.c.
-Warning: "other" type doesn't seem to work.
 
 In filetypes.c, init_builtin_filetypes():
 Set filetypes[GEANY_FILETYPES_FOO].lang = foo's parser number.

Modified: trunk/tagmanager/perl.c
===================================================================
--- trunk/tagmanager/perl.c	2009-11-10 18:48:14 UTC (rev 4419)
+++ trunk/tagmanager/perl.c	2009-11-10 19:05:51 UTC (rev 4420)
@@ -41,7 +41,7 @@
 
 static kindOption PerlKinds [] = {
 	{ TRUE,  'e', "enum",       "constants" },
-	{ TRUE,  'e', "enumerator", "formats" },
+	{ TRUE,  'o', "other",      "formats" },
 	{ TRUE,  'm', "macro",      "labels" },
 	{ TRUE,  'p', "package",    "packages" },
 	{ TRUE,  'f', "function",   "subroutines" },

Modified: trunk/tagmanager/tm_tag.c
===================================================================
--- trunk/tagmanager/tm_tag.c	2009-11-10 18:48:14 UTC (rev 4419)
+++ trunk/tagmanager/tm_tag.c	2009-11-10 19:05:51 UTC (rev 4420)
@@ -118,6 +118,9 @@
 		else if (cmp < 0)
 			break;
 	}
+	/* other is not checked above as it is last, not sorted alphabetically */
+	if (strcmp(tag_name, "other") == 0)
+		return tm_tag_other_t;
 #ifdef TM_DEBUG
 	fprintf(stderr, "Unknown tag type %s\n", tag_name);
 #endif


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