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: 88a8724d1ce42c1c2c1437c6c1ac137c3f5e2f84 https://github.com/geany/geany/commit/88a8724d1ce42c1c2c1437c6c1ac137c3f5e2f...
Log Message: ----------- Rename isident1() to cppIsident1()
Modified Paths: -------------- ctags/main/lcpp.c ctags/main/lcpp.h ctags/parsers/c.c
Modified: ctags/main/lcpp.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -335,7 +335,7 @@ static void directiveDefine (const int c) boolean parameterized; int nc;
- if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (c, Cpp.directive.name); nc = getcFromInputFile (); @@ -349,7 +349,7 @@ static void directiveDefine (const int c)
static void directivePragma (int c) { - if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (c, Cpp.directive.name); if (stringMatch (vStringValue (Cpp.directive.name), "weak")) @@ -359,7 +359,7 @@ static void directivePragma (int c) { c = getcFromInputFile (); } while (c == SPACE); - if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (c, Cpp.directive.name); makeDefineTag (vStringValue (Cpp.directive.name), FALSE);
Modified: ctags/main/lcpp.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -29,7 +29,7 @@ * VMS allows '$' in identifiers. * Vala allows '@' in identifiers. */ -#define isident1(c) (isalpha(c) || (c) == '_' || (c) == '~' || (c) == '$' || (c) == '@') +#define cppIsident1(c) (isalpha(c) || (c) == '_' || (c) == '~' || (c) == '$' || (c) == '@')
/* * FUNCTION PROTOTYPES
Modified: ctags/parsers/c.c 22 lines changed, 11 insertions(+), 11 deletions(-) =================================================================== @@ -1893,7 +1893,7 @@ static void readOperator (statementInfo *const st) c = cppGetc (); } } - else if (isident1 (c)) + else if (cppIsident1 (c)) { /* Handle "new" and "delete" operators, and conversion functions * (per 13.3.1.1.2 [2] of the C++ spec). @@ -1965,7 +1965,7 @@ static void setAccess (statementInfo *const st, const accessType laccess) static void discardTypeList (tokenInfo *const token) { int c = skipToNonWhite (); - while (isident1 (c)) + while (cppIsident1 (c)) { readIdentifier (token, c); c = skipToNonWhite (); @@ -1994,7 +1994,7 @@ static void readParents (statementInfo *const st, const int qualifier) do { c = skipToNonWhite (); - if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (token, c); if (isType (token, TOKEN_NAME)) @@ -2151,7 +2151,7 @@ static void skipMemIntializerList (tokenInfo *const token) do { c = skipToNonWhite (); - while (isident1 (c) || c == ':') + while (cppIsident1 (c) || c == ':') { if (c != ':') readIdentifier (token, c); @@ -2261,7 +2261,7 @@ static boolean skipPostArgumentStuff (
default: { - if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (token, c); if (isInputLanguage(Lang_d) && isDPostArgumentToken(token)) @@ -2340,15 +2340,15 @@ static void skipJavaThrows (statementInfo *const st) tokenInfo *const token = activeToken (st); int c = skipToNonWhite ();
- if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (token, c); if (token->keyword == KEYWORD_THROWS) { do { c = skipToNonWhite (); - if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (token, c); c = skipToNonWhite (); @@ -2365,7 +2365,7 @@ static void skipValaPostParens (statementInfo *const st) tokenInfo *const token = activeToken (st); int c = skipToNonWhite ();
- while (isident1 (c)) + while (cppIsident1 (c)) { readIdentifier (token, c); if (token->keyword == KEYWORD_ATTRIBUTE) @@ -2379,7 +2379,7 @@ static void skipValaPostParens (statementInfo *const st) do { c = skipToNonWhite (); - if (isident1 (c)) + if (cppIsident1 (c)) { readIdentifier (token, c); c = skipToNonWhite (); @@ -2528,7 +2528,7 @@ static int parseParens (statementInfo *const st, parenInfo *const info)
default: { - if (isident1 (c)) + if (cppIsident1 (c)) { if (++identifierCount > 1) info->isKnrParamList = FALSE; @@ -2783,7 +2783,7 @@ static void parseGeneralToken (statementInfo *const st, const int c) { const tokenInfo *const prev = prevToken (st, 1);
- if (isident1(c)) + if (cppIsident1(c)) { parseIdentifier (st, c); if (isType (st->context, TOKEN_NAME) &&
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).