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: 4910e2554bbe4aefeb29b25b743c8ae0d2cb284a https://github.com/geany/geany/commit/4910e2554bbe4aefeb29b25b743c8ae0d2cb28...
Log Message: ----------- Rename getDirectiveNestLevel() to cppGetDirectiveNestLevel()
Modified Paths: -------------- ctags/main/lcpp.c ctags/main/lcpp.h ctags/parsers/c.c
Modified: ctags/main/lcpp.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -107,7 +107,7 @@ extern boolean cppIsBraceFormat (void) return BraceFormat; }
-extern unsigned int getDirectiveNestLevel (void) +extern unsigned int cppGetDirectiveNestLevel (void) { return Cpp.directive.nestLevel; }
Modified: ctags/main/lcpp.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,8 @@ * FUNCTION PROTOTYPES */ extern boolean cppIsBraceFormat (void); -extern unsigned int getDirectiveNestLevel (void); +extern unsigned int cppGetDirectiveNestLevel (void); + extern void cppInit (const boolean state, const boolean hasAtLiteralStrings, const boolean hasCxxRawLiteralStrings, const kindOption *defineMacroKind);
Modified: ctags/parsers/c.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1653,7 +1653,7 @@ static void skipToMatch (const char *const pair) { const boolean braceMatching = (boolean) (strcmp ("{}", pair) == 0); const boolean braceFormatting = (boolean) (cppIsBraceFormat () && braceMatching); - const unsigned int initialLevel = getDirectiveNestLevel (); + const unsigned int initialLevel = cppGetDirectiveNestLevel (); const int begin = pair [0], end = pair [1]; const unsigned long inputLineNumber = getInputLineNumber (); int matchLevel = 1; @@ -1665,7 +1665,7 @@ static void skipToMatch (const char *const pair) if (c == begin) { ++matchLevel; - if (braceFormatting && getDirectiveNestLevel () != initialLevel) + if (braceFormatting && cppGetDirectiveNestLevel () != initialLevel) { skipToFormattedBraceMatch (); break; @@ -1674,7 +1674,7 @@ static void skipToMatch (const char *const pair) else if (c == end) { --matchLevel; - if (braceFormatting && getDirectiveNestLevel () != initialLevel) + if (braceFormatting && cppGetDirectiveNestLevel () != initialLevel) { skipToFormattedBraceMatch (); break;
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).