Revision: 492 Author: eht16 Date: 2006-06-26 10:48:27 -0700 (Mon, 26 Jun 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=492&view=rev
Log Message: ----------- Some small tagmanager fixes.
Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/c.c trunk/tagmanager/get.c trunk/tagmanager/sh.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-06-26 17:44:18 UTC (rev 491) +++ trunk/ChangeLog 2006-06-26 17:48:27 UTC (rev 492) @@ -8,6 +8,10 @@ * tagmanager/tm_source_file.c: Fixed bug which prevented tag creation for the first opened file. * src/document.c, src/callbacks.c: Removed unused code. + * tagmanager/sh.c: Fixed missing tags beginning with underscore. + * tagmanager/get.c: Fixed problem in preprocessor directive handling. + * tagmanager/c.c: Fixed identification of prototypes of functions + returning wchar_t * without the extern keyword.
2006-06-26 Nick Treleaven nick.treleaven@btinternet.com
Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2006-06-26 17:44:18 UTC (rev 491) +++ trunk/tagmanager/c.c 2006-06-26 17:48:27 UTC (rev 492) @@ -1671,7 +1671,8 @@ case KEYWORD_THROW: skipParens (); break; case KEYWORD_CONST: break; case KEYWORD_TRY: break; - case KEYWORD_VOLATILE: break; + case KEYWORD_VOLATILE: break; + case KEYWORD_WCHAR_T: st->declaration = DECL_BASE; break;
case KEYWORD_CATCH: case KEYWORD_CLASS: case KEYWORD_EXPLICIT: case KEYWORD_EXTERN:
Modified: trunk/tagmanager/get.c =================================================================== --- trunk/tagmanager/get.c 2006-06-26 17:44:18 UTC (rev 491) +++ trunk/tagmanager/get.c 2006-06-26 17:48:27 UTC (rev 492) @@ -320,7 +320,10 @@ if (isident1 (c)) { readDefineTag (c, Cpp.directive.name, ¶meterized); - makeDefineTag (vStringValue (Cpp.directive.name), parameterized); + if (! isIgnore ()) + /// TODO + // the second argument need to be tested, not sure if TRUE is correct + makeDefineTag (vStringValue (Cpp.directive.name), TRUE); } Cpp.directive.state = DRCTV_NONE; } @@ -376,7 +379,7 @@ */ static boolean handleDirective (const int c) { - boolean ignore = FALSE; + boolean ignore = isIgnore ();
switch (Cpp.directive.state) {
Modified: trunk/tagmanager/sh.c =================================================================== --- trunk/tagmanager/sh.c 2006-06-26 17:44:18 UTC (rev 491) +++ trunk/tagmanager/sh.c 2006-06-26 17:48:27 UTC (rev 492) @@ -74,7 +74,7 @@ while (isspace ((int) *cp)) ++cp; } - if (! isalnum ((int) *cp)) + if (! (isalnum ((int) *cp) || *cp == '_')) continue; while (isalnum ((int) *cp) || *cp == '_') {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.