Revision: 1557 http://svn.sourceforge.net/geany/?rev=1557&view=rev Author: ntrel Date: 2007-05-22 08:31:40 -0700 (Tue, 22 May 2007)
Log Message: ----------- Move C-only isident(), isident1() functions to get.h.
Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/get.h trunk/tagmanager/read.c trunk/tagmanager/read.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-22 14:06:05 UTC (rev 1556) +++ trunk/ChangeLog 2007-05-22 15:31:40 UTC (rev 1557) @@ -1,3 +1,9 @@ +2007-05-22 Nick Treleaven nick.treleaven@btinternet.com + + * tagmanager/read.c, tagmanager/read.h, tagmanager/get.h: + Move C-only isident(), isident1() functions to get.h. + + 2007-05-21 Enrico Tröger enrico.troeger@uvena.de
* NEWS, geany_private.rc, win32-config.h, doc/geany.1.in,
Modified: trunk/tagmanager/get.h =================================================================== --- trunk/tagmanager/get.h 2007-05-22 14:06:05 UTC (rev 1556) +++ trunk/tagmanager/get.h 2007-05-22 15:31:40 UTC (rev 1557) @@ -15,9 +15,23 @@ */ #include "general.h" /* must always come first */
-#include "ctags.h" /* to define langType */ +#include "ctags.h" /* to define langType */
/* +* MACROS +*/ +/* Is the character valid as a character of a C identifier? + * VMS allows '$' in identifiers. + */ +#define isident(c) (isalnum(c) || (c) == '_' || (c) == '$') + +/* Is the character valid as the first character of a C identifier? + * C++ allows '~' in destructors. + * VMS allows '$' in identifiers. + */ +#define isident1(c) (isalpha(c) || (c) == '_' || (c) == '~' || (c) == '$') + +/* * FUNCTION PROTOTYPES */ extern boolean isBraceFormat (void);
Modified: trunk/tagmanager/read.c =================================================================== --- trunk/tagmanager/read.c 2007-05-22 14:06:05 UTC (rev 1556) +++ trunk/tagmanager/read.c 2007-05-22 15:31:40 UTC (rev 1557) @@ -45,21 +45,6 @@ * Source file access functions */
-boolean isident(int c) -{ - return (boolean) (((c >= 'A') && (c <= 'Z')) || - ((c >= 'a') && (c <= 'z')) || - ((c >= '0') && (c <= '9')) || - (c == '_') || (c == '$')); -} - -boolean isident1(int c) -{ - return (boolean) (((c >= 'A') && (c <= 'Z')) || - ((c >= 'a') && (c <= 'z')) || - (c == '_') || (c == '~') || (c == '$')); -} - static void setInputFileName (const char *const fileName) { const char *const head = fileName;
Modified: trunk/tagmanager/read.h =================================================================== --- trunk/tagmanager/read.h 2007-05-22 14:06:05 UTC (rev 1556) +++ trunk/tagmanager/read.h 2007-05-22 15:31:40 UTC (rev 1557) @@ -41,14 +41,6 @@ #define isLanguage(lang) (boolean)((lang) == File.source.language) #define isHeaderFile() File.source.isHeader
-/* Is the character valid as a character of a C identifier? - */ -boolean isident(int c); - -/* Is the character valid as the first character of a C identifier? - */ -boolean isident1(int c); - /* * DATA DECLARATIONS */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.