Commits September 2016

commits@lists.geany.org

1 participants
80 discussions

[geany/geany] d0cc3d: Remove TagEntryFunction check in c.c
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 10 Aug 2016 09:55:02 UTC Commit: d0cc3dc132558b277444c7b269874b1120ee806b https://github.com/geany/geany/commit/d0cc3dc132558b277444c7b269874b1120ee8… Log Message: ----------- Remove TagEntryFunction check in c.c It's always non-null in Geany, it's value is checked in makeTagEntry() anyway and parsers shouldn't know about it. Modified Paths: -------------- ctags/parsers/c.c Modified: ctags/parsers/c.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -1464,8 +1464,7 @@ static void makeTag (const tokenInfo *const token, printTagEntry(&e); #endif makeTagEntry (&e); - if (NULL != TagEntryFunction) - makeExtraTagEntry (type, &e, scope); + makeExtraTagEntry (type, &e, scope); vStringDelete (scope); if (NULL != e.extensionFields.signature) free((char *) e.extensionFields.signature); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e866a9: entry: Move functions around a bit to reduce the amount of diffs
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 08 Aug 2016 21:01:14 UTC Commit: e866a976c960fe4d2a6150c3980ff278b21ed8b2 https://github.com/geany/geany/commit/e866a976c960fe4d2a6150c3980ff278b21ed… Log Message: ----------- entry: Move functions around a bit to reduce the amount of diffs Modified Paths: -------------- ctags/main/entry.c Modified: ctags/main/entry.c 76 lines changed, 38 insertions(+), 38 deletions(-) =================================================================== @@ -262,44 +262,6 @@ static boolean isTagFile (const char *const filename) return ok; } -extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size) -{ - enum { BufferSize = 1000 }; - long toRead, numRead; - char* buffer = xMalloc (BufferSize, char); - long remaining = size; - do - { - toRead = (0 < remaining && remaining < BufferSize) ? - remaining : BufferSize; - numRead = mio_read (fromMio, buffer, (size_t) 1, (size_t) toRead); - if (mio_write (toMio, buffer, (size_t)1, (size_t)numRead) < (size_t)numRead) - error (FATAL | PERROR, "cannot complete write"); - if (remaining > 0) - remaining -= numRead; - } while (numRead == toRead && remaining != 0); - eFree (buffer); -} - -extern void copyFile (const char *const from, const char *const to, const long size) -{ - MIO* const fromMio = mio_new_file_full (from, "rb", g_fopen, fclose); - if (fromMio == NULL) - error (FATAL | PERROR, "cannot open file to copy"); - else - { - MIO* const toMio = mio_new_file_full (to, "wb", g_fopen, fclose); - if (toMio == NULL) - error (FATAL | PERROR, "cannot open copy destination"); - else - { - copyBytes (fromMio, toMio, size); - mio_free (toMio); - } - mio_free (fromMio); - } -} - extern void openTagFile (void) { setDefaultTagFileName (); @@ -360,6 +322,44 @@ extern void openTagFile (void) #ifdef USE_REPLACEMENT_TRUNCATE +extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size) +{ + enum { BufferSize = 1000 }; + long toRead, numRead; + char* buffer = xMalloc (BufferSize, char); + long remaining = size; + do + { + toRead = (0 < remaining && remaining < BufferSize) ? + remaining : BufferSize; + numRead = mio_read (fromMio, buffer, (size_t) 1, (size_t) toRead); + if (mio_write (toMio, buffer, (size_t)1, (size_t)numRead) < (size_t)numRead) + error (FATAL | PERROR, "cannot complete write"); + if (remaining > 0) + remaining -= numRead; + } while (numRead == toRead && remaining != 0); + eFree (buffer); +} + +extern void copyFile (const char *const from, const char *const to, const long size) +{ + MIO* const fromMio = mio_new_file_full (from, "rb", g_fopen, fclose); + if (fromMio == NULL) + error (FATAL | PERROR, "cannot open file to copy"); + else + { + MIO* const toMio = mio_new_file_full (to, "wb", g_fopen, fclose); + if (toMio == NULL) + error (FATAL | PERROR, "cannot open copy destination"); + else + { + copyBytes (fromMio, toMio, size); + mio_free (toMio); + } + mio_free (fromMio); + } +} + /* Replacement for missing library function. */ static int replacementTruncate (const char *const name, const long size) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0eca25: Fix incorrect use of MIO
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 08 Aug 2016 22:34:29 UTC Commit: 0eca258e58693ebdf0670b74e6934acc6ed2a7b9 https://github.com/geany/geany/commit/0eca258e58693ebdf0670b74e6934acc6ed2a… Log Message: ----------- Fix incorrect use of MIO Modified Paths: -------------- ctags/main/entry.c Modified: ctags/main/entry.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -365,8 +365,8 @@ extern void copyFile (const char *const from, const char *const to, const long s static int replacementTruncate (const char *const name, const long size) { char *tempName = NULL; - MIO *mio = tempFile ("w", &tempName); - fclose (mio); + FILE *fp = tempFile ("w", &tempName); + fclose (fp); copyFile (name, tempName, size); copyFile (tempName, name, WHOLE_FILE); remove (tempName); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 967b57: Rename MIO variables from fp to mio
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: 967b572240513689fc2f6f9aefa929e7d54f6bfc https://github.com/geany/geany/commit/967b572240513689fc2f6f9aefa929e7d54f6… Log Message: ----------- Rename MIO variables from fp to mio Modified Paths: -------------- ctags/main/entry.c ctags/main/read.c ctags/main/read.h Modified: ctags/main/entry.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -366,8 +366,8 @@ extern void openTagFile (void) static int replacementTruncate (const char *const name, const long size) { char *tempName = NULL; - FILE *fp = tempFile ("w", &tempName); - fclose (fp); + MIO *mio = tempFile ("w", &tempName); + fclose (mio); copyFile (name, tempName, size); copyFile (tempName, name, WHOLE_FILE); remove (tempName); Modified: ctags/main/read.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -247,7 +247,7 @@ static boolean parseLineDirective (void) */ /* This function opens an input file, and resets the line counter. If it - * fails, it will display an error message and leave the File.fp set to NULL. + * fails, it will display an error message and leave the File.mio set to NULL. */ extern boolean fileOpen (const char *const fileName, const langType language) { @@ -539,12 +539,12 @@ extern const unsigned char *readLineFromInputFile (void) /* * Raw file line reading with automatic buffer sizing */ -extern char *readLineRaw (vString *const vLine, MIO *const fp) +extern char *readLineRaw (vString *const vLine, MIO *const mio) { char *result = NULL; vStringClear (vLine); - if (fp == NULL) /* to free memory allocated to buffer */ + if (mio == NULL) /* to free memory allocated to buffer */ error (FATAL, "NULL file pointer"); else { @@ -560,13 +560,13 @@ extern char *readLineRaw (vString *const vLine, MIO *const fp) char *const pLastChar = vStringValue (vLine) + vStringSize (vLine) -2; long startOfLine; - startOfLine = mio_tell(fp); + startOfLine = mio_tell(mio); reReadLine = FALSE; *pLastChar = '\0'; - result = mio_gets (fp, vStringValue (vLine), (int) vStringSize (vLine)); + result = mio_gets (mio, vStringValue (vLine), (int) vStringSize (vLine)); if (result == NULL) { - if (! mio_eof (fp)) + if (! mio_eof (mio)) error (FATAL | PERROR, "Failure on attempt to read file"); } else if (*pLastChar != '\0' && @@ -575,7 +575,7 @@ extern char *readLineRaw (vString *const vLine, MIO *const fp) /* buffer overflow */ reReadLine = vStringAutoResize (vLine); if (reReadLine) - mio_seek (fp, startOfLine, SEEK_SET); + mio_seek (mio, startOfLine, SEEK_SET); else error (FATAL | PERROR, "input line too big; out of memory"); } Modified: ctags/main/read.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -114,7 +114,7 @@ extern int getNthPrevCFromInputFile (unsigned int nth, int def); extern int skipToCharacterInInputFile (int c); extern void ungetcToInputFile (int c); extern const unsigned char *readLineFromInputFile (void); -extern char *readLineRaw (vString *const vLine, MIO *const fp); +extern char *readLineRaw (vString *const vLine, MIO *const mio); extern char *readSourceLine (vString *const vLine, MIOPos location, long *const pSeekValue); extern boolean bufferOpen (unsigned char *buffer, size_t buffer_size, const char *const fileName, const langType language ); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4910e2: Rename getDirectiveNestLevel() to cppGetDirectiveNestLevel()
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: 4910e2554bbe4aefeb29b25b743c8ae0d2cb284a https://github.com/geany/geany/commit/4910e2554bbe4aefeb29b25b743c8ae0d2cb2… 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).

1 0

[geany/geany] a59f82: Rename getArglistFromFilePos() to cppGetArglistFromFilePos() to match the rest
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: a59f82ec69737cc50533367c172ba3ddadbd51d1 https://github.com/geany/geany/commit/a59f82ec69737cc50533367c172ba3ddadbd5… Log Message: ----------- Rename getArglistFromFilePos() to cppGetArglistFromFilePos() to match the rest Modified Paths: -------------- ctags/main/lcpp.c ctags/main/lcpp.h ctags/parsers/c.c Modified: ctags/main/lcpp.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -321,7 +321,7 @@ static void makeDefineTag (const char *const name, boolean parameterized) e.truncateLine = TRUE; if (parameterized) { - e.extensionFields.signature = getArglistFromFilePos(getInputFilePosition() + e.extensionFields.signature = cppGetArglistFromFilePos(getInputFilePosition() , e.name); } makeTagEntry (&e); @@ -952,7 +952,7 @@ static char *getArglistFromStr(char *buf, const char *name) return strdup(start); } -extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName) +extern char *cppGetArglistFromFilePos(MIOPos startPosition, const char *tokenName) { MIOPos originalPosition; char *result = NULL; Modified: ctags/main/lcpp.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -46,7 +46,7 @@ extern void cppEndStatement (void); extern void cppUngetc (const int c); extern int cppGetc (void); extern int cppSkipOverCComment (void); -extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName); +extern char *cppGetArglistFromFilePos(MIOPos startPosition, const char *tokenName); #endif /* CTAGS_MAIN_GET_H */ Modified: ctags/parsers/c.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1224,7 +1224,7 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type, if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) && ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) { - tag->extensionFields.signature = getArglistFromFilePos( + tag->extensionFields.signature = cppGetArglistFromFilePos( tag->filePosition, tag->name); } break; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 25c1d2: objc: Remove unnecessary redefinition of UNUSED
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: 25c1d220cf5b54d0908fc4b8bf1768043d0447bf https://github.com/geany/geany/commit/25c1d220cf5b54d0908fc4b8bf1768043d044… Log Message: ----------- objc: Remove unnecessary redefinition of UNUSED Modified Paths: -------------- ctags/parsers/objc.c Modified: ctags/parsers/objc.c 11 lines changed, 0 insertions(+), 11 deletions(-) =================================================================== @@ -22,17 +22,6 @@ #include "routines.h" #include "vstring.h" -/* To get rid of unused parameter warning in - * -Wextra */ -#ifdef UNUSED -#elif defined(__GNUC__) -# define UNUSED(x) UNUSED_ ## x __attribute__((unused)) -#elif defined(__LCLINT__) -# define UNUSED(x) /*@unused@*/ x -#else -# define UNUSED(x) x -#endif - typedef enum { K_INTERFACE, K_IMPLEMENTATION, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 02138f: Rename TM_DEBUG macro to DEBUG
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: 02138f9e59cc5d57b3db617561d00bb09110b1a0 https://github.com/geany/geany/commit/02138f9e59cc5d57b3db617561d00bb09110b… Log Message: ----------- Rename TM_DEBUG macro to DEBUG Modified Paths: -------------- ctags/main/keyword.c ctags/main/keyword.h ctags/main/main.c ctags/parsers/c.c Modified: ctags/main/keyword.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -175,7 +175,7 @@ extern void freeKeywordTable (void) } } -#ifdef TM_DEBUG +#ifdef DEBUG static void printEntry (const hashEntry *const entry) { Modified: ctags/main/keyword.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -22,7 +22,7 @@ extern void addKeyword (const char *const string, langType language, int value); extern int lookupKeyword (const char *const string, langType language); extern void freeKeywordTable (void); -#ifdef TM_DEBUG +#ifdef DEBUG extern void printKeywordTable (void); #endif Modified: ctags/main/main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -160,7 +160,7 @@ static void printTotals (const clock_t *const timeStamps) fputc ('\n', errout); } -#ifdef TM_DEBUG +#ifdef DEBUG fprintf (errout, "longest tag line = %lu\n", (unsigned long) TagFile.max.line); #endif Modified: ctags/parsers/c.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -687,7 +687,7 @@ static const char *implementationString (const impType imp) * Debugging functions */ -#ifdef TM_DEBUG +#ifdef DEBUG #define boolString(c) ((c) ? "TRUE" : "FALSE") -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 20ad9a: Make getArglistFromStr() static
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: 20ad9ad4285b93ee80757408fa3a9d8d0d7dd9b9 https://github.com/geany/geany/commit/20ad9ad4285b93ee80757408fa3a9d8d0d7dd… Log Message: ----------- Make getArglistFromStr() static Modified Paths: -------------- ctags/main/lcpp.c ctags/main/lcpp.h ctags/parsers/python.c Modified: ctags/main/lcpp.c 60 lines changed, 30 insertions(+), 30 deletions(-) =================================================================== @@ -840,35 +840,6 @@ extern int cppGetc (void) return c; } -extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName) -{ - MIOPos originalPosition; - char *result = NULL; - char *arglist = NULL; - long pos1, pos2; - - pos2 = mio_tell(File.mio); - - mio_getpos(File.mio, &originalPosition); - mio_setpos(File.mio, &startPosition); - pos1 = mio_tell(File.mio); - - if (pos2 > pos1) - { - size_t len = pos2 - pos1; - - result = (char *) g_malloc(len + 1); - if (result != NULL && (len = mio_read(File.mio, result, 1, len)) > 0) - { - result[len] = '\0'; - arglist = getArglistFromStr(result, tokenName); - } - g_free(result); - } - mio_setpos(File.mio, &originalPosition); - return arglist; -} - typedef enum { st_none_t, @@ -957,7 +928,7 @@ static void stripCodeBuffer(char *buf) return; } -extern char *getArglistFromStr(char *buf, const char *name) +static char *getArglistFromStr(char *buf, const char *name) { char *start, *end; int level; @@ -981,4 +952,33 @@ extern char *getArglistFromStr(char *buf, const char *name) return strdup(start); } +extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName) +{ + MIOPos originalPosition; + char *result = NULL; + char *arglist = NULL; + long pos1, pos2; + + pos2 = mio_tell(File.mio); + + mio_getpos(File.mio, &originalPosition); + mio_setpos(File.mio, &startPosition); + pos1 = mio_tell(File.mio); + + if (pos2 > pos1) + { + size_t len = pos2 - pos1; + + result = (char *) g_malloc(len + 1); + if (result != NULL && (len = mio_read(File.mio, result, 1, len)) > 0) + { + result[len] = '\0'; + arglist = getArglistFromStr(result, tokenName); + } + g_free(result); + } + mio_setpos(File.mio, &originalPosition); + return arglist; +} + /* vi:set tabstop=4 shiftwidth=4: */ Modified: ctags/main/lcpp.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,6 @@ extern void cppUngetc (const int c); extern int cppGetc (void); extern int cppSkipOverCComment (void); extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName); -extern char *getArglistFromStr(char *buf, const char *name); #endif /* CTAGS_MAIN_GET_H */ Modified: ctags/parsers/python.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -362,7 +362,7 @@ static void parseImports (const char *cp) vStringDelete (name_next); } -/* modified from get.c getArglistFromStr(). +/* modified from lcpp.c getArglistFromStr(). * warning: terminates rest of string past arglist! * note: does not ignore brackets inside strings! */ static char *parseArglist(const char *buf) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 263889: Rename isBraceFormat to cppIsBraceFormat()
by Jiří Techet 10 Sep '16

10 Sep '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 07 Aug 2016 16:31:30 UTC Commit: 2638899379cafb09fbf4ef5cbfa3dd7e58834692 https://github.com/geany/geany/commit/2638899379cafb09fbf4ef5cbfa3dd7e58834… Log Message: ----------- Rename isBraceFormat to cppIsBraceFormat() 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(-) =================================================================== @@ -102,7 +102,7 @@ static cppState Cpp = { * FUNCTION DEFINITIONS */ -extern boolean isBraceFormat (void) +extern boolean cppIsBraceFormat (void) { return BraceFormat; } Modified: ctags/main/lcpp.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -34,7 +34,7 @@ /* * FUNCTION PROTOTYPES */ -extern boolean isBraceFormat (void); +extern boolean cppIsBraceFormat (void); extern unsigned int getDirectiveNestLevel (void); extern void cppInit (const boolean state, const boolean hasAtLiteralStrings, const boolean hasCxxRawLiteralStrings, Modified: ctags/parsers/c.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1652,7 +1652,7 @@ static void skipToFormattedBraceMatch (void) static void skipToMatch (const char *const pair) { const boolean braceMatching = (boolean) (strcmp ("{}", pair) == 0); - const boolean braceFormatting = (boolean) (isBraceFormat () && braceMatching); + const boolean braceFormatting = (boolean) (cppIsBraceFormat () && braceMatching); const unsigned int initialLevel = getDirectiveNestLevel (); const int begin = pair [0], end = pair [1]; const unsigned long inputLineNumber = getInputLineNumber (); @@ -2738,7 +2738,7 @@ static int skipInitializer (statementInfo *const st) case '}': if (insideEnumBody (st)) done = TRUE; - else if (! isBraceFormat ()) + else if (! cppIsBraceFormat ()) { verbose ("%s: unexpected closing brace at line %lu\n", getInputFileName (), getInputLineNumber ()); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2016