Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: 95f94629f0fd5d4d40d7d3343014f79b2cc75988 https://github.com/geany/geany/commit/95f94629f0fd5d4d40d7d3343014f79b2cc759...
Log Message: ----------- Rename isident() to cppIsident()
Modified Paths: -------------- ctags/main/lcpp.c ctags/main/lcpp.h ctags/parsers/c.c
Modified: ctags/main/lcpp.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -210,7 +210,7 @@ static void readIdentifier (int c, vString *const name) { vStringPut (name, c); c = getcFromInputFile (); - } while (c != EOF && isident (c)); + } while (c != EOF && cppIsident (c)); ungetcToInputFile (c); vStringTerminate (name); } @@ -810,9 +810,9 @@ extern int cppGetc (void) int prev2 = getNthPrevCFromInputFile (2, '\0'); int prev3 = getNthPrevCFromInputFile (3, '\0');
- if (! isident (prev) || - (! isident (prev2) && (prev == 'L' || prev == 'u' || prev == 'U')) || - (! isident (prev3) && (prev2 == 'u' && prev == '8'))) + if (! cppIsident (prev) || + (! cppIsident (prev2) && (prev == 'L' || prev == 'u' || prev == 'U')) || + (! cppIsident (prev3) && (prev2 == 'u' && prev == '8'))) { int next = getcFromInputFile (); if (next != DOUBLE_QUOTE)
Modified: ctags/main/lcpp.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,7 @@ /* Is the character valid as a character of a C identifier? * VMS allows '$' in identifiers. */ -#define isident(c) (isalnum(c) || (c) == '_' || (c) == '$') +#define cppIsident(c) (isalnum(c) || (c) == '_' || (c) == '$')
/* Is the character valid as the first character of a C identifier? * C++ allows '~' in destructors.
Modified: ctags/parsers/c.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1786,7 +1786,7 @@ static void readIdentifier (tokenInfo *const token, const int firstChar) { vStringPut (name, c); c = cppGetc (); - } while (isident (c) || (isInputLanguage (Lang_vala) && '.' == c)); + } while (cppIsident (c) || (isInputLanguage (Lang_vala) && '.' == c)); vStringTerminate (name); cppUngetc (c); /* unget non-identifier character */
@@ -1810,7 +1810,7 @@ static void readPackageName (tokenInfo *const token, const int firstChar)
initToken (token);
- while (isident (c) || c == '.') + while (cppIsident (c) || c == '.') { vStringPut (name, c); c = cppGetc ();
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).