Commits December 2021

commits@lists.geany.org

1 participants
19 discussions

[geany/geany] 683c84: Use Pascal parser from uctags
by Enrico Tröger 29 Dec '21

29 Dec '21

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 11 Dec 2021 09:00:32 UTC Commit: 683c846873461d35f3deeabb7648a5d09bc73050 https://github.com/geany/geany/commit/683c846873461d35f3deeabb7648a5d09bc73… Log Message: ----------- Use Pascal parser from uctags Fixes #2358, fixes #2982, fixes #2428 and fixes #2987. Modified Paths: -------------- ctags/Makefile.am ctags/parsers/pascal.c tests/ctags/bug612019.pas.tags Modified: ctags/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -43,7 +43,7 @@ parsers = \ parsers/geany_matlab.c \ parsers/nsis.c \ parsers/objc.c \ - parsers/geany_pascal.c \ + parsers/pascal.c \ parsers/perl.c \ parsers/perl.h \ parsers/php.c \ Modified: ctags/parsers/pascal.c 100 lines changed, 42 insertions(+), 58 deletions(-) =================================================================== @@ -37,22 +37,26 @@ static kindDefinition PascalKinds [] = { * FUNCTION DEFINITIONS */ -static void createPascalTag (tagEntryInfo* const tag, - const vString* const name, const int kind, - const char *arglist, const char *vartype) +static void createPascalTag ( + tagEntryInfo* const tag, const vString* const name, const int kind, + const vString *arglist, const vString *vartype) { if (PascalKinds [kind].enabled && name != NULL && vStringLength (name) > 0) { initTagEntry (tag, vStringValue (name), kind); - - tag->extensionFields.signature = arglist; - tag->extensionFields.typeRef[1] = vartype; + if (arglist && !vStringIsEmpty (arglist)) + { + tag->extensionFields.signature = vStringValue (arglist); + } + if (vartype && !vStringIsEmpty (vartype)) + { + tag->extensionFields.typeRef[0] = "typename"; + tag->extensionFields.typeRef[1] = vStringValue (vartype); + } } else - { /* TODO: Passing NULL as name makes an assertion behind initTagEntry failure */ - /* initTagEntry (tag, NULL, NULL); */ - } + initTagEntry (tag, NULL, KIND_GHOST_INDEX); } static void makePascalTag (const tagEntryInfo* const tag) @@ -82,17 +86,16 @@ static bool tail (const char *cp) return result; } -static void parseArglist(const char *buf, char **arglist, char **vartype) +static void parseArglist (const char *buf, vString *arglist, vString *vartype) { - char *c, *start, *end; + const char *start, *end; int level; - if (NULL == buf || NULL == arglist) + if (NULL == buf || arglist == NULL) return; - c = strdup(buf); /* parse argument list which can be missing like in "function ginit:integer;" */ - if (NULL != (start = strchr(c, '('))) + if (NULL != (start = strchr (buf, '('))) { for (level = 1, end = start + 1; level > 0; ++end) { @@ -106,45 +109,41 @@ static void parseArglist(const char *buf, char **arglist, char **vartype) } else /* if no argument list was found, continue looking for a return value */ { - start = "()"; - end = c; + start = NULL; + end = buf; } /* parse return type if requested by passing a non-NULL vartype argument */ if (NULL != vartype) { char *var, *var_start; - *vartype = NULL; - - if (NULL != (var = strchr(end, ':'))) + if (NULL != (var = strchr (end, ':'))) { var++; /* skip ':' */ - while (isspace((int) *var)) + while (isspace ((int) *var)) ++var; - if (starttoken(*var)) + if (starttoken (*var)) { var_start = var; var++; - while (intoken(*var)) + while (intoken (*var)) var++; - if (endtoken(*var)) + if (endtoken (*var)) { - *var = '\0'; - *vartype = strdup(var_start); + vStringNCatS (vartype, var_start, var - var_start); } } } } - *end = '\0'; - *arglist = strdup(start); - - eFree(c); + if (NULL == start) /* no argument list */ + vStringCatS (arglist, "()"); + else + vStringNCatS (arglist, start, end - start); } - /* Algorithm adapted from from GNU etags. * Locates tags for procedures & functions. Doesn't do any type- or * var-definitions. It does look for the keyword "extern" or "forward" @@ -154,13 +153,13 @@ static void parseArglist(const char *buf, char **arglist, char **vartype) static void findPascalTags (void) { vString *name = vStringNew (); + vString *arglist = vStringNew (); + vString *vartype = vStringNew (); tagEntryInfo tag; - char *arglist = NULL; - char *vartype = NULL; pascalKind kind = K_FUNCTION; /* each of these flags is true iff: */ bool incomment = false; /* point is inside a comment */ - int comment_char = '\0'; /* type of current comment */ + int comment_char = '\0'; /* type of current comment */ bool inquote = false; /* point is inside '..' string */ bool get_tagname = false;/* point is after PROCEDURE/FUNCTION keyword, so next item = potential tag */ @@ -257,14 +256,6 @@ static void findPascalTags (void) verify_tag = false; } } - else if (tolower ((int) *dbp) == 't') - { - if (tail ("type")) /* check for forward reference */ - { - found_tag = false; - verify_tag = false; - } - } if (found_tag && verify_tag) /* not external proc, so make tag */ { found_tag = false; @@ -283,14 +274,16 @@ static void findPascalTags (void) /* grab block name */ while (isspace ((int) *dbp)) ++dbp; + if (!starttoken(*dbp)) + continue; for (cp = dbp ; *cp != '\0' && !endtoken (*cp) ; cp++) continue; vStringNCopyS (name, (const char*) dbp, cp - dbp); - if (arglist != NULL) - eFree(arglist); - if (kind == K_FUNCTION && vartype != NULL) - eFree(vartype); - parseArglist((const char*) cp, &arglist, (kind == K_FUNCTION) ? &vartype : NULL); + + vStringClear (arglist); + vStringClear (vartype); + parseArglist ((const char*) cp, arglist, (kind == K_FUNCTION) ? vartype : NULL); + createPascalTag (&tag, name, kind, arglist, (kind == K_FUNCTION) ? vartype : NULL); dbp = cp; /* set dbp to e-o-token */ get_tagname = false; @@ -329,20 +322,11 @@ static void findPascalTags (void) kind = K_FUNCTION; } break; - case 't': - if (tail ("ype")) - { - get_tagname = true; - kind = K_FUNCTION; - } - break; } } /* while not eof */ } - if (arglist != NULL) - eFree(arglist); - if (vartype != NULL) - eFree(vartype); + vStringDelete (arglist); + vStringDelete (vartype); vStringDelete (name); } @@ -351,7 +335,7 @@ extern parserDefinition* PascalParser (void) static const char *const extensions [] = { "p", "pas", NULL }; parserDefinition* def = parserNew ("Pascal"); def->extensions = extensions; - def->kindTable = PascalKinds; + def->kindTable = PascalKinds; def->kindCount = ARRAY_SIZE (PascalKinds); def->parser = findPascalTags; return def; Modified: tests/ctags/bug612019.pas.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ # format=tagmanager -TTest�16�()�0 +Test1�16�()�0 Test2�16�()�0 Test3�16�()�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 63a60f: Merge pull request #3043 from eht16/pascal_sync
by Jiří Techet 29 Dec '21

29 Dec '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 28 Dec 2021 20:04:31 UTC Commit: 63a60f6ad799ebaac511e0ab3d251a44ff6c0061 https://github.com/geany/geany/commit/63a60f6ad799ebaac511e0ab3d251a44ff6c0… Log Message: ----------- Merge pull request #3043 from eht16/pascal_sync Use Pascal parser from uctags Modified Paths: -------------- ctags/Makefile.am ctags/parsers/pascal.c tests/ctags/bug612019.pas.tags Modified: ctags/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -75,7 +75,7 @@ parsers = \ parsers/geany_matlab.c \ parsers/nsis.c \ parsers/objc.c \ - parsers/geany_pascal.c \ + parsers/pascal.c \ parsers/perl.c \ parsers/perl.h \ parsers/php.c \ Modified: ctags/parsers/pascal.c 100 lines changed, 42 insertions(+), 58 deletions(-) =================================================================== @@ -37,22 +37,26 @@ static kindDefinition PascalKinds [] = { * FUNCTION DEFINITIONS */ -static void createPascalTag (tagEntryInfo* const tag, - const vString* const name, const int kind, - const char *arglist, const char *vartype) +static void createPascalTag ( + tagEntryInfo* const tag, const vString* const name, const int kind, + const vString *arglist, const vString *vartype) { if (PascalKinds [kind].enabled && name != NULL && vStringLength (name) > 0) { initTagEntry (tag, vStringValue (name), kind); - - tag->extensionFields.signature = arglist; - tag->extensionFields.typeRef[1] = vartype; + if (arglist && !vStringIsEmpty (arglist)) + { + tag->extensionFields.signature = vStringValue (arglist); + } + if (vartype && !vStringIsEmpty (vartype)) + { + tag->extensionFields.typeRef[0] = "typename"; + tag->extensionFields.typeRef[1] = vStringValue (vartype); + } } else - { /* TODO: Passing NULL as name makes an assertion behind initTagEntry failure */ - /* initTagEntry (tag, NULL, NULL); */ - } + initTagEntry (tag, NULL, KIND_GHOST_INDEX); } static void makePascalTag (const tagEntryInfo* const tag) @@ -82,17 +86,16 @@ static bool tail (const char *cp) return result; } -static void parseArglist(const char *buf, char **arglist, char **vartype) +static void parseArglist (const char *buf, vString *arglist, vString *vartype) { - char *c, *start, *end; + const char *start, *end; int level; - if (NULL == buf || NULL == arglist) + if (NULL == buf || arglist == NULL) return; - c = strdup(buf); /* parse argument list which can be missing like in "function ginit:integer;" */ - if (NULL != (start = strchr(c, '('))) + if (NULL != (start = strchr (buf, '('))) { for (level = 1, end = start + 1; level > 0; ++end) { @@ -106,45 +109,41 @@ static void parseArglist(const char *buf, char **arglist, char **vartype) } else /* if no argument list was found, continue looking for a return value */ { - start = "()"; - end = c; + start = NULL; + end = buf; } /* parse return type if requested by passing a non-NULL vartype argument */ if (NULL != vartype) { char *var, *var_start; - *vartype = NULL; - - if (NULL != (var = strchr(end, ':'))) + if (NULL != (var = strchr (end, ':'))) { var++; /* skip ':' */ - while (isspace((int) *var)) + while (isspace ((int) *var)) ++var; - if (starttoken(*var)) + if (starttoken (*var)) { var_start = var; var++; - while (intoken(*var)) + while (intoken (*var)) var++; - if (endtoken(*var)) + if (endtoken (*var)) { - *var = '\0'; - *vartype = strdup(var_start); + vStringNCatS (vartype, var_start, var - var_start); } } } } - *end = '\0'; - *arglist = strdup(start); - - eFree(c); + if (NULL == start) /* no argument list */ + vStringCatS (arglist, "()"); + else + vStringNCatS (arglist, start, end - start); } - /* Algorithm adapted from from GNU etags. * Locates tags for procedures & functions. Doesn't do any type- or * var-definitions. It does look for the keyword "extern" or "forward" @@ -154,13 +153,13 @@ static void parseArglist(const char *buf, char **arglist, char **vartype) static void findPascalTags (void) { vString *name = vStringNew (); + vString *arglist = vStringNew (); + vString *vartype = vStringNew (); tagEntryInfo tag; - char *arglist = NULL; - char *vartype = NULL; pascalKind kind = K_FUNCTION; /* each of these flags is true iff: */ bool incomment = false; /* point is inside a comment */ - int comment_char = '\0'; /* type of current comment */ + int comment_char = '\0'; /* type of current comment */ bool inquote = false; /* point is inside '..' string */ bool get_tagname = false;/* point is after PROCEDURE/FUNCTION keyword, so next item = potential tag */ @@ -257,14 +256,6 @@ static void findPascalTags (void) verify_tag = false; } } - else if (tolower ((int) *dbp) == 't') - { - if (tail ("type")) /* check for forward reference */ - { - found_tag = false; - verify_tag = false; - } - } if (found_tag && verify_tag) /* not external proc, so make tag */ { found_tag = false; @@ -283,14 +274,16 @@ static void findPascalTags (void) /* grab block name */ while (isspace ((int) *dbp)) ++dbp; + if (!starttoken(*dbp)) + continue; for (cp = dbp ; *cp != '\0' && !endtoken (*cp) ; cp++) continue; vStringNCopyS (name, (const char*) dbp, cp - dbp); - if (arglist != NULL) - eFree(arglist); - if (kind == K_FUNCTION && vartype != NULL) - eFree(vartype); - parseArglist((const char*) cp, &arglist, (kind == K_FUNCTION) ? &vartype : NULL); + + vStringClear (arglist); + vStringClear (vartype); + parseArglist ((const char*) cp, arglist, (kind == K_FUNCTION) ? vartype : NULL); + createPascalTag (&tag, name, kind, arglist, (kind == K_FUNCTION) ? vartype : NULL); dbp = cp; /* set dbp to e-o-token */ get_tagname = false; @@ -329,20 +322,11 @@ static void findPascalTags (void) kind = K_FUNCTION; } break; - case 't': - if (tail ("ype")) - { - get_tagname = true; - kind = K_FUNCTION; - } - break; } } /* while not eof */ } - if (arglist != NULL) - eFree(arglist); - if (vartype != NULL) - eFree(vartype); + vStringDelete (arglist); + vStringDelete (vartype); vStringDelete (name); } @@ -351,7 +335,7 @@ extern parserDefinition* PascalParser (void) static const char *const extensions [] = { "p", "pas", NULL }; parserDefinition* def = parserNew ("Pascal"); def->extensions = extensions; - def->kindTable = PascalKinds; + def->kindTable = PascalKinds; def->kindCount = ARRAY_SIZE (PascalKinds); def->parser = findPascalTags; return def; Modified: tests/ctags/bug612019.pas.tags 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ # format=tagmanager -TTest�16�()�0 +Test1�16�()�0 Test2�16�()�0 Test3�16�()�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] a1ad23: Fix syntax error in theme
by Jiří Techet 28 Dec '21

28 Dec '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 27 Dec 2021 20:03:22 UTC Commit: a1ad231bad566b673ce6e3f4c0ff7f50e5ab439b https://github.com/geany/geany-osx/commit/a1ad231bad566b673ce6e3f4c0ff7f50e… Log Message: ----------- Fix syntax error in theme Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-dark.css Modified: Prof-Gnome/gtk-3.0/main-dark.css 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1930,7 +1930,7 @@ combobox:drop(active) box-shadow: none; } -//*(((((((((( Toolbars )))))))))) +/*(((((((((( Toolbars )))))))))) */ toolbar, .inline-toolbar, searchbar > revealer > box, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 6d761d: Use lighter menu bar
by Jiří Techet 28 Dec '21

28 Dec '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 27 Dec 2021 20:03:08 UTC Commit: 6d761dd10e12d53e949bf2714995157a7eef3b94 https://github.com/geany/geany-osx/commit/6d761dd10e12d53e949bf2714995157a7… Log Message: ----------- Use lighter menu bar Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-dark.css Prof-Gnome/gtk-3.0/main-light.css Modified: Prof-Gnome/gtk-3.0/main-dark.css 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -2779,9 +2779,7 @@ menubar, { -GtkWidget-window-dragging: true; padding: 0 4px; - background-image: linear-gradient(to top, - alpha(shade((a)headerbar_color,0.88),1), - alpha(shade((a)headerbar_color,0.92),1)); + background-color: @theme_bg_color; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.5); } menubar > menuitem, Modified: Prof-Gnome/gtk-3.0/main-light.css 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -2775,9 +2775,7 @@ menubar, { -GtkWidget-window-dragging: true; padding: 0 4px; - background-image: linear-gradient(to top, - alpha(shade((a)headerbar_color,0.86),1), - alpha(shade((a)headerbar_color,0.94),1)); + background-color: @theme_bg_color; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar > menuitem, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 48d4f5: Merge pull request #3061 from techee/css_statusbar
by Jiří Techet 27 Dec '21

27 Dec '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Mon, 27 Dec 2021 08:52:43 UTC Commit: 48d4f58966ea81a06e77b9f75079dc989f4636ea https://github.com/geany/geany/commit/48d4f58966ea81a06e77b9f75079dc989f463… Log Message: ----------- Merge pull request #3061 from techee/css_statusbar Make it easier to discover how to reduce the size of the statusbar Modified Paths: -------------- data/geany.css Modified: data/geany.css 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -52,3 +52,10 @@ #geany-terminal-dirty { color: #ff3030; } + +/* Uncomment the following to reduce the size of the statusbar if needed */ +/* +statusbar { + margin: -6px 0; +} +*/ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 329776: autotools: use autoreconf and gettext (#2938)
by Thomas Martitz 26 Dec '21

26 Dec '21

Branch: refs/heads/master Author: Thomas Martitz <thomas.martitz(a)mailbox.org> Committer: GitHub <noreply(a)github.com> Date: Sat, 25 Dec 2021 19:55:05 UTC Commit: 32977676a90244e0410524614757d2cf214bae43 https://github.com/geany/geany/commit/32977676a90244e0410524614757d2cf214ba… Log Message: ----------- autotools: use autoreconf and gettext (#2938) autoreconf is much more convenient over calling the autotools programs individually. Standard gettext should be used over glib's glue these days. AM_GLIB_GNU_GETTEXT and glib-gettextize are deprecated. This helps the meson build (#2761) as well as working with intltool is harder over there. gettext, on the other hand, is supported out of the box in meson. Beware, autopoint is a new dependency when building from git,should not affect tarballs. Inspired by: https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration https://gitlab.gnome.org/GNOME/gedit/-/commit/0b4d03017fe7ba2e5c7d33d364de4… Modified Paths: -------------- .github/workflows/build.yml .gitignore INSTALL Makefile.am README autogen.sh configure.ac doc/plugins.dox geany.desktop.in m4/geany-i18n.m4 po/LINGUAS po/Makevars Modified: .github/workflows/build.yml 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -69,7 +69,7 @@ jobs: sudo apt-get update -qq sudo apt-get install --assume-yes --no-install-recommends \ ccache \ - intltool \ + gettext autopoint \ libtool \ libgtk-3-dev \ doxygen \ @@ -139,7 +139,7 @@ jobs: sudo apt-get update -qq sudo apt-get install --assume-yes --no-install-recommends \ ccache \ - intltool \ + gettext autopoint \ libtool \ mingw-w64-tools \ g++-mingw-w64-i686 \ Modified: .gitignore 41 lines changed, 34 insertions(+), 7 deletions(-) =================================================================== @@ -17,6 +17,7 @@ Makefile.in #----------------------------------------------------------------------- # / (root) #----------------------------------------------------------------------- +/ABOUT-NLS /aclocal.m4 /autom4te.cache /build-aux/ @@ -41,14 +42,43 @@ Makefile.in /geany.nsi /global.tags.old /install-sh -/intltool -/intltool-* /libtool /localwin32.mk /ltmain.sh /m4/lt*.m4 -/m4/intltool.m4 /m4/libtool.m4 +/m4/codeset.m4 +/m4/extern-inline.m4 +/m4/fcntl-o.m4 +/m4/gettext.m4 +/m4/glibc2.m4 +/m4/glibc21.m4 +/m4/iconv.m4 +/m4/intdiv0.m4 +/m4/intl.m4 +/m4/intldir.m4 +/m4/intlmacosx.m4 +/m4/intmax.m4 +/m4/inttypes-pri.m4 +/m4/inttypes_h.m4 +/m4/lcmessage.m4 +/m4/lib-ld.m4 +/m4/lib-link.m4 +/m4/lib-prefix.m4 +/m4/lock.m4 +/m4/longlong.m4 +/m4/nls.m4 +/m4/po.m4 +/m4/printf-posix.m4 +/m4/progtest.m4 +/m4/size_max.m4 +/m4/stdint_h.m4 +/m4/threadlib.m4 +/m4/uintmax_t.m4 +/m4/visibility.m4 +/m4/wchar_t.m4 +/m4/wint_t.m4 +/m4/xsize.m4 /make_deb.sh /missing /mkinstalldirs @@ -65,10 +95,8 @@ Makefile.in /po/ChangeLog.save /po/*.gmo /po/*.header -/po/.intltool-merge-cache -/po/LINGUAS /po/Makefile.in.in -/po/Makevars +/po/Makevars.template /po/*.mo /po/*.pot /po/POTFILES @@ -79,7 +107,6 @@ Makefile.in /po/*.sed /po/*.sin /po/stamp-it -/po/.intlcache #----------------------------------------------------------------------- # /src/ Modified: INSTALL 422 lines changed, 304 insertions(+), 118 deletions(-) =================================================================== @@ -1,182 +1,368 @@ +Installation Instructions +************************* + + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + Basic Installation ================== - These are generic installation instructions. + Briefly, the shell command './configure && make && make install' +should configure, build, and install this package. The following +more-detailed instructions are generic; see the 'README' file for +instructions specific to this package. Some packages provide this +'INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that +you can run in the future to recreate the current configuration, and a +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). + + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can +be considered for the next release. If you are using the cache, and at +some point 'config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. + + The simplest way to compile this package is: + + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. + + Running 'configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type 'make' to compile the package. + + 3. Optionally, type 'make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type 'make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the 'make install' phase executed with root + privileges. + + 5. Optionally, type 'make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior 'make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. + 7. Often, you can also type 'make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide 'make + distcheck', which can by used by developers to test that all other + targets like 'make install' and 'make uninstall' work correctly. + This target is generally not run by end users. + Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +the 'configure' script does not know about. Run './configure --help' +for details on some of the pertinent environment variables. + + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. + + With a non-GNU 'make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use 'make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like +this: - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to 'configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +'make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, 'make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. + + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. + + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of 'make' will be. For these packages, running './configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with 'make V=1'; while running './configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with 'make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX 'make' updates targets which have the same timestamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its '<wchar.h>' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. + + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: + There may be some features 'configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, 'configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: + CPU-COMPANY-SYSTEM -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option '--target=TYPE' to select the type of system they will +produce code for. - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. -Operation Controls +Defining Variables ================== - `configure' recognizes the following options to control how it + Variables not defined in a site shell script can be set in the +environment passed to 'configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the 'configure' command line, using 'VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified 'gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: + + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +'configure' Invocation +====================== + + 'configure' recognizes the following options to control how it operates. -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help' - Print a summary of the options to `configure', and exit. +'--help=short' +'--help=recursive' + Print a summary of the options unique to this package's + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. -`--quiet' -`--silent' -`-q' +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' + script, and exit. + +'--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally 'config.cache'. FILE defaults to '/dev/null' to + disable caching. + +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. + +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. + +'--no-create' +'-n' + Run the configure checks, but stop before creating any output + files. -`configure' also accepts some other, not widely useful, options. +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. Modified: Makefile.am 20 lines changed, 5 insertions(+), 15 deletions(-) =================================================================== @@ -21,26 +21,14 @@ EXTRA_DIST = \ HACKING \ README.I18N \ README.Packagers \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ $(WIN32_BUILD_FILES) DISTCLEANFILES = \ - geany.desktop \ - intltool-extract \ - intltool-merge \ - intltool-update + geany.desktop uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); -# Remove po/.intltool-merge-cache.lock on "distcheck" which is left over by various incorrectly -# patched versions of intltool, e.g. https://bugs.archlinux.org/task/67098 or -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991623 -distclean-local: - rm -f $(top_builddir)/po/.intltool-merge-cache.lock - # manually install some files under another name install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @@ -85,6 +73,8 @@ pkgconfig_DATA = geany.pc pkgconfigdir = $(libdir)/pkgconfig desktopdir = $(datadir)/applications -desktop_in_files = geany.desktop +desktop_in_files = geany.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ + +$(desktop_DATA): $(desktop_in_files) $(wildcard $(top_srcdir)/po/*.po) + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ Modified: README 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -78,10 +78,10 @@ and open the online version instead when requested. Installing from a Git clone +++++++++++++++++++++++++++ -Install Autotools (*automake*, *autoconf* and *libtool*), *intltool*, -and the GLib development files **before** running any of the following -commands, as well as *rst2html* from Docutils (see above for details). -Then, run ``./autogen.sh`` and then follow the instructions for +Install Autotools (*autopoint*, *automake*, *autoconf* and *libtool*), +*gettext*, and the GLib development files **before** running any of the +following commands, as well as *rst2html* from Docutils (see above for +details). Then, run ``./autogen.sh`` and then follow the instructions for `installing from a release tarball`_. Installing from a release tarball Modified: autogen.sh 67 lines changed, 3 insertions(+), 64 deletions(-) =================================================================== @@ -1,6 +1,8 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +set -e + srcdir=`dirname $0` test -z "$srcdir" && srcdir=. @@ -11,39 +13,6 @@ DIE=0 exit 1 } -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(intltoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`intltool' installed." - echo "You can get it from:" - echo " ftp://ftp.gnome.org/pub/GNOME/" - DIE=1 -} - -(glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`glib' installed." - echo "You can get it from: ftp://ftp.gtk.org/pub/gtk" - DIE=1 -} - -(libtoolize --version) < /dev/null > /dev/null 2>&1 || { - (glibtoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "You can get it from:" - echo " http://www.gnu.org/software/libtool/" - DIE=1 - } -} - (pkg-config --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have pkg-config installed to compile $package." @@ -52,28 +21,6 @@ DIE=0 DIE=1 } -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' (1.7 or later) installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - if test -z "$*" -a "$NOCONFIGURE" != 1; then echo "**Warning**: I am going to run \`configure' with no arguments." echo "If you wish to pass any to it, please specify them on the" @@ -83,19 +30,11 @@ fi echo "Processing configure.ac" -test -d build-aux || mkdir build-aux -echo "no" | glib-gettextize --force --copy -intltoolize --copy --force --automake -libtoolize --copy --force || glibtoolize --copy --force -aclocal -I m4 -autoheader -automake --add-missing --copy --gnu -autoconf +autoreconf --force --install --verbose if [ "$NOCONFIGURE" = 1 ]; then echo "Done. configure skipped." exit 0; fi echo "Running $srcdir/configure $@ ..." $srcdir/configure "$@" && echo "Now type 'make' to compile." || exit 1 - Modified: configure.ac 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -9,6 +9,9 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects]) AC_CONFIG_HEADERS([config.h]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) GEANY_PREFIX @@ -122,13 +125,14 @@ GEANY_CHECK_VTE GEANY_CHECK_MAC_INTEGRATION GEANY_CHECK_THE_FORCE dnl hehe -# i18n -GEANY_I18N +AC_SUBST([GETTEXT_PACKAGE],[$PACKAGE]) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$PACKAGE"], [Gettext package.]) # double eval since datarootdir is usually defined as ${prefix}/share AM_COND_IF([MINGW], [pkgdatadir='${prefix}/data'], [pkgdatadir='${datarootdir}/geany']) +AM_COND_IF([MINGW],[LIBS="$LIBS -liconv"]) AC_SUBST([GEANY_DATA_DIR], [$(eval echo $(eval echo $pkgdatadir))]) AC_SUBST([pkgdatadir]) Modified: doc/plugins.dox 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -159,7 +159,7 @@ following. First you need to have Geany installed. Then install the development files for GTK and its dependencies. The easiest way to do this is to use your distribution's package management system, e.g. on Debian and Ubuntu systems you can use -@code apt-get install libgtk-3-dev intltool @endcode +@code apt-get install libgtk-3-dev autoconf automake autopoint gettext @endcode This will install all necessary files to be able to compile plugins for Geany. On other distributions, the package names and commands to use may differ. Modified: geany.desktop.in 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -1,13 +1,13 @@ [Desktop Entry] Type=Application Version=1.0 -_Name=Geany -_GenericName=Integrated Development Environment -_Comment=A fast and lightweight IDE using GTK+ +Name=Geany +GenericName=Integrated Development Environment +Comment=A fast and lightweight IDE using GTK+ Exec=geany %F Icon=geany Terminal=false Categories=GTK;Development;IDE;TextEditor; MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff; StartupNotify=true -_Keywords=Text;Editor; +Keywords=Text;Editor; Modified: m4/geany-i18n.m4 26 lines changed, 0 insertions(+), 26 deletions(-) =================================================================== @@ -1,26 +0,0 @@ -dnl GEANY_I18N -dnl Setups I18N support. -dnl AC_DEFINEs and AC_SUBSTs GETTEXT_PACKAGE -AC_DEFUN([GEANY_I18N], -[ - AC_REQUIRE([AC_PROG_AWK]) - AC_REQUIRE([AC_PROG_INTLTOOL]) - - GETTEXT_PACKAGE="$PACKAGE" - AC_SUBST([GETTEXT_PACKAGE]) - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package.]) - - ALL_LINGUAS=`cd "$srcdir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $[]1 }'` - - AM_GLIB_GNU_GETTEXT - # workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) - if test "x$MSGFMT" = "xno"; then - AC_MSG_ERROR([msgfmt not found. Please install the gettext package.]) - fi - - # intltool hack to define install_sh on Debian/Ubuntu systems - if test "x$install_sh" = "x"; then - install_sh="`pwd`/install-sh" - AC_SUBST([install_sh]) - fi -]) Modified: po/LINGUAS 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +ar ast be bg ca cs da de el en_GB es et eu fa fi fr gl he hi hu id ie it ja kk ko ku lb lt lv mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN zh_TW Modified: po/Makevars 82 lines changed, 82 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,82 @@ +# Makefile variables for PO directory in any package using GNU gettext. +# +# Copyright (C) 2003-2019 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation gives +# unlimited permission to use, copy, distribute, and modify it. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = The Geany contributors + +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = https://github.com/geany/geany/issues + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = + +# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' +# context. Possible values are "yes" and "no". Set this to yes if the +# package uses functions taking also a message context, like pgettext(), or +# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. +USE_MSGCTXT = no + +# These options get passed to msgmerge. +# Useful options are in particular: +# --previous to keep previous msgids of translated messages, +# --quiet to reduce the verbosity. +MSGMERGE_OPTIONS = + +# These options get passed to msginit. +# If you want to disable line wrapping when writing PO files, add +# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and +# MSGINIT_OPTIONS. +MSGINIT_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1eb956: Add new C++20 keywords (#3065)
by jmb6 23 Dec '21

23 Dec '21

Branch: refs/heads/master Author: jmb6 <toshinon(a)cock.li> Committer: GitHub <noreply(a)github.com> Date: Thu, 23 Dec 2021 07:18:47 UTC Commit: 1eb956525b6e563525ee4b076bdd3aaad4a5d464 https://github.com/geany/geany/commit/1eb956525b6e563525ee4b076bdd3aaad4a5d… Log Message: ----------- Add new C++20 keywords (#3065) Modified Paths: -------------- data/filedefs/filetypes.cpp Modified: data/filedefs/filetypes.cpp 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ [keywords] # all items must be in one line -primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected public register reinterpret_cast return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq +primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char8_t char16_t char32_t class compl concept const const_cast consteval constexpr constinit continue co_await co_return co_yield decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if import inline int long module mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected public register reinterpret_cast requires return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq secondary= # these are the Doxygen keywords docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b8c9d9: Make it easier to discover how to reduce the size of the statusbar
by Jiří Techet 20 Dec '21

20 Dec '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 20 Dec 2021 09:51:41 UTC Commit: b8c9d99bb7012127017dac7433cec85cde45561e https://github.com/geany/geany/commit/b8c9d99bb7012127017dac7433cec85cde455… Log Message: ----------- Make it easier to discover how to reduce the size of the statusbar Modified Paths: -------------- data/geany.css Modified: data/geany.css 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -52,3 +52,10 @@ #geany-terminal-dirty { color: #ff3030; } + +/* Uncomment the following to reduce the size of the statusbar if needed */ +/* +statusbar { + margin: -6px 0; +} +*/ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] d20ca1: Workaround statusbar height problem on GTK 3
by Jiří Techet 20 Dec '21

20 Dec '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 19 Dec 2021 18:50:28 UTC Commit: d20ca12c635273e09aa9fbf8874912d9465de21b https://github.com/geany/geany-osx/commit/d20ca12c635273e09aa9fbf8874912d94… Log Message: ----------- Workaround statusbar height problem on GTK 3 Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-dark.css Prof-Gnome/gtk-3.0/main-light.css Modified: Prof-Gnome/gtk-3.0/main-dark.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -6743,6 +6743,7 @@ background-image:linear-gradient(shade(@headerbar_button_color,0.90),shade(@head } statusbar { + margin: -3px; border-radius: 0 0 6px 6px; } #weather-page, Modified: Prof-Gnome/gtk-3.0/main-light.css 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -6725,6 +6725,7 @@ filechooser placessidebar.sidebar } statusbar { + margin: -3px; border-radius: 0 0 6px 6px; } #weather-page, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5ea3e3: Use cxx parser from uctags (#3032)
by Jiří Techet 19 Dec '21

19 Dec '21

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sun, 19 Dec 2021 00:04:54 UTC Commit: 5ea3e3ec77eaa87ff709f003743dbb80285e3b6f https://github.com/geany/geany/commit/5ea3e3ec77eaa87ff709f003743dbb80285e3… Log Message: ----------- Use cxx parser from uctags (#3032) * Add "l" prefix to functions in lcpp.c/h This is to avoid clash with cpreprocessor.c/h used by the new cxx parser. Merging lcpp.c/h with cpreprocessor.c/h would be difficult (at least for now) because of the differences in c.c so keep them separate for now. * Rename C/C++ parsers to "Old" As a result, when we copy the new cxx parser, we don't have clashes of these symbols from the two different parsers. * Add the new cxx parser This patch only makes the parser compile, it doesn't enable it yet. * Enable the new cxx parser There are several things needed for this: 1. The new preprocessor has to be defined as a separate parser. 2. Tags from the new c/c++ parsers and the preprocessor parser have to be mapped to Geany types. We still need to keep the old mappings because some parsers like Ferite or GLSL still use the old C parser. 3. Anonymous tags have a different name so we have to reflect this in tm_tag_is_anon(). * Update C/C++ unit tests The changes are mostly these: 1. Spaces in function argument list (int var1, int var2, ...) - before (int var1,int var2,...) - now 2. Anonymous tags anon_struct_1 anon_union_2 anon_typedef_3 vs __anon1 __anon2 __anon3 3. Improved parsing of the new parser * Eliminate console warning for cxx 'using' tags Fix from https://github.com/universal-ctags/ctags/commit/fb305d8814c4dc53a94fcbc5f0c… * Update update-ctags.py to also update the cxx parser * Pass our ignore.tags file with ignored symbols to cxx preprocessor The syntax is slightly different from the previous syntax and is described here: https://docs.ctags.io/en/latest/parser-cxx.html Basic usage should be the same, uctags just doesn't support Geany's wildcard ignores like G_GNUC_*. On the other hand the new parser is much more resilient to macros so there shouldn't be so much need for manual ignores. The original code is still kept for parsers from c.c that still use the old preprocessor. * Update documentation regarding ignore.tags Modified Paths: -------------- ctags/Makefile.am ctags/parsers/cpreprocessor.c ctags/parsers/cpreprocessor.h ctags/parsers/cxx/cxx.c ctags/parsers/cxx/cxx_debug.c ctags/parsers/cxx/cxx_debug.h ctags/parsers/cxx/cxx_debug_type.c ctags/parsers/cxx/cxx_keyword.c ctags/parsers/cxx/cxx_keyword.h ctags/parsers/cxx/cxx_parser.c ctags/parsers/cxx/cxx_parser.h ctags/parsers/cxx/cxx_parser_block.c ctags/parsers/cxx/cxx_parser_function.c ctags/parsers/cxx/cxx_parser_internal.h ctags/parsers/cxx/cxx_parser_lambda.c ctags/parsers/cxx/cxx_parser_namespace.c ctags/parsers/cxx/cxx_parser_template.c ctags/parsers/cxx/cxx_parser_tokenizer.c ctags/parsers/cxx/cxx_parser_typedef.c ctags/parsers/cxx/cxx_parser_using.c ctags/parsers/cxx/cxx_parser_variable.c ctags/parsers/cxx/cxx_qtmoc.c ctags/parsers/cxx/cxx_scope.c ctags/parsers/cxx/cxx_scope.h ctags/parsers/cxx/cxx_subparser.c ctags/parsers/cxx/cxx_subparser.h ctags/parsers/cxx/cxx_subparser_internal.h ctags/parsers/cxx/cxx_tag.c ctags/parsers/cxx/cxx_tag.h ctags/parsers/cxx/cxx_token.c ctags/parsers/cxx/cxx_token.h ctags/parsers/cxx/cxx_token_chain.c ctags/parsers/cxx/cxx_token_chain.h ctags/parsers/geany_c.c ctags/parsers/geany_lcpp.c ctags/parsers/geany_lcpp.h ctags/parsers/geany_verilog.c doc/geany.txt scripts/update-ctags.py src/symbols.c src/tagmanager/tm_ctags.c src/tagmanager/tm_ctags.h src/tagmanager/tm_parser.c src/tagmanager/tm_parser.h src/tagmanager/tm_parsers.h src/tagmanager/tm_tag.c tests/ctags/backslashes.c.tags tests/ctags/bit_field.c.tags tests/ctags/bug1201689.c.tags tests/ctags/bug1466117.c.tags tests/ctags/bug1491666.c.tags tests/ctags/bug1563476.cpp.tags tests/ctags/bug1575055.cpp.tags tests/ctags/bug1585745.cpp.tags tests/ctags/bug1764143.h.tags tests/ctags/bug1770479.cpp.tags tests/ctags/bug1773926.cpp.tags tests/ctags/bug1799340.cpp.tags tests/ctags/bug1907083.cpp.tags tests/ctags/bug1924919.cpp.tags tests/ctags/bug507864.c.tags tests/ctags/bug556645.c.tags tests/ctags/bug556646.c.tags tests/ctags/bug639639.h.tags tests/ctags/bug639644.hpp.tags tests/ctags/c-digraphs.c.tags tests/ctags/c-trigraphs.c.tags tests/ctags/cpp_destructor.cpp.tags tests/ctags/cxx11-final.cpp.tags tests/ctags/cxx11-noexcept.cpp.tags tests/ctags/cxx11-override.cpp.tags tests/ctags/cxx11enum.cpp.tags tests/ctags/cxx14-combined.cpp.tags tests/ctags/extern_variable.h.tags tests/ctags/func_typedef.h.tags tests/ctags/local.c.tags tests/ctags/macros.c.tags tests/ctags/namespace.cpp.tags tests/ctags/process_order.c.tags tests/ctags/prototype.h.tags tests/ctags/signature.cpp.tags tests/ctags/static_array.c.tags tests/ctags/var-and-return-type.cpp.tags Modified: ctags/Makefile.am 32 lines changed, 32 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,38 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libctags.la parsers = \ + parsers/cxx/cxx.c \ + parsers/cxx/cxx_debug.c \ + parsers/cxx/cxx_debug.h \ + parsers/cxx/cxx_debug_type.c \ + parsers/cxx/cxx_keyword.c \ + parsers/cxx/cxx_keyword.h \ + parsers/cxx/cxx_parser_block.c \ + parsers/cxx/cxx_parser.c \ + parsers/cxx/cxx_parser_function.c \ + parsers/cxx/cxx_parser.h \ + parsers/cxx/cxx_parser_internal.h \ + parsers/cxx/cxx_parser_lambda.c \ + parsers/cxx/cxx_parser_namespace.c \ + parsers/cxx/cxx_parser_template.c \ + parsers/cxx/cxx_parser_tokenizer.c \ + parsers/cxx/cxx_parser_typedef.c \ + parsers/cxx/cxx_parser_using.c \ + parsers/cxx/cxx_parser_variable.c \ + parsers/cxx/cxx_qtmoc.c \ + parsers/cxx/cxx_scope.c \ + parsers/cxx/cxx_scope.h \ + parsers/cxx/cxx_subparser.c \ + parsers/cxx/cxx_subparser.h \ + parsers/cxx/cxx_subparser_internal.h \ + parsers/cxx/cxx_tag.c \ + parsers/cxx/cxx_tag.h \ + parsers/cxx/cxx_token.c \ + parsers/cxx/cxx_token_chain.c \ + parsers/cxx/cxx_token_chain.h \ + parsers/cxx/cxx_token.h \ + parsers/cpreprocessor.c \ + parsers/cpreprocessor.h \ parsers/abaqus.c \ parsers/abc.c \ parsers/asciidoc.c \ Modified: ctags/parsers/cpreprocessor.c 2297 lines changed, 2297 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2297 @@ +/* +* Copyright (c) 1996-2002, Darren Hiebert +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains the high level input read functions (preprocessor +* directives are handled within this level). +*/ + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ + +#include <string.h> + +#include "debug.h" +#include "entry.h" +#include "htable.h" +#include "cpreprocessor.h" +#include "kind.h" +#include "options.h" +#include "read.h" +#include "vstring.h" +#include "param.h" +#include "parse.h" +#include "xtag.h" + +#include "cxx/cxx_debug.h" + +/* +* MACROS +*/ +#define stringMatch(s1,s2) (strcmp (s1,s2) == 0) +#define isspacetab(c) ((c) == SPACE || (c) == TAB) + +/* +* DATA DECLARATIONS +*/ +typedef enum { COMMENT_NONE, COMMENT_C, COMMENT_CPLUS, COMMENT_D } Comment; + +enum eCppLimits { + MaxCppNestingLevel = 20, + MaxDirectiveName = 10 +}; + +/* Defines the one nesting level of a preprocessor conditional. + */ +typedef struct sConditionalInfo { + bool ignoreAllBranches; /* ignoring parent conditional branch */ + bool singleBranch; /* choose only one branch */ + bool branchChosen; /* branch already selected */ + bool ignoring; /* current ignore state */ + int enterExternalParserBlockNestLevel; /* the parser state when entering this conditional: used only by cxx */ +} conditionalInfo; + +enum eState { + DRCTV_NONE, /* no known directive - ignore to end of line */ + DRCTV_DEFINE, /* "#define" encountered */ + DRCTV_HASH, /* initial '#' read; determine directive */ + DRCTV_IF, /* "#if" or "#ifdef" encountered */ + DRCTV_PRAGMA, /* #pragma encountered */ + DRCTV_UNDEF, /* "#undef" encountered */ + DRCTV_INCLUDE, /* "#include" encountered */ +}; + +/* Defines the current state of the pre-processor. + */ +typedef struct sCppState { + langType lang; + langType clientLang; + + int * ungetBuffer; /* memory buffer for unget characters */ + int ungetBufferSize; /* the current unget buffer size */ + int * ungetPointer; /* the current unget char: points in the middle of the buffer */ + int ungetDataSize; /* the number of valid unget characters in the buffer */ + + /* the contents of the last SYMBOL_CHAR or SYMBOL_STRING */ + vString * charOrStringContents; + + bool resolveRequired; /* must resolve if/else/elif/endif branch */ + bool hasAtLiteralStrings; /* supports @"c:\" strings */ + bool hasCxxRawLiteralStrings; /* supports R"xxx(...)xxx" strings */ + bool hasSingleQuoteLiteralNumbers; /* supports vera number literals: + 'h..., 'o..., 'd..., and 'b... */ + + bool useClientLangDefineMacroKindIndex; + int defineMacroKindIndex; + int macroUndefRoleIndex; + + bool useClientLangMacroParamKindIndex; + int macroParamKindIndex; + + bool useClientLangHeaderKindIndex; + int headerKindIndex; + int headerSystemRoleIndex; + int headerLocalRoleIndex; + + int macrodefFieldIndex; + + struct sDirective { + enum eState state; /* current directive being processed */ + bool accept; /* is a directive syntactically permitted? */ + vString * name; /* macro name */ + unsigned int nestLevel; /* level 0 is not used */ + conditionalInfo ifdef [MaxCppNestingLevel]; + } directive; + + cppMacroInfo * macroInUse; + hashTable * fileMacroTable; + +} cppState; + + +typedef enum { + CPREPRO_MACRO_KIND_UNDEF_ROLE, +} cPreProMacroRole; + +static roleDefinition CPREPROMacroRoles [] = { + RoleTemplateUndef, +}; + + +typedef enum { + CPREPRO_HEADER_KIND_SYSTEM_ROLE, + CPREPRO_HEADER_KIND_LOCAL_ROLE, +} cPreProHeaderRole; + +static roleDefinition CPREPROHeaderRoles [] = { + RoleTemplateSystem, + RoleTemplateLocal, +}; + + +typedef enum { + CPREPRO_MACRO, CPREPRO_HEADER, CPREPRO_PARAM, +} cPreProkind; + +static kindDefinition CPreProKinds [] = { + { true, 'd', "macro", "macro definitions", + .referenceOnly = false, ATTACH_ROLES(CPREPROMacroRoles)}, + { true, 'h', "header", "included header files", + .referenceOnly = true, ATTACH_ROLES(CPREPROHeaderRoles)}, + { false, 'D', "parameter", "macro parameters", }, +}; + +typedef enum { + F_MACRODEF, + COUNT_FIELD +} cPreProField; + +static fieldDefinition CPreProFields[COUNT_FIELD] = { + { .name = "macrodef", + .description = "macro definition", + .enabled = false }, +}; + +/* +* DATA DEFINITIONS +*/ + +static bool doesExaminCodeWithInIf0Branch; +static bool doesExpandMacros; + +/* +* CXX parser state. This is stored at the beginning of a conditional. +* If at the exit of the conditional the state is changed then we assume +* that no further branches should be followed. +*/ +static int externalParserBlockNestLevel; + + +/* Use brace formatting to detect end of block. + */ +static bool BraceFormat = false; + +void cppPushExternalParserBlock(void) +{ + externalParserBlockNestLevel++; +} + +void cppPopExternalParserBlock(void) +{ + externalParserBlockNestLevel--; +} + + +static cppState Cpp = { + .lang = LANG_IGNORE, + .clientLang = LANG_IGNORE, + .ungetBuffer = NULL, + .ungetBufferSize = 0, + .ungetPointer = NULL, + .ungetDataSize = 0, + .charOrStringContents = NULL, + .resolveRequired = false, + .hasAtLiteralStrings = false, + .hasCxxRawLiteralStrings = false, + .hasSingleQuoteLiteralNumbers = false, + .useClientLangDefineMacroKindIndex = false, + .defineMacroKindIndex = CPREPRO_MACRO, + .macroUndefRoleIndex = CPREPRO_MACRO_KIND_UNDEF_ROLE, + .useClientLangMacroParamKindIndex = false, + .macroParamKindIndex = CPREPRO_PARAM, + .useClientLangHeaderKindIndex = false, + .headerKindIndex = CPREPRO_HEADER, + .headerSystemRoleIndex = CPREPRO_HEADER_KIND_SYSTEM_ROLE, + .headerLocalRoleIndex = CPREPRO_HEADER_KIND_LOCAL_ROLE, + .macrodefFieldIndex = FIELD_UNKNOWN, + .directive = { + .state = DRCTV_NONE, + .accept = false, + .name = NULL, + .nestLevel = 0, + .ifdef = { + { + .ignoreAllBranches = false, + .singleBranch = false, + .branchChosen = false, + .ignoring = false, + } + } + } /* directive */ +}; + +/* +* FUNCTION DECLARATIONS +*/ + +static hashTable *makeMacroTable (void); +static cppMacroInfo * saveMacro(hashTable *table, const char * macro); + +/* +* FUNCTION DEFINITIONS +*/ + +extern bool cppIsBraceFormat (void) +{ + return BraceFormat; +} + +extern unsigned int cppGetDirectiveNestLevel (void) +{ + return Cpp.directive.nestLevel; +} + +static void cppInitCommon(langType clientLang, + const bool state, const bool hasAtLiteralStrings, + const bool hasCxxRawLiteralStrings, + const bool hasSingleQuoteLiteralNumbers, + int defineMacroKindIndex, + int macroUndefRoleIndex, + int macroParamKindIndex, + int headerKindIndex, + int headerSystemRoleIndex, int headerLocalRoleIndex, + int macrodefFieldIndex) +{ + BraceFormat = state; + + CXX_DEBUG_PRINT("cppInit: brace format is %d",BraceFormat); + + externalParserBlockNestLevel = 0; + + if (Cpp.lang == LANG_IGNORE) + { + langType t; + + t = getNamedLanguage ("CPreProcessor", 0); + initializeParser (t); + } + + Cpp.clientLang = clientLang; + Cpp.ungetBuffer = NULL; + Cpp.ungetPointer = NULL; + + CXX_DEBUG_ASSERT(!Cpp.charOrStringContents,"This string should be null when CPP is not initialized"); + Cpp.charOrStringContents = vStringNew(); + + Cpp.resolveRequired = false; + Cpp.hasAtLiteralStrings = hasAtLiteralStrings; + Cpp.hasCxxRawLiteralStrings = hasCxxRawLiteralStrings; + Cpp.hasSingleQuoteLiteralNumbers = hasSingleQuoteLiteralNumbers; + + if (defineMacroKindIndex != KIND_GHOST_INDEX) + { + Cpp.defineMacroKindIndex = defineMacroKindIndex; + Cpp.useClientLangDefineMacroKindIndex = true; + + Cpp.macroUndefRoleIndex = macroUndefRoleIndex; + Cpp.macrodefFieldIndex = macrodefFieldIndex; + } + else + { + Cpp.defineMacroKindIndex = CPREPRO_MACRO; + Cpp.useClientLangDefineMacroKindIndex = false; + + Cpp.macroUndefRoleIndex = CPREPRO_MACRO_KIND_UNDEF_ROLE; + Cpp.macrodefFieldIndex = CPreProFields [F_MACRODEF].ftype; + } + + if (macroParamKindIndex != KIND_GHOST_INDEX) + { + Cpp.macroParamKindIndex = macroParamKindIndex; + Cpp.useClientLangMacroParamKindIndex = true; + } + else + { + Cpp.macroParamKindIndex = CPREPRO_PARAM; + Cpp.useClientLangMacroParamKindIndex = false; + } + + if (headerKindIndex != KIND_GHOST_INDEX) + { + Cpp.headerKindIndex = headerKindIndex; + Cpp.useClientLangHeaderKindIndex = true; + + Cpp.headerSystemRoleIndex = headerSystemRoleIndex; + Cpp.headerLocalRoleIndex = headerLocalRoleIndex; + } + else + { + Cpp.headerKindIndex = CPREPRO_HEADER; + Cpp.useClientLangHeaderKindIndex = false; + + Cpp.headerSystemRoleIndex = CPREPRO_HEADER_KIND_SYSTEM_ROLE; + Cpp.headerLocalRoleIndex = CPREPRO_HEADER_KIND_LOCAL_ROLE; + } + + Cpp.directive.state = DRCTV_NONE; + Cpp.directive.accept = true; + Cpp.directive.nestLevel = 0; + + Cpp.directive.ifdef [0].ignoreAllBranches = false; + Cpp.directive.ifdef [0].singleBranch = false; + Cpp.directive.ifdef [0].branchChosen = false; + Cpp.directive.ifdef [0].ignoring = false; + + Cpp.directive.name = vStringNewOrClear (Cpp.directive.name); + + Cpp.macroInUse = NULL; + Cpp.fileMacroTable = + (doesExpandMacros + && isFieldEnabled (FIELD_SIGNATURE) + && isFieldEnabled (Cpp.macrodefFieldIndex) + && (getLanguageCorkUsage ((clientLang == LANG_IGNORE) + ? Cpp.lang + : clientLang) & CORK_SYMTAB)) + ? makeMacroTable () + : NULL; +} + +extern void cppInit (const bool state, const bool hasAtLiteralStrings, + const bool hasCxxRawLiteralStrings, + const bool hasSingleQuoteLiteralNumbers, + int defineMacroKindIndex, + int macroUndefRoleIndex, + int macroParamKindIndex, + int headerKindIndex, + int headerSystemRoleIndex, int headerLocalRoleIndex, + int macrodefFieldIndex) +{ + langType client = getInputLanguage (); + + cppInitCommon (client, state, hasAtLiteralStrings, + hasCxxRawLiteralStrings, hasSingleQuoteLiteralNumbers, + defineMacroKindIndex, macroUndefRoleIndex, macroParamKindIndex, + headerKindIndex, headerSystemRoleIndex, headerLocalRoleIndex, + macrodefFieldIndex); +} + +static void cppClearMacroInUse (cppMacroInfo **pM) +{ + for (cppMacroInfo *p = *pM; p; p = p->next) + { + CXX_DEBUG_PRINT("Macro <%p> clear useCount: %d -> 0", p, p->useCount); + p->useCount = 0; + } + *pM = NULL; +} + +extern void cppTerminate (void) +{ + if (Cpp.directive.name != NULL) + { + vStringDelete (Cpp.directive.name); + Cpp.directive.name = NULL; + } + + if(Cpp.ungetBuffer) + { + eFree(Cpp.ungetBuffer); + Cpp.ungetBuffer = NULL; + } + + if(Cpp.charOrStringContents) + { + vStringDelete(Cpp.charOrStringContents); + Cpp.charOrStringContents = NULL; + } + + Cpp.clientLang = LANG_IGNORE; + + cppClearMacroInUse (&Cpp.macroInUse); + + if (Cpp.fileMacroTable) + { + hashTableDelete (Cpp.fileMacroTable); + Cpp.fileMacroTable = NULL; + } +} + +extern void cppBeginStatement (void) +{ + Cpp.resolveRequired = true; +} + +extern void cppEndStatement (void) +{ + Cpp.resolveRequired = false; +} + +/* +* Scanning functions +* +* This section handles preprocessor directives. It strips out all +* directives and may emit a tag for #define directives. +*/ + +/* This puts a character back into the input queue for the input File. */ +extern void cppUngetc (const int c) +{ + if(!Cpp.ungetPointer) + { + // no unget data + if(!Cpp.ungetBuffer) + { + Cpp.ungetBuffer = (int *)eMalloc(8 * sizeof(int)); + Cpp.ungetBufferSize = 8; + } + Assert(Cpp.ungetBufferSize > 0); + Cpp.ungetPointer = Cpp.ungetBuffer + Cpp.ungetBufferSize - 1; + *(Cpp.ungetPointer) = c; + Cpp.ungetDataSize = 1; + return; + } + + // Already have some unget data in the buffer. Must prepend. + Assert(Cpp.ungetBuffer); + Assert(Cpp.ungetBufferSize > 0); + Assert(Cpp.ungetDataSize > 0); + Assert(Cpp.ungetPointer >= Cpp.ungetBuffer); + + if(Cpp.ungetPointer == Cpp.ungetBuffer) + { + Cpp.ungetBufferSize += 8; + int * tmp = (int *)eMalloc(Cpp.ungetBufferSize * sizeof(int)); + memcpy(tmp+8,Cpp.ungetPointer,Cpp.ungetDataSize * sizeof(int)); + eFree(Cpp.ungetBuffer); + Cpp.ungetBuffer = tmp; + Cpp.ungetPointer = tmp + 7; + } else { + Cpp.ungetPointer--; + } + + *(Cpp.ungetPointer) = c; + Cpp.ungetDataSize++; +} + +int cppUngetBufferSize() +{ + return Cpp.ungetBufferSize; +} + +/* This puts an entire string back into the input queue for the input File. */ +void cppUngetString(const char * string,int len) +{ + if(!string) + return; + if(len < 1) + return; + + if(!Cpp.ungetPointer) + { + // no unget data + if(!Cpp.ungetBuffer) + { + Cpp.ungetBufferSize = 8 + len; + Cpp.ungetBuffer = (int *)eMalloc(Cpp.ungetBufferSize * sizeof(int)); + } else if(Cpp.ungetBufferSize < len) + { + Cpp.ungetBufferSize = 8 + len; + Cpp.ungetBuffer = (int *)eRealloc(Cpp.ungetBuffer,Cpp.ungetBufferSize * sizeof(int)); + } + Cpp.ungetPointer = Cpp.ungetBuffer + Cpp.ungetBufferSize - len; + } else { + // Already have some unget data in the buffer. Must prepend. + Assert(Cpp.ungetBuffer); + Assert(Cpp.ungetBufferSize > 0); + Assert(Cpp.ungetDataSize > 0); + Assert(Cpp.ungetPointer >= Cpp.ungetBuffer); + + if(Cpp.ungetBufferSize < (Cpp.ungetDataSize + len)) + { + Cpp.ungetBufferSize = 8 + len + Cpp.ungetDataSize; + int * tmp = (int *)eMalloc(Cpp.ungetBufferSize * sizeof(int)); + memcpy(tmp + 8 + len,Cpp.ungetPointer,Cpp.ungetDataSize * sizeof(int)); + eFree(Cpp.ungetBuffer); + Cpp.ungetBuffer = tmp; + Cpp.ungetPointer = tmp + 8; + } else { + Cpp.ungetPointer -= len; + Assert(Cpp.ungetPointer >= Cpp.ungetBuffer); + } + } + + int * p = Cpp.ungetPointer; + const char * s = string; + const char * e = string + len; + + while(s < e) + *p++ = *s++; + + Cpp.ungetDataSize += len; +} + +extern void cppUngetStringBuiltByMacro(const char * string,int len, cppMacroInfo *macro) +{ + if (macro->useCount == 0) + { + cppMacroInfo *m = Cpp.macroInUse; + Cpp.macroInUse = macro; + macro->next = m; + } + macro->useCount++; + + CXX_DEBUG_PRINT("Macro <%p> increment useCount: %d->%d", macro, + (macro->useCount - 1), macro->useCount); + + cppUngetString (string, len); +} + +static int cppGetcFromUngetBufferOrFile(void) +{ + if(Cpp.ungetPointer) + { + Assert(Cpp.ungetBuffer); + Assert(Cpp.ungetBufferSize > 0); + Assert(Cpp.ungetDataSize > 0); + + int c = *(Cpp.ungetPointer); + Cpp.ungetDataSize--; + if(Cpp.ungetDataSize > 0) + Cpp.ungetPointer++; + else + Cpp.ungetPointer = NULL; + return c; + } + + if (Cpp.macroInUse) + cppClearMacroInUse (&Cpp.macroInUse); + return getcFromInputFile(); +} + + +/* Reads a directive, whose first character is given by "c", into "name". + */ +static bool readDirective (int c, char *const name, unsigned int maxLength) +{ + unsigned int i; + + for (i = 0 ; i < maxLength - 1 ; ++i) + { + if (i > 0) + { + c = cppGetcFromUngetBufferOrFile (); + if (c == EOF || ! isalpha (c)) + { + cppUngetc (c); + break; + } + } + name [i] = c; + } + name [i] = '\0'; /* null terminate */ + + return (bool) isspacetab (c); +} + +/* Reads an identifier, whose first character is given by "c", into "tag", + * together with the file location and corresponding line number. + */ +static void readIdentifier (int c, vString *const name) +{ + vStringClear (name); + do + { + vStringPut (name, c); + c = cppGetcFromUngetBufferOrFile (); + } while (c != EOF && cppIsident (c)); + cppUngetc (c); +} + +static void readFilename (int c, vString *const name) +{ + int c_end = (c == '<')? '>': '"'; + + vStringClear (name); + + while (c = cppGetcFromUngetBufferOrFile (), (c != EOF && c != c_end && c != '\n')) + vStringPut (name, c); +} + +static conditionalInfo *currentConditional (void) +{ + return &Cpp.directive.ifdef [Cpp.directive.nestLevel]; +} + +static bool isIgnore (void) +{ + return Cpp.directive.ifdef [Cpp.directive.nestLevel].ignoring; +} + +static bool setIgnore (const bool ignore) +{ + return Cpp.directive.ifdef [Cpp.directive.nestLevel].ignoring = ignore; +} + +static bool isIgnoreBranch (void) +{ + conditionalInfo *const ifdef = currentConditional (); + + /* Force a single branch if an incomplete statement is discovered + * en route. This may have allowed earlier branches containing complete + * statements to be followed, but we must follow no further branches. + */ + + /* + * CXX: Force a single branch if the external parser (cxx) block nest level at the beginning + * of this conditional is not equal to the current block nest level (at exit of the first branch). + * + * Follow both branches example: (same state at enter and exit) + * + * #if something + * xxxxx; + * #else + * yyyy; + * #endif + * + * Follow single branch example: (different block level at enter and exit) + * + * if { + * #if something + * } else x; + * #else + * } + * #endif + */ + + if ( + (Cpp.resolveRequired || (ifdef->enterExternalParserBlockNestLevel != externalParserBlockNestLevel)) && + (!BraceFormat) + ) + { + CXX_DEBUG_PRINT("Choosing single branch"); + ifdef->singleBranch = true; + } + + /* We will ignore this branch in the following cases: + * + * 1. We are ignoring all branches (conditional was within an ignored + * branch of the parent conditional) + * 2. A branch has already been chosen and either of: + * a. A statement was incomplete upon entering the conditional + * b. A statement is incomplete upon encountering a branch + */ + return (bool) (ifdef->ignoreAllBranches || + (ifdef->branchChosen && ifdef->singleBranch)); +} + +static void chooseBranch (void) +{ + if (! BraceFormat) + { + conditionalInfo *const ifdef = currentConditional (); + + ifdef->branchChosen = (bool) (ifdef->singleBranch || + Cpp.resolveRequired); + } +} + +/* Pushes one nesting level for an #if directive, indicating whether or not + * the branch should be ignored and whether a branch has already been chosen. + */ +static bool pushConditional (const bool firstBranchChosen) +{ + const bool ignoreAllBranches = isIgnore (); /* current ignore */ + bool ignoreBranch = false; + + if (Cpp.directive.nestLevel < (unsigned int) MaxCppNestingLevel - 1) + { + conditionalInfo *ifdef; + + ++Cpp.directive.nestLevel; + ifdef = currentConditional (); + + /* We take a snapshot of whether there is an incomplete statement in + * progress upon encountering the preprocessor conditional. If so, + * then we will flag that only a single branch of the conditional + * should be followed. + */ + ifdef->ignoreAllBranches = ignoreAllBranches; + ifdef->singleBranch = Cpp.resolveRequired; + ifdef->branchChosen = firstBranchChosen; + ifdef->ignoring = (bool) (ignoreAllBranches || ( + ! firstBranchChosen && ! BraceFormat && + (ifdef->singleBranch || !doesExaminCodeWithInIf0Branch))); + ifdef->enterExternalParserBlockNestLevel = externalParserBlockNestLevel; + ignoreBranch = ifdef->ignoring; + } + return ignoreBranch; +} + +/* Pops one nesting level for an #endif directive. + */ +static bool popConditional (void) +{ + if (Cpp.directive.nestLevel > 0) + --Cpp.directive.nestLevel; + + return isIgnore (); +} + +static bool doesCPreProRunAsStandaloneParser (int kind) +{ + if (kind == CPREPRO_HEADER) + return !Cpp.useClientLangDefineMacroKindIndex; + else if (kind == CPREPRO_MACRO) + return !Cpp.useClientLangHeaderKindIndex; + else if (kind == CPREPRO_PARAM) + return !Cpp.useClientLangMacroParamKindIndex; + else + { + AssertNotReached(); + return true; + } +} + +static int makeDefineTag (const char *const name, const char* const signature, bool undef) +{ + bool standing_alone = doesCPreProRunAsStandaloneParser(CPREPRO_MACRO); + langType lang = standing_alone ? Cpp.lang: Cpp.clientLang; + const bool isFileScope = (bool) (! isInputHeaderFile ()); + + if (!isLanguageEnabled (lang)) + return CORK_NIL; + + Assert (Cpp.defineMacroKindIndex != KIND_GHOST_INDEX); + + if (isFileScope && !isXtagEnabled(XTAG_FILE_SCOPE)) + return CORK_NIL; + + if (undef && (Cpp.macroUndefRoleIndex == ROLE_DEFINITION_INDEX)) + return CORK_NIL; + + if (! isLanguageKindEnabled (lang, + Cpp.defineMacroKindIndex)) + return CORK_NIL; + + if ( + /* condition for definition tag */ + (!undef) + || /* condition for reference tag */ + (undef && isXtagEnabled(XTAG_REFERENCE_TAGS) && + isLanguageRoleEnabled(lang, Cpp.defineMacroKindIndex, + Cpp.macroUndefRoleIndex))) + { + tagEntryInfo e; + int r; + + if (standing_alone) + pushLanguage (Cpp.lang); + + if (undef) + initRefTagEntry (&e, name, Cpp.defineMacroKindIndex, + Cpp.macroUndefRoleIndex); + else + initTagEntry (&e, name, Cpp.defineMacroKindIndex); + e.isFileScope = isFileScope; + if (isFileScope) + markTagExtraBit (&e, XTAG_FILE_SCOPE); + e.truncateLineAfterTag = true; + e.extensionFields.signature = signature; + + r = makeTagEntry (&e); + + if (standing_alone) + popLanguage (); + + return r; + } + return CORK_NIL; +} + +static void makeIncludeTag (const char *const name, bool systemHeader) +{ + bool standing_alone = doesCPreProRunAsStandaloneParser(CPREPRO_HEADER); + langType lang = standing_alone ? Cpp.lang: Cpp.clientLang; + tagEntryInfo e; + int role_index; + + if (!isLanguageEnabled (lang)) + return; + + Assert (Cpp.headerKindIndex != KIND_GHOST_INDEX); + + role_index = systemHeader? Cpp.headerSystemRoleIndex: Cpp.headerLocalRoleIndex; + if (role_index == ROLE_DEFINITION_INDEX) + return; + + if (!isXtagEnabled (XTAG_REFERENCE_TAGS)) + return; + + if (!isLanguageKindEnabled(lang, Cpp.headerKindIndex)) + return; + + if (isLanguageRoleEnabled(lang, Cpp.headerKindIndex, role_index)) + { + if (doesCPreProRunAsStandaloneParser (CPREPRO_HEADER)) + pushLanguage (Cpp.lang); + + initRefTagEntry (&e, name, Cpp.headerKindIndex, role_index); + e.isFileScope = false; + e.truncateLineAfterTag = true; + makeTagEntry (&e); + + if (doesCPreProRunAsStandaloneParser (CPREPRO_HEADER)) + popLanguage (); + } +} + +static void makeParamTag (vString *name, short nth, bool placeholder) +{ + bool standing_alone = doesCPreProRunAsStandaloneParser(CPREPRO_MACRO); + langType lang = standing_alone ? Cpp.lang: Cpp.clientLang; + + Assert (Cpp.macroParamKindIndex != KIND_GHOST_INDEX); + + int r; + pushLanguage (lang); + r = makeSimpleTag (name, Cpp.macroParamKindIndex); + popLanguage (); + + tagEntryInfo *e = getEntryInCorkQueue (r); + if (e) + { + e->extensionFields.nth = nth; + if (placeholder) + e->placeholder = 1; + } +} + +static void regenreateSignatureFromParameters (vString * buffer, int from, int to) +{ + vStringPut(buffer, '('); + for (int pindex = from; pindex < to; pindex++) + { + tagEntryInfo *e = getEntryInCorkQueue (pindex); + if (e && !isTagExtra (e)) + { + vStringCatS (buffer, e->name); + vStringPut (buffer, ','); + } + } + if (vStringLast (buffer) == ',') + vStringChop (buffer); + vStringPut (buffer, ')'); +} + +static void patchScopeFieldOfParameters(int from, int to, int parentIndex) +{ + for (int pindex = from; pindex < to; pindex++) + { + tagEntryInfo *e = getEntryInCorkQueue (pindex); + if (e) + e->extensionFields.scopeIndex = parentIndex; + } +} + +static int directiveDefine (const int c, bool undef) +{ + // FIXME: We could possibly handle the macros here! + // However we'd need a separate hash table for macros of the current file + // to avoid breaking the "global" ones. + + int r = CORK_NIL; + + if (cppIsident1 (c)) + { + readIdentifier (c, Cpp.directive.name); + if (! isIgnore ()) + { + unsigned long lineNumber = getInputLineNumber (); + MIOPos filePosition = getInputFilePosition (); + int p = cppGetcFromUngetBufferOrFile (); + short nth = 0; + + if (p == '(') + { + vString *param = vStringNew (); + int param_start = (int)countEntryInCorkQueue(); + do { + p = cppGetcFromUngetBufferOrFile (); + if (isalnum(p) || p == '_' || p == '$' + /* Handle variadic macros like (a,...) */ + || p == '.') + { + vStringPut (param, p); + continue; + } + + if (vStringLength (param) > 0) + { + makeParamTag (param, nth++, vStringChar(param, 0) == '.'); + vStringClear (param); + } + if (p == '\\') + cppGetcFromUngetBufferOrFile (); /* Throw away the next char */ + } while (p != ')' && p != EOF); + vStringDelete (param); + + int param_end = (int)countEntryInCorkQueue(); + if (p == ')') + { + vString *signature = vStringNew (); + regenreateSignatureFromParameters (signature, param_start, param_end); + r = makeDefineTag (vStringValue (Cpp.directive.name), vStringValue (signature), undef); + vStringDelete (signature); + } + else + r = makeDefineTag (vStringValue (Cpp.directive.name), NULL, undef); + + tagEntryInfo *e = getEntryInCorkQueue (r); + if (e) + { + e->lineNumber = lineNumber; + e->filePosition = filePosition; + patchScopeFieldOfParameters (param_start, param_end, r); + } + } + else + { + cppUngetc (p); + r = makeDefineTag (vStringValue (Cpp.directive.name), NULL, undef); + } + } + } + Cpp.directive.state = DRCTV_NONE; + + if (r != CORK_NIL && Cpp.fileMacroTable) + registerEntry (r); + return r; +} + +static void directiveUndef (const int c) +{ + if (isXtagEnabled (XTAG_REFERENCE_TAGS)) + { + directiveDefine (c, true); + } + else + { + Cpp.directive.state = DRCTV_NONE; + } +} + +static void directivePragma (int c) +{ + if (cppIsident1 (c)) + { + readIdentifier (c, Cpp.directive.name); + if (stringMatch (vStringValue (Cpp.directive.name), "weak")) + { + /* generate macro tag for weak name */ + do + { + c = cppGetcFromUngetBufferOrFile (); + } while (c == SPACE); + if (cppIsident1 (c)) + { + readIdentifier (c, Cpp.directive.name); + makeDefineTag (vStringValue (Cpp.directive.name), NULL, false); + } + } + } + Cpp.directive.state = DRCTV_NONE; +} + +static bool directiveIf (const int c) +{ + DebugStatement ( const bool ignore0 = isIgnore (); ) + const bool ignore = pushConditional ((bool) (c != '0')); + + Cpp.directive.state = DRCTV_NONE; + DebugStatement ( debugCppNest (true, Cpp.directive.nestLevel); + if (ignore != ignore0) debugCppIgnore (ignore); ) + + return ignore; +} + + +static void directiveInclude (const int c) +{ + if (c == '<' || c == '"') + { + readFilename (c, Cpp.directive.name); + if ((! isIgnore ()) && vStringLength (Cpp.directive.name)) + makeIncludeTag (vStringValue (Cpp.directive.name), + c == '<'); + } + Cpp.directive.state = DRCTV_NONE; +} + +static bool directiveHash (const int c) +{ + bool ignore = false; + char directive [MaxDirectiveName]; + DebugStatement ( const bool ignore0 = isIgnore (); ) + + readDirective (c, directive, MaxDirectiveName); + if (stringMatch (directive, "define")) + Cpp.directive.state = DRCTV_DEFINE; + else if (stringMatch (directive, "include")) + Cpp.directive.state = DRCTV_INCLUDE; + else if (stringMatch (directive, "undef")) + Cpp.directive.state = DRCTV_UNDEF; + else if (strncmp (directive, "if", (size_t) 2) == 0) + Cpp.directive.state = DRCTV_IF; + else if (stringMatch (directive, "elif") || + stringMatch (directive, "else")) + { + ignore = setIgnore (isIgnoreBranch ()); + CXX_DEBUG_PRINT("Found #elif or #else: ignore is %d",ignore); + if (! ignore && stringMatch (directive, "else")) + chooseBranch (); + Cpp.directive.state = DRCTV_NONE; + DebugStatement ( if (ignore != ignore0) debugCppIgnore (ignore); ) + } + else if (stringMatch (directive, "endif")) + { + DebugStatement ( debugCppNest (false, Cpp.directive.nestLevel); ) + ignore = popConditional (); + Cpp.directive.state = DRCTV_NONE; + DebugStatement ( if (ignore != ignore0) debugCppIgnore (ignore); ) + } + else if (stringMatch (directive, "pragma")) + Cpp.directive.state = DRCTV_PRAGMA; + else + Cpp.directive.state = DRCTV_NONE; + + return ignore; +} + +/* Handles a pre-processor directive whose first character is given by "c". + */ +static bool handleDirective (const int c, int *macroCorkIndex) +{ + bool ignore = isIgnore (); + + switch (Cpp.directive.state) + { + case DRCTV_NONE: ignore = isIgnore (); break; + case DRCTV_DEFINE: + *macroCorkIndex = directiveDefine (c, false); + break; + case DRCTV_HASH: ignore = directiveHash (c); break; + case DRCTV_IF: ignore = directiveIf (c); break; + case DRCTV_PRAGMA: directivePragma (c); break; + case DRCTV_UNDEF: directiveUndef (c); break; + case DRCTV_INCLUDE: directiveInclude (c); break; + } + return ignore; +} + +/* Called upon reading of a slash ('/') characters, determines whether a + * comment is encountered, and its type. + */ +static Comment isComment (void) +{ + Comment comment; + const int next = cppGetcFromUngetBufferOrFile (); + + if (next == '*') + comment = COMMENT_C; + else if (next == '/') + comment = COMMENT_CPLUS; + else if (next == '+') + comment = COMMENT_D; + else + { + cppUngetc (next); + comment = COMMENT_NONE; + } + return comment; +} + +/* Skips over a C style comment. According to ANSI specification a comment + * is treated as white space, so we perform this substitution. + */ +static int cppSkipOverCComment (void) +{ + int c = cppGetcFromUngetBufferOrFile (); + + while (c != EOF) + { + if (c != '*') + c = cppGetcFromUngetBufferOrFile (); + else + { + const int next = cppGetcFromUngetBufferOrFile (); + + if (next != '/') + c = next; + else + { + c = SPACE; /* replace comment with space */ + break; + } + } + } + return c; +} + +/* Skips over a C++ style comment. + */ +static int skipOverCplusComment (void) +{ + int c; + + while ((c = cppGetcFromUngetBufferOrFile ()) != EOF) + { + if (c == BACKSLASH) + cppGetcFromUngetBufferOrFile (); /* throw away next character, too */ + else if (c == NEWLINE) + break; + } + return c; +} + +/* Skips over a D style comment. + * Really we should match nested /+ comments. At least they're less common. + */ +static int skipOverDComment (void) +{ + int c = cppGetcFromUngetBufferOrFile (); + + while (c != EOF) + { + if (c != '+') + c = cppGetcFromUngetBufferOrFile (); + else + { + const int next = cppGetcFromUngetBufferOrFile (); + + if (next != '/') + c = next; + else + { + c = SPACE; /* replace comment with space */ + break; + } + } + } + return c; +} + +const vString * cppGetLastCharOrStringContents (void) +{ + CXX_DEBUG_ASSERT(Cpp.charOrStringContents,"Shouldn't be called when CPP is not initialized"); + return Cpp.charOrStringContents; +} + +/* Skips to the end of a string, returning a special character to + * symbolically represent a generic string. + */ +static int skipToEndOfString (bool ignoreBackslash) +{ + int c; + + vStringClear(Cpp.charOrStringContents); + + while ((c = cppGetcFromUngetBufferOrFile ()) != EOF) + { + if (c == BACKSLASH && ! ignoreBackslash) + { + vStringPutWithLimit (Cpp.charOrStringContents, c, 1024); + c = cppGetcFromUngetBufferOrFile (); /* throw away next character, too */ + if (c != EOF) + vStringPutWithLimit (Cpp.charOrStringContents, c, 1024); + } + else if (c == DOUBLE_QUOTE) + break; + else + vStringPutWithLimit (Cpp.charOrStringContents, c, 1024); + } + return STRING_SYMBOL; /* symbolic representation of string */ +} + +static int isCxxRawLiteralDelimiterChar (int c) +{ + return (c != ' ' && c != '\f' && c != '\n' && c != '\r' && c != '\t' && c != '\v' && + c != '(' && c != ')' && c != '\\'); +} + +static int skipToEndOfCxxRawLiteralString (void) +{ + int c = cppGetcFromUngetBufferOrFile (); + + if (c != '(' && ! isCxxRawLiteralDelimiterChar (c)) + { + cppUngetc (c); + c = skipToEndOfString (false); + } + else + { + char delim[16]; + unsigned int delimLen = 0; + bool collectDelim = true; + + do + { + if (collectDelim) + { + if (isCxxRawLiteralDelimiterChar (c) && + delimLen < (sizeof delim / sizeof *delim)) + delim[delimLen++] = c; + else + collectDelim = false; + } + else if (c == ')') + { + unsigned int i = 0; + + while ((c = cppGetcFromUngetBufferOrFile ()) != EOF && i < delimLen && delim[i] == c) + i++; + if (i == delimLen && c == DOUBLE_QUOTE) + break; + else + cppUngetc (c); + } + } + while ((c = cppGetcFromUngetBufferOrFile ()) != EOF); + c = STRING_SYMBOL; + } + return c; +} + +/* Skips to the end of the three (possibly four) 'c' sequence, returning a + * special character to symbolically represent a generic character. + * Also detects Vera numbers that include a base specifier (ie. 'b1010). + */ +static int skipToEndOfChar () +{ + int c; + int count = 0, veraBase = '\0'; + + vStringClear(Cpp.charOrStringContents); + + while ((c = cppGetcFromUngetBufferOrFile ()) != EOF) + { + ++count; + if (c == BACKSLASH) + { + vStringPutWithLimit (Cpp.charOrStringContents, c, 10); + c = cppGetcFromUngetBufferOrFile (); /* throw away next character, too */ + if (c != EOF) + vStringPutWithLimit (Cpp.charOrStringContents, c, 10); + } + else if (c == SINGLE_QUOTE) + break; + else if (c == NEWLINE) + { + cppUngetc (c); + break; + } + else if (Cpp.hasSingleQuoteLiteralNumbers) + { + if (count == 1 && strchr ("DHOB", toupper (c)) != NULL) + { + veraBase = c; + vStringPutWithLimit (Cpp.charOrStringContents, c, 10); + } + else if (veraBase != '\0' && ! isalnum (c)) + { + cppUngetc (c); + break; + } + else + vStringPutWithLimit (Cpp.charOrStringContents, c, 10); + } + else + vStringPutWithLimit (Cpp.charOrStringContents, c, 10); + } + return CHAR_SYMBOL; /* symbolic representation of character */ +} + +static void attachFields (int macroCorkIndex, unsigned long endLine, const char *macrodef) +{ + tagEntryInfo *tag = getEntryInCorkQueue (macroCorkIndex); + if (!tag) + return; + + tag->extensionFields.endLine = endLine; + if (macrodef) + attachParserFieldToCorkEntry (macroCorkIndex, Cpp.macrodefFieldIndex, macrodef); +} + + +/* This function returns the next character, stripping out comments, + * C pre-processor directives, and the contents of single and double + * quoted strings. In short, strip anything which places a burden upon + * the tokenizer. + */ +extern int cppGetc (void) +{ + bool directive = false; + bool ignore = false; + int c; + int macroCorkIndex = CORK_NIL; + vString *macrodef = NULL; + + + do { +start_loop: + c = cppGetcFromUngetBufferOrFile (); +process: + switch (c) + { + case EOF: + ignore = false; + directive = false; + if (macroCorkIndex != CORK_NIL) + { + attachFields (macroCorkIndex, + getInputLineNumber(), + macrodef? vStringValue (macrodef): NULL); + macroCorkIndex = CORK_NIL; + } + break; + + case TAB: + case SPACE: + if (macrodef && vStringLength (macrodef) > 0 + && vStringLast (macrodef) != ' ') + vStringPut (macrodef, ' '); + break; /* ignore most white space */ + + case NEWLINE: + if (directive && ! ignore) + { + directive = false; + if (macroCorkIndex != CORK_NIL) + { + attachFields (macroCorkIndex, + getInputLineNumber(), + macrodef? vStringValue (macrodef): NULL); + macroCorkIndex = CORK_NIL; + } + } + Cpp.directive.accept = true; + break; + + case DOUBLE_QUOTE: + if (Cpp.directive.state == DRCTV_INCLUDE) + goto enter; + else + { + Cpp.directive.accept = false; + c = skipToEndOfString (false); + } + + if (macrodef) + { + /* We record the contents of string literal. + * + */ + vStringPut (macrodef, '"'); + vStringCat (macrodef, Cpp.charOrStringContents); + vStringPut (macrodef, '"'); + } + + break; + + case '#': + if (Cpp.directive.accept) + { + directive = true; + Cpp.directive.state = DRCTV_HASH; + Cpp.directive.accept = false; + } + if (macrodef) + vStringPut (macrodef, '#'); + break; + + case SINGLE_QUOTE: + Cpp.directive.accept = false; + c = skipToEndOfChar (); + + /* We assume none may want to know the content of the + * literal; just put ''. */ + if (macrodef) + vStringCatS (macrodef, "''"); + + break; + + case '/': + { + const Comment comment = isComment (); + + if (comment == COMMENT_C) + c = cppSkipOverCComment (); + else if (comment == COMMENT_CPLUS) + { + c = skipOverCplusComment (); + if (c == NEWLINE) + cppUngetc (c); + } + else if (comment == COMMENT_D) + c = skipOverDComment (); + else + { + Cpp.directive.accept = false; + if (macrodef) + vStringPut (macrodef, '/'); + } + break; + } + + case BACKSLASH: + { + int next = cppGetcFromUngetBufferOrFile (); + + if (next == NEWLINE) + goto start_loop; + else + { + cppUngetc (next); + if (macrodef) + vStringPut (macrodef, '\\'); + } + break; + } + + case '?': + { + int next = cppGetcFromUngetBufferOrFile (); + if (next != '?') + { + cppUngetc (next); + if (macrodef) + vStringPut (macrodef, '?'); + } + else + { + next = cppGetcFromUngetBufferOrFile (); + switch (next) + { + case '(': c = '['; break; + case ')': c = ']'; break; + case '<': c = '{'; break; + case '>': c = '}'; break; + case '/': c = BACKSLASH; goto process; + case '!': c = '|'; break; + case SINGLE_QUOTE: c = '^'; break; + case '-': c = '~'; break; + case '=': c = '#'; goto process; + default: + cppUngetc ('?'); + cppUngetc (next); + break; + } + if (macrodef) + vStringPut (macrodef, c); + } + } break; + + /* digraphs: + * input: <: :> <% %> %: %:%: + * output: [ ] { } # ## + */ + case '<': + { + /* + Quoted from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3237.html: + ------ + if the next three characters are <:: and the + subsequent character is neither : nor >, the < is + treated as a preprocessor token by itself (and not as + the first character of the alternative token */ + int next[3]; + next[0] = cppGetcFromUngetBufferOrFile (); + switch (next[0]) + { + case ':': + next[1] = cppGetcFromUngetBufferOrFile (); + if (next[1] == ':') + { + next[2] = cppGetcFromUngetBufferOrFile (); + if (! (next[2] == ':' || next[2] == '>')) + { + cppUngetc (next[2]); + cppUngetc (next[1]); + cppUngetc (next[0]); + c = '<'; + } + else + { + cppUngetc (next[2]); + cppUngetc (next[1]); + c = '['; + } + } + else + { + cppUngetc (next[1]); + c = '['; + } + break; + case '%': c = '{'; break; + default: cppUngetc (next[0]); + } + + if (macrodef) + vStringPut (macrodef, c); + + goto enter; + } + case ':': + { + int next = cppGetcFromUngetBufferOrFile (); + if (next == '>') + c = ']'; + else + cppUngetc (next); + + if (macrodef) + vStringPut (macrodef, c); + + goto enter; + } + case '%': + { + int next = cppGetcFromUngetBufferOrFile (); + switch (next) + { + case '>': c = '}'; break; + case ':': c = '#'; goto process; + default: cppUngetc (next); + } + + if (macrodef) + vStringPut (macrodef, c); + + goto enter; + } + + default: + if (c == '@' && Cpp.hasAtLiteralStrings) + { + int next = cppGetcFromUngetBufferOrFile (); + if (next == DOUBLE_QUOTE) + { + Cpp.directive.accept = false; + c = skipToEndOfString (true); + if (macrodef) + vStringCatS (macrodef, "@\"\""); + break; + } + else + { + cppUngetc (next); + if (macrodef) + vStringPut (macrodef, '@'); + } + } + else if (c == 'R' && Cpp.hasCxxRawLiteralStrings) + { + /* OMG!11 HACK!!11 Get the previous character. + * + * We need to know whether the previous character was an identifier or not, + * because "R" has to be on its own, not part of an identifier. This allows + * for constructs like: + * + * #define FOUR "4" + * const char *p = FOUR"5"; + * + * which is not a raw literal, but a preprocessor concatenation. + * + * FIXME: handle + * + * const char *p = R\ + * "xxx(raw)xxx"; + * + * which is perfectly valid (yet probably very unlikely). */ + int prev = getNthPrevCFromInputFile (1, '\0'); + int prev2 = getNthPrevCFromInputFile (2, '\0'); + int prev3 = getNthPrevCFromInputFile (3, '\0'); + + if (! cppIsident (prev) || + (! cppIsident (prev2) && (prev == 'L' || prev == 'u' || prev == 'U')) || + (! cppIsident (prev3) && (prev2 == 'u' && prev == '8'))) + { + int next = cppGetcFromUngetBufferOrFile (); + if (next != DOUBLE_QUOTE) + { + cppUngetc (next); + if (macrodef) + vStringPut (macrodef, 'R'); + } + else + { + Cpp.directive.accept = false; + c = skipToEndOfCxxRawLiteralString (); + + /* We assume none may want to know the content of the + * literal; just put "". */ + if (macrodef) + vStringCatS (macrodef, "\"\""); + + break; + } + } + else + { + if (macrodef) + vStringPut (macrodef, 'R'); + } + } + else if(isxdigit(c)) + { + /* Check for digit separator. If we find it we just skip it */ + int next = cppGetcFromUngetBufferOrFile(); + if(next != SINGLE_QUOTE) + cppUngetc(next); + if (macrodef) + vStringPut (macrodef, c); + + } + else + { + if (macrodef) + vStringPut (macrodef, c); + } + enter: + Cpp.directive.accept = false; + if (directive) + { + ignore = handleDirective (c, &macroCorkIndex); + if (Cpp.macrodefFieldIndex != FIELD_UNKNOWN + && macroCorkIndex != CORK_NIL + && macrodef == NULL) + macrodef = vStringNew (); + } + break; + } + } while (directive || ignore); + + if (macrodef) + vStringDelete (macrodef); + + DebugStatement ( debugPutc (DEBUG_CPP, c); ) + DebugStatement ( if (c == NEWLINE) + debugPrintf (DEBUG_CPP, "%6ld: ", getInputLineNumber () + 1); ) + + return c; +} + +static void findCppTags (void) +{ + cppInitCommon (Cpp.lang, 0, false, false, false, + KIND_GHOST_INDEX, 0, KIND_GHOST_INDEX, + KIND_GHOST_INDEX, 0, 0, + FIELD_UNKNOWN); + + findRegexTagsMainloop (cppGetc); + + cppTerminate (); +} + + +/* + * Token ignore processing + */ + +static hashTable * cmdlineMacroTable; + + +static bool buildMacroInfoFromTagEntry (int corkIndex, + tagEntryInfo * entry, + void * data) +{ + cppMacroInfo **info = data; + + if (entry->langType == Cpp.clientLang + && entry->kindIndex == Cpp.defineMacroKindIndex + && isRoleAssigned (entry, ROLE_DEFINITION_INDEX)) + { + vString *macrodef = vStringNewInit (entry->name); + if (entry->extensionFields.signature) + vStringCatS (macrodef, entry->extensionFields.signature); + vStringPut (macrodef, '='); + + const char *val = getParserFieldValueForType (entry, Cpp.macrodefFieldIndex); + if (val) + vStringCatS (macrodef, val); + + *info = saveMacro (Cpp.fileMacroTable, vStringValue (macrodef)); + vStringDelete (macrodef); + + return false; + } + return true; +} + +extern cppMacroInfo * cppFindMacroFromSymtab (const char *const name) +{ + cppMacroInfo *info = NULL; + foreachEntriesInScope (CORK_NIL, name, buildMacroInfoFromTagEntry, &info); + + return info; +} + +/* Determines whether or not "name" should be ignored, per the ignore list. + */ +extern cppMacroInfo * cppFindMacro (const char *const name) +{ + cppMacroInfo *info; + + if (cmdlineMacroTable) + { + info = (cppMacroInfo *)hashTableGetItem (cmdlineMacroTable,(char *)name); + if (info) + return info; + } + + if (Cpp.fileMacroTable) + { + info = (cppMacroInfo *)hashTableGetItem (Cpp.fileMacroTable,(char *)name); + if (info) + return info; + + info = cppFindMacroFromSymtab(name); + if (info) + return info; + } + return NULL; +} + +extern vString * cppBuildMacroReplacement( + const cppMacroInfo * macro, + const char ** parameters, /* may be NULL */ + int parameterCount + ) +{ + if(!macro) + return NULL; + + if(!macro->replacements) + return NULL; + + vString * ret = vStringNew(); + + cppMacroReplacementPartInfo * r = macro->replacements; + + while(r) + { + if(r->parameterIndex < 0) + { + if(r->constant) + vStringCat(ret,r->constant); + } else { + if(parameters && (r->parameterIndex < parameterCount)) + { + if(r->flags & CPP_MACRO_REPLACEMENT_FLAG_STRINGIFY) + vStringPut(ret,'"'); + + vStringCatS(ret,parameters[r->parameterIndex]); + if(r->flags & CPP_MACRO_REPLACEMENT_FLAG_VARARGS) + { + int idx = r->parameterIndex + 1; + while(idx < parameterCount) + { + vStringPut(ret,','); + vStringCatS(ret,parameters[idx]); + idx++; + } + } + + if(r->flags & CPP_MACRO_REPLACEMENT_FLAG_STRINGIFY) + vStringPut(ret,'"'); + } + } + + r = r->next; + } + + return ret; +} + + +static void saveIgnoreToken(const char * ignoreToken) +{ + if(!ignoreToken) + return; + + Assert (cmdlineMacroTable); + + const char * c = ignoreToken; + char cc = *c; + + const char * tokenBegin = c; + const char * tokenEnd = NULL; + const char * replacement = NULL; + bool ignoreFollowingParenthesis = false; + + while(cc) + { + if(cc == '=') + { + if(!tokenEnd) + tokenEnd = c; + c++; + if(*c) + replacement = c; + break; + } + + if(cc == '+') + { + if(!tokenEnd) + tokenEnd = c; + ignoreFollowingParenthesis = true; + } + + c++; + cc = *c; + } + + if(!tokenEnd) + tokenEnd = c; + + if(tokenEnd <= tokenBegin) + return; + + cppMacroInfo * info = (cppMacroInfo *)eMalloc(sizeof(cppMacroInfo)); + + info->hasParameterList = ignoreFollowingParenthesis; + if(replacement) + { + cppMacroReplacementPartInfo * rep = \ + (cppMacroReplacementPartInfo *)eMalloc(sizeof(cppMacroReplacementPartInfo)); + rep->parameterIndex = -1; + rep->flags = 0; + rep->constant = vStringNewInit(replacement); + rep->next = NULL; + info->replacements = rep; + } else { + info->replacements = NULL; + } + info->useCount = 0; + info->next = NULL; + + hashTablePutItem(cmdlineMacroTable,eStrndup(tokenBegin,tokenEnd - tokenBegin),info); + + verbose (" ignore token: %s\n", ignoreToken); +} + +static cppMacroInfo * saveMacro(hashTable *table, const char * macro) +{ + CXX_DEBUG_ENTER_TEXT("Save macro %s",macro); + + if(!macro) + return NULL; + + Assert (table); + + const char * c = macro; + + // skip initial spaces + while(*c && isspacetab(*c)) + c++; + + if(!*c) + { + CXX_DEBUG_LEAVE_TEXT("Bad empty macro definition"); + return NULL; + } + + if(!(isalpha(*c) || (*c == '_' || (*c == '$') ))) + { + CXX_DEBUG_LEAVE_TEXT("Macro does not start with an alphanumeric character"); + return NULL; // must be a sequence of letters and digits + } + + const char * identifierBegin = c; + + while(*c && (isalnum(*c) || (*c == '_') || (*c == '$') )) + c++; + + const char * identifierEnd = c; + + CXX_DEBUG_PRINT("Macro identifier '%.*s'",identifierEnd - identifierBegin,identifierBegin); + +#define MAX_PARAMS 16 + + const char * paramBegin[MAX_PARAMS]; + const char * paramEnd[MAX_PARAMS]; + + int iParamCount = 0; + + while(*c && isspacetab(*c)) + c++; + + cppMacroInfo * info = (cppMacroInfo *)eMalloc(sizeof(cppMacroInfo)); + info->useCount = 0; + info->next = NULL; + + if(*c == '(') + { + // parameter list + CXX_DEBUG_PRINT("Macro has a parameter list"); + + info->hasParameterList = true; + + c++; + while(*c) + { + while(*c && isspacetab(*c)) + c++; + + if(*c && (*c != ',') && (*c != ')')) + { + paramBegin[iParamCount] = c; + c++; + while(*c && (*c != ',') && (*c != ')') && (!isspacetab(*c))) + c++; + paramEnd[iParamCount] = c; + + CXX_DEBUG_PRINT( + "Macro parameter %d '%.*s'", + iParamCount, + paramEnd[iParamCount] - paramBegin[iParamCount], + paramBegin[iParamCount] + ); + + iParamCount++; + if(iParamCount >= MAX_PARAMS) + break; + } + + while(*c && isspacetab(*c)) + c++; + + if(*c == ')') + break; + + if(*c == ',') + c++; + } + + while(*c && (*c != ')')) + c++; + + if(*c == ')') + c++; + + CXX_DEBUG_PRINT("Got %d parameters",iParamCount); + + } else { + info->hasParameterList = false; + } + + while(*c && isspacetab(*c)) + c++; + + info->replacements = NULL; + + + if(*c == '=') + { + CXX_DEBUG_PRINT("Macro has a replacement part"); + + // have replacement part + c++; + + cppMacroReplacementPartInfo * lastReplacement = NULL; + int nextParameterReplacementFlags = 0; + +#define ADD_REPLACEMENT_NEW_PART(part) \ + do { \ + if(lastReplacement) \ + lastReplacement->next = part; \ + else \ + info->replacements = part; \ + lastReplacement = part; \ + } while(0) + +#define ADD_CONSTANT_REPLACEMENT_NEW_PART(start,len) \ + do { \ + cppMacroReplacementPartInfo * rep = \ + (cppMacroReplacementPartInfo *)eMalloc(sizeof(cppMacroReplacementPartInfo)); \ + rep->parameterIndex = -1; \ + rep->flags = 0; \ + rep->constant = vStringNew(); \ + vStringNCatS(rep->constant,start,len); \ + rep->next = NULL; \ + CXX_DEBUG_PRINT("Constant replacement part: '%s'",vStringValue(rep->constant)); \ + ADD_REPLACEMENT_NEW_PART(rep); \ + } while(0) + +#define ADD_CONSTANT_REPLACEMENT(start,len) \ + do { \ + if(lastReplacement && (lastReplacement->parameterIndex == -1)) \ + { \ + vStringNCatS(lastReplacement->constant,start,len); \ + CXX_DEBUG_PRINT( \ + "Constant replacement part changed: '%s'", \ + vStringValue(lastReplacement->constant) \ + ); \ + } else { \ + ADD_CONSTANT_REPLACEMENT_NEW_PART(start,len); \ + } \ + } while(0) + + // parse replacements + const char * begin = c; + + while(*c) + { + if(isalpha(*c) || (*c == '_')) + { + if(c > begin) + ADD_CONSTANT_REPLACEMENT(begin,c - begin); + + const char * tokenBegin = c; + + while(*c && (isalnum(*c) || (*c == '_'))) + c++; + + // check if it is a parameter + int tokenLen = c - tokenBegin; + + CXX_DEBUG_PRINT("Check token '%.*s'",tokenLen,tokenBegin); + + bool bIsVarArg = (tokenLen == 11) && (strncmp(tokenBegin,"__VA_ARGS__",11) == 0); + + int i = 0; + for(;i<iParamCount;i++) + { + int paramLen = paramEnd[i] - paramBegin[i]; + + if( + ( + bIsVarArg && + (paramLen == 3) && + (strncmp(paramBegin[i],"...",3) == 0) + ) || ( + (!bIsVarArg) && + (paramLen == tokenLen) && + (strncmp(paramBegin[i],tokenBegin,paramLen) == 0) + ) + ) + { + // parameter! + cppMacroReplacementPartInfo * rep = \ + (cppMacroReplacementPartInfo *)eMalloc(sizeof(cppMacroReplacementPartInfo)); + rep->parameterIndex = i; + rep->flags = nextParameterReplacementFlags | + (bIsVarArg ? CPP_MACRO_REPLACEMENT_FLAG_VARARGS : 0); + rep->constant = NULL; + rep->next = NULL; + + nextParameterReplacementFlags = 0; + + CXX_DEBUG_PRINT("Parameter replacement part: %d (vararg %d)",i,bIsVarArg); + + ADD_REPLACEMENT_NEW_PART(rep); + break; + } + } + + if(i >= iParamCount) + { + // no parameter found + ADD_CONSTANT_REPLACEMENT(tokenBegin,tokenLen); + } + + begin = c; + continue; + } + + if((*c == '"') || (*c == '\'')) + { + // skip string/char constant + char term = *c; + c++; + while(*c) + { + if(*c == '\\') + { + c++; + if(*c) + c++; + } else if(*c == term) + { + c++; + break; + } + c++; + } + continue; + } + + if(*c == '#') + { + // check for token paste/stringification + if(c > begin) + ADD_CONSTANT_REPLACEMENT(begin,c - begin); + + c++; + if(*c == '#') + { + // token paste + CXX_DEBUG_PRINT("Found token paste operator"); + while(*c == '#') + c++; + + // we just skip this part and the following spaces + while(*c && isspacetab(*c)) + c++; + + if(lastReplacement && (lastReplacement->parameterIndex == -1)) + { + // trim spaces from the last replacement constant! + vStringStripTrailing(lastReplacement->constant); + CXX_DEBUG_PRINT( + "Last replacement truncated to '%s'", + vStringValue(lastReplacement->constant) + ); + } + } else { + // stringification + CXX_DEBUG_PRINT("Found stringification operator"); + nextParameterReplacementFlags |= CPP_MACRO_REPLACEMENT_FLAG_STRINGIFY; + } + + begin = c; + continue; + } + + c++; + } + + if(c > begin) + ADD_CONSTANT_REPLACEMENT(begin,c - begin); + } + + hashTablePutItem(table,eStrndup(identifierBegin,identifierEnd - identifierBegin),info); + CXX_DEBUG_LEAVE(); + + return info; +} + +static void freeMacroInfo(cppMacroInfo * info) +{ + if(!info) + return; + cppMacroReplacementPartInfo * pPart = info->replacements; + while(pPart) + { + if(pPart->constant) + vStringDelete(pPart->constant); + cppMacroReplacementPartInfo * pPartToDelete = pPart; + pPart = pPart->next; + eFree(pPartToDelete); + } + eFree(info); +} + +static hashTable *makeMacroTable (void) +{ + return hashTableNew( + 1024, + hashCstrhash, + hashCstreq, + eFree, + (void (*)(void *))freeMacroInfo + ); +} + +static void initializeCpp (const langType language) +{ + Cpp.lang = language; +} + +static void finalizeCpp (const langType language, bool initialized) +{ + if (cmdlineMacroTable) + { + hashTableDelete (cmdlineMacroTable); + cmdlineMacroTable = NULL; + } +} + +static void CpreProExpandMacrosInInput (const langType language CTAGS_ATTR_UNUSED, const char *name, const char *arg) +{ + doesExpandMacros = paramParserBool (arg, doesExpandMacros, + name, "parameter"); +} + +static void CpreProInstallIgnoreToken (const langType language CTAGS_ATTR_UNUSED, const char *optname CTAGS_ATTR_UNUSED, const char *arg) +{ + if (arg == NULL || arg[0] == '\0') + { + if (cmdlineMacroTable) + { + hashTableDelete(cmdlineMacroTable); + cmdlineMacroTable = NULL; + } + verbose (" clearing list\n"); + } else { + if (!cmdlineMacroTable) + cmdlineMacroTable = makeMacroTable (); + saveIgnoreToken(arg); + } +} + +static void CpreProInstallMacroToken (const langType language CTAGS_ATTR_UNUSED, const char *optname CTAGS_ATTR_UNUSED, const char *arg) +{ + if (arg == NULL || arg[0] == '\0') + { + if (cmdlineMacroTable) + { + hashTableDelete(cmdlineMacroTable); + cmdlineMacroTable = NULL; + } + verbose (" clearing list\n"); + } else { + if (!cmdlineMacroTable) + cmdlineMacroTable = makeMacroTable (); + saveMacro(cmdlineMacroTable, arg); + } +} + +static void CpreProSetIf0 (const langType language CTAGS_ATTR_UNUSED, const char *name, const char *arg) +{ + doesExaminCodeWithInIf0Branch = paramParserBool (arg, doesExaminCodeWithInIf0Branch, + name, "parameter"); +} + +static parameterHandlerTable CpreProParameterHandlerTable [] = { + { .name = "if0", + .desc = "examine code within \"#if 0\" branch (true or [false])", + .handleParameter = CpreProSetIf0, + }, + { .name = "ignore", + .desc = "a token to be specially handled", + .handleParameter = CpreProInstallIgnoreToken, + }, + { .name = "define", + .desc = "define replacement for an identifier (name(params,...)=definition)", + .handleParameter = CpreProInstallMacroToken, + }, + { .name = "_expand", + .desc = "expand macros if their definitions are in the current C/C++/CUDA input file (true or [false])", + .handleParameter = CpreProExpandMacrosInInput, + } +}; + +extern parserDefinition* CPreProParser (void) +{ + parserDefinition* const def = parserNew ("CPreProcessor"); + def->kindTable = CPreProKinds; + def->kindCount = ARRAY_SIZE (CPreProKinds); + def->initialize = initializeCpp; + def->parser = findCppTags; + def->finalize = finalizeCpp; + + def->fieldTable = CPreProFields; + def->fieldCount = ARRAY_SIZE (CPreProFields); + + def->parameterHandlerTable = CpreProParameterHandlerTable; + def->parameterHandlerCount = ARRAY_SIZE(CpreProParameterHandlerTable); + + def->useCork = CORK_QUEUE | CORK_SYMTAB; + return def; +} Modified: ctags/parsers/cpreprocessor.h 137 lines changed, 137 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,137 @@ +/* +* Copyright (c) 1998-2002, Darren Hiebert +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* External interface to get.c +*/ +#ifndef CTAGS_MAIN_GET_H +#define CTAGS_MAIN_GET_H + +/* +* INCLUDE FILES +*/ +#include "general.h" /* must always come first */ +#include "types.h" +#include "vstring.h" + +/* +* MACROS +*/ + +/* + * cppIs... macros are for the value returned from cppGetc(). Don't + * use "char" value. Don't pass a value stored to C-string + * (char*... or char[]) or vString. + * + * cppGetc() can return the value out of range of unsigned char. + * cppGetc calls skipToEndOfString() and skipToEndOfString() internally. + * They return STRING_SYMBOL (== 338) and CHAR_SYMBOL (== 322) in a + * case. (cppGetc() can return EOF (== -1). However, it is not an issue + * here.) + * + * is...() macros/functions defined in ctype.h can handle the value of + * an unsigned char or EOF; we cannot pass STRING_SYMBOL or CHAR_SYMBOL + * returned from cppGetc(). + * + * Depending on the platform, isalpha(338) returns different value. + * As far as Fedora22, it returns 0. On Windows 2010, it returns 1. + * + * So, we need cppIs... macros. + * cppIs... macros considers STRING_SYMBOL and CHAR_SYMBOL */ + +#define cppIsascii(c) ((c >= 0) && (c < 0x80)) +/* isascii is not portable enough. */ + +/* Is the character valid as a character of a C identifier? + * VMS allows '$' in identifiers. + */ +#define cppIsalnum(c) (cppIsascii(c) && isalnum(c)) +#define cppIsident(c) (cppIsalnum(c) \ + || (c) == '_' || (c) == '$') + +/* Is the character valid as the first character of a C identifier? + * C++ allows '~' in destructors. + * VMS allows '$' in identifiers. + */ +#define cppIsalpha(c) (cppIsascii(c) && isalpha(c)) +#define cppIsident1(c) (cppIsalpha(c) \ + || (c) == '_' || (c) == '~' || (c) == '$') + +#define cppIsspace(c) (cppIsascii(c) && isspace(c)) +#define cppIsdigit(c) (cppIsascii(c) && isdigit(c)) + + +#define RoleTemplateUndef { true, "undef", "undefined" } + +#define RoleTemplateSystem { true, "system", "system header" } +#define RoleTemplateLocal { true, "local", "local header" } + +/* +* FUNCTION PROTOTYPES +*/ +extern bool cppIsBraceFormat (void); +extern unsigned int cppGetDirectiveNestLevel (void); + +/* Don't forget to set useCort true in your parser. + * The corkQueue is needed to capture macro parameters. + */ +extern void cppInit (const bool state, + const bool hasAtLiteralStrings, + const bool hasCxxRawLiteralStrings, + const bool hasSingleQuoteLiteralNumbers, + int defineMacroKindIndex, + int macroUndefRoleIndex, + int headerKindIndex, + int headerSystemRoleIndex, int headerLocalRoleIndex, + int macroParamKindIndex, + int macrodefFieldIndex); + +extern void cppTerminate (void); +extern void cppBeginStatement (void); +extern void cppEndStatement (void); +extern void cppUngetc (const int c); +extern int cppUngetBufferSize(); +extern void cppUngetString(const char * string,int len); +extern int cppGetc (void); +extern const vString * cppGetLastCharOrStringContents (void); + +/* Notify the external parser state for the purpose of conditional + * branch choice. The CXX parser stores the block level here. */ +extern void cppPushExternalParserBlock(void); +extern void cppPopExternalParserBlock(void); + +#define CPP_MACRO_REPLACEMENT_FLAG_VARARGS 1 +#define CPP_MACRO_REPLACEMENT_FLAG_STRINGIFY 2 + +typedef struct sCppMacroReplacementPartInfo { + int parameterIndex; /* -1 if this part is a constant */ + int flags; + vString * constant; /* not NULL only if parameterIndex != -1 */ + struct sCppMacroReplacementPartInfo * next; +} cppMacroReplacementPartInfo; + +typedef struct sCppMacroInfo { + bool hasParameterList; /* true if the macro has a trailing () */ + cppMacroReplacementPartInfo * replacements; + int useCount; + struct sCppMacroInfo * next; +} cppMacroInfo; + +extern cppMacroInfo * cppFindMacro (const char *const name); +extern void cppUngetStringBuiltByMacro (const char * string,int len, cppMacroInfo *macro); + +/* +* Build a replacement string for the specified macro. +* If the macro has parameters, they will be used. +* Parameters not found in the list will be assumed to be empty. +* May return NULL or equivalently an empty replacement string. +*/ +extern vString * cppBuildMacroReplacement( + const cppMacroInfo * macro, + const char ** parameters, /* may be NULL */ + int parameterCount + ); + +#endif /* CTAGS_MAIN_GET_H */ Modified: ctags/parsers/cxx/cxx.c 163 lines changed, 163 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,163 @@ +/* +* Copyright (c) 2016, Szymon Tomasz Stefanek +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains functions for parsing and scanning C++ source files +*/ + +#include "general.h" + +#include "cxx_debug.h" +#include "cxx_keyword.h" +#include "cxx_token.h" +#include "cxx_token_chain.h" +#include "cxx_parser.h" +#include "cxx_scope.h" +#include "cxx_tag.h" + +#include "dependency.h" +#include "selectors.h" + +// +// ---------------------------------------------------------------------------- +// Assumptions. +// ---------------------------------------------------------------------------- +// +// - Parsing C/C++ is hard. Parsing C/C++ correctly without includes and +// without a complete preprocessor is close to impossible in the general +// case. Also ctags is not a compiler. This means that our parser must be +// a "guessing" parser. It's hopeless to try to decode the syntax of the +// language down to the last bit. +// +// - The input may contain syntax errors. This is because we don't have a full +// preprocessor and also because ctags is often used "online" in editors, +// while the user is typing. ctags should be tolerant and try to do its best +// even with syntax errors but: +// - Syntax errors that break the scope hierarchy should be detected and tag +// emission should probably be stopped. Correct tags in a broken hierarchy +// are useless (well, unless the hierarchy itself is ignored by the ctags +// user). +// - CTags should try to avoid emitting tags which involve syntax errors +// +// - There will always be pathologic cases. Don't cry, live with it. +// +// ---------------------------------------------------------------------------- +// TODO LIST +// ---------------------------------------------------------------------------- +// +// - In case of simple syntax error try to recover: +// Skip to the next ; without entering or exiting scopes. +// If this can be done then recovery is feasible. +// - Extension of each block/scope. +// - Unnamed blocks/scopes? +// - Handle syntax errors: +// - If a special switch is used then stop on detecting a syntax error +// (this is useful for code editors that frequently update tags for +// single files) +// - If the switch is not used then do NOT emit tags for a file on a syntax +// error [but do not stop execution of the whole program and continue on +// other files] +// For this purpose: +// - Do not emit tags until the end of the file, if scopes do not match we +// either screwed up something or the programmer did +// Maybe the cork api can be used for this? +// +// Handle variable declarations inside things like while() foreach() FOR() etc.. +// +// - Friend classes. +// - Template parameters as field +// - Template specialisations (another field?) +// - Forward declarations might become tags + + +parserDefinition * CParser (void) +{ + static const char * const extensions [] = + { + "c", + NULL + }; + + static selectLanguage selectors[] = { selectByObjectiveCKeywords, NULL }; + + parserDefinition* def = parserNew("C"); + + def->kindTable = cxxTagGetCKindDefinitions(); + def->kindCount = cxxTagGetCKindDefinitionCount(); + def->fieldTable = cxxTagGetCFieldDefinitionifiers(); + def->fieldCount = cxxTagGetCFieldDefinitionifierCount(); + def->extensions = extensions; + def->parser2 = cxxCParserMain; + def->initialize = cxxCParserInitialize; + def->finalize = cxxParserCleanup; + def->selectLanguage = selectors; + def->useCork = CORK_QUEUE|CORK_SYMTAB; // We use corking to block output until the end of file + + return def; +} + +parserDefinition * CppParser (void) +{ + static const char * const extensions [] = + { + "c++", "cc", "cp", "cpp", "cxx", + "h", "h++", "hh", "hp", "hpp", "hxx", "inl", +#ifndef CASE_INSENSITIVE_FILENAMES + "C", "H", "CPP", "CXX", +#endif + NULL + }; + static parserDependency dependencies [] = { + { DEPTYPE_KIND_OWNER, "C" }, + }; + + static selectLanguage selectors[] = { selectByObjectiveCKeywords, NULL }; + + parserDefinition* def = parserNew("C++"); + + def->dependencies = dependencies; + def->dependencyCount = ARRAY_SIZE (dependencies); + def->kindTable = cxxTagGetCPPKindDefinitions(); + def->kindCount = cxxTagGetCPPKindDefinitionCount(); + def->fieldTable = cxxTagGetCPPFieldDefinitionifiers(); + def->fieldCount = cxxTagGetCPPFieldDefinitionifierCount(); + def->extensions = extensions; + def->parser2 = cxxCppParserMain; + def->initialize = cxxCppParserInitialize; + def->finalize = cxxParserCleanup; + def->selectLanguage = selectors; + def->useCork = CORK_QUEUE|CORK_SYMTAB; // We use corking to block output until the end of file + + return def; +} + +parserDefinition * CUDAParser (void) +{ + static const char * const extensions [] = + { + "cu", "cuh", + NULL + }; + static parserDependency dependencies [] = { + { DEPTYPE_KIND_OWNER, "C" }, + }; + + parserDefinition* def = parserNew("CUDA"); + + def->dependencies = dependencies; + def->dependencyCount = ARRAY_SIZE (dependencies); + def->kindTable = cxxTagGetCUDAKindDefinitions(); + def->kindCount = cxxTagGetCUDAKindDefinitionCount(); + def->fieldTable = cxxTagGetCUDAFieldDefinitionifiers(); + def->fieldCount = cxxTagGetCUDAFieldDefinitionifierCount(); + def->extensions = extensions; + def->parser2 = cxxCUDAParserMain; + def->initialize = cxxCUDAParserInitialize; + def->finalize = cxxParserCleanup; + def->selectLanguage = NULL; + def->useCork = CORK_QUEUE|CORK_SYMTAB; // We use corking to block output until the end of file + + return def; +} Modified: ctags/parsers/cxx/cxx_debug.c 182 lines changed, 182 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,182 @@ +/* +* Copyright (c) 2016, Szymon Tomasz Stefanek +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains functions for parsing and scanning C++ source files +*/ + +#include "cxx_debug.h" + +#ifdef CXX_DO_DEBUGGING + +#include "trashbox.h" +#include "cxx_parser_internal.h" +#include "cxx_scope.h" + +static void cxxDebugDumpToken0 (CXXToken *pToken, + struct circularRefChecker *pTokenChecker, + struct circularRefChecker *pChainChecker, + bool top_level); + +static void cxxDebugDumpChain0 (CXXTokenChain *pChain, + struct circularRefChecker *pTokenChecker, + struct circularRefChecker *pChainChecker, + bool top_level) +{ + int backref; + + if (top_level) + { + debugIndent (); + fprintf (stderr, "<chain "); + } + else if (pChain == NULL) + { + fprintf (stderr, "NULL\n"); + return; + } + else + { + fprintf (stderr, "<"); + } + + backref = circularRefCheckerCheck (pChainChecker, pChain); + if (backref) + { + fprintf (stderr, "*C#%d>\n", backref); + return; + } + + backref = circularRefCheckerGetCurrent (pChainChecker); + + fprintf (stderr, "[%d %p&C#%d]\n", pChain->iCount, pChain, backref); + + debugInc(); + debugIndent (); + cxxDebugDumpToken0 (pChain->pHead, pTokenChecker, pChainChecker, false); + debugDec(); + + debugIndent (); + fprintf (stderr, ">\n"); +} + +static void cxxDebugDumpToken0 (CXXToken *pToken, + struct circularRefChecker *pTokenChecker, + struct circularRefChecker *pChainChecker, + bool top_level) +{ + int backref; + + if (top_level) + { + debugIndent (); + fprintf (stderr, "<token "); + } + else if (pToken == NULL) + { + fprintf (stderr, "NULL\n"); + return; + } + else + { + fprintf (stderr, "<"); + } + + backref = circularRefCheckerCheck (pTokenChecker, pToken); + if (backref) + { + fprintf (stderr, "*T#%d>\n", backref); + return; + } + + backref = circularRefCheckerGetCurrent (pTokenChecker); + + fprintf (stderr, "\"%s\": [%s %p &T#%d]\n", + vStringValue (pToken->pszWord), + cxxDebugTypeDecode (pToken->eType), pToken, backref); + + debugIndent (); + fprintf (stderr, " chain: "); + debugInc(); + cxxDebugDumpChain0 (pToken->pChain, pTokenChecker, pTokenChecker, false); + debugDec(); + + debugIndent (); + fprintf (stderr, " next: "); + debugInc(); + cxxDebugDumpToken0 (pToken->pNext, pTokenChecker, pTokenChecker, false); + debugDec(); + + debugIndent (); + fprintf (stderr, " prev: "); + debugInc(); + cxxDebugDumpToken0 (pToken->pPrev, pTokenChecker, pTokenChecker, false); + debugDec(); + + debugIndent (); + fprintf (stderr, ">\n"); +} + +typedef void (* cxxDebugDumpCommonFunc)(void *, + struct circularRefChecker *, + struct circularRefChecker *, + bool); +void cxxDebugDumpCommon (void *data, + void (* func)(void *, + struct circularRefChecker *, + struct circularRefChecker *, + bool)) +{ + static struct circularRefChecker *pTokenChecker; + static struct circularRefChecker *pChainChecker; + + if (!pTokenChecker) + { + pTokenChecker = circularRefCheckerNew(); + DEFAULT_TRASH_BOX(pTokenChecker, (TrashBoxDestroyItemProc)circularRefCheckerDestroy); + } + + if (!pChainChecker) + { + pChainChecker = circularRefCheckerNew(); + DEFAULT_TRASH_BOX(pChainChecker, (TrashBoxDestroyItemProc)circularRefCheckerDestroy); + } + + func(data, pTokenChecker, pChainChecker, true); + + circularRefCheckClear (pTokenChecker); + circularRefCheckClear (pChainChecker); +} + +void cxxDebugDumpToken (CXXToken *pToken) +{ + cxxDebugDumpCommon (pToken, (cxxDebugDumpCommonFunc)cxxDebugDumpToken0); +} + +void cxxDebugDumpChain (CXXTokenChain *pChain) +{ + cxxDebugDumpCommon (pChain, (cxxDebugDumpCommonFunc)cxxDebugDumpChain0); +} + +const char* cxxDebugScopeDecode(enum CXXScopeType scope) +{ + const char * table[] = { + [CXXScopeTypeFunction] = "function", + [CXXScopeTypeNamespace] = "namespace", + [CXXScopeTypeClass] = "class", + [CXXScopeTypeEnum] = "enum", + [CXXScopeTypeUnion] = "union", + [CXXScopeTypeStruct] = "struct", + [CXXScopeTypeVariable] = "variable", + [CXXScopeTypePrototype] = "prototype", + [CXXScopeTypeTypedef] = "typedef", + }; + if (CXXScopeTypeLAST > scope) + return table[scope]; + else + return NULL; +} + +#endif Modified: ctags/parsers/cxx/cxx_debug.h 63 lines changed, 63 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,63 @@ +#ifndef ctags_cxx_debug_h_ +#define ctags_cxx_debug_h_ +/* +* Copyright (c) 2016, Szymon Tomasz Stefanek +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains functions for parsing and scanning C++ source files +*/ + +#include "general.h" +#include "debug.h" +#include "trace.h" +#include "cxx_token.h" +#include "cxx_scope.h" + +#if defined(DO_TRACING) + #define CXX_DO_DEBUGGING +#endif + +#ifdef CXX_DO_DEBUGGING + +const char* cxxDebugTypeDecode(enum CXXTokenType); +void cxxDebugDumpToken (CXXToken *pToken); +void cxxDebugDumpChain (CXXTokenChain *pChain); +const char* cxxDebugScopeDecode(enum CXXScopeType); + +#define CXX_DEBUG_ENTER() TRACE_ENTER() +#define CXX_DEBUG_LEAVE() TRACE_LEAVE() + +#define CXX_DEBUG_ENTER_TEXT(_szFormat,...) \ + TRACE_ENTER_TEXT(_szFormat,## __VA_ARGS__) + +#define CXX_DEBUG_LEAVE_TEXT(_szFormat,...) \ + TRACE_LEAVE_TEXT(_szFormat,## __VA_ARGS__) + +#define CXX_DEBUG_PRINT(_szFormat,...) \ + TRACE_PRINT(_szFormat,## __VA_ARGS__) + +#define CXX_DEBUG_ASSERT(_condition,_szFormat,...) \ + TRACE_ASSERT(_condition,_szFormat,## __VA_ARGS__) + +#define CXX_DEBUG_TOKEN(T) cxxDebugDumpToken(T) +#define CXX_DEBUG_CHAIN(C) cxxDebugDumpChain(C) +#else //!CXX_DO_DEBUGGING + +#define CXX_DEBUG_ENTER() do { } while(0) +#define CXX_DEBUG_LEAVE() do { } while(0) + +#define CXX_DEBUG_ENTER_TEXT(_szFormat,...) do { } while(0) +#define CXX_DEBUG_LEAVE_TEXT(_szFormat,...) do { } while(0) + +#define CXX_DEBUG_PRINT(_szFormat,...) do { } while(0) + +#define CXX_DEBUG_ASSERT(_condition,_szFormat,...) do { } while(0) + +#define CXX_DEBUG_TOKEN(T) do { } while(0) +#define CXX_DEBUG_CHAIN(T) do { } while(0) +#endif //!CXX_DO_DEBUGGING + + +#endif //!ctags_cxx_debug_h_ Modified: ctags/parsers/cxx/cxx_debug_type.c 54 lines changed, 54 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,54 @@ +/* Automatically generated by misc/gencxxtypedumper.sh */ + +#include "cxx_token.h" +#include "cxx_debug.h" + +#ifdef CXX_DO_DEBUGGING +static bool append(vString *buf, const char *str, bool appended) +{ + if (appended) vStringPut(buf, ' '); + vStringCatS (buf, str); + return true; +} + +const char * cxxDebugTypeDecode (enum CXXTokenType eType) +{ + bool a = false; + static vString *buf; + buf = vStringNewOrClearWithAutoRelease (buf); + + if (eType & CXXTokenTypeEOF) a = append (buf, "EOF", a); + if (eType & CXXTokenTypeIdentifier) a = append (buf, "Identifier", a); + if (eType & CXXTokenTypeKeyword) a = append (buf, "Keyword", a); + if (eType & CXXTokenTypeNumber) a = append (buf, "Number", a); + if (eType & CXXTokenTypeSingleColon) a = append (buf, "SingleColon", a); + if (eType & CXXTokenTypeMultipleColons) a = append (buf, "MultipleColons", a); + if (eType & CXXTokenTypeSemicolon) a = append (buf, "Semicolon", a); + if (eType & CXXTokenTypeComma) a = append (buf, "Comma", a); + if (eType & CXXTokenTypeAssignment) a = append (buf, "Assignment", a); + if (eType & CXXTokenTypeOperator) a = append (buf, "Operator", a); + if (eType & CXXTokenTypeUnknown) a = append (buf, "Unknown", a); + if (eType & CXXTokenTypeDotOperator) a = append (buf, "DotOperator", a); + if (eType & CXXTokenTypePointerOperator) a = append (buf, "PointerOperator", a); + if (eType & CXXTokenTypeStringConstant) a = append (buf, "StringConstant", a); + if (eType & CXXTokenTypeStar) a = append (buf, "Star", a); + if (eType & CXXTokenTypeAnd) a = append (buf, "And", a); + if (eType & CXXTokenTypeMultipleAnds) a = append (buf, "MultipleAnds", a); + if (eType & CXXTokenTypeCharacterConstant) a = append (buf, "CharacterConstant", a); + if (eType & CXXTokenTypeMultipleDots) a = append (buf, "MultipleDots", a); + if (eType & CXXTokenTypeOpeningBracket) a = append (buf, "OpeningBracket", a); + if (eType & CXXTokenTypeOpeningParenthesis) a = append (buf, "OpeningParenthesis", a); + if (eType & CXXTokenTypeOpeningSquareParenthesis) a = append (buf, "OpeningSquareParenthesis", a); + if (eType & CXXTokenTypeSmallerThanSign) a = append (buf, "SmallerThanSign", a); + if (eType & CXXTokenTypeClosingBracket) a = append (buf, "ClosingBracket", a); + if (eType & CXXTokenTypeClosingParenthesis) a = append (buf, "ClosingParenthesis", a); + if (eType & CXXTokenTypeClosingSquareParenthesis) a = append (buf, "ClosingSquareParenthesis", a); + if (eType & CXXTokenTypeGreaterThanSign) a = append (buf, "GreaterThanSign", a); + if (eType & CXXTokenTypeBracketChain) a = append (buf, "BracketChain", a); + if (eType & CXXTokenTypeParenthesisChain) a = append (buf, "ParenthesisChain", a); + if (eType & CXXTokenTypeSquareParenthesisChain) a = append (buf, "SquareParenthesisChain", a); + if (eType & CXXTokenTypeAngleBracketChain) a = append (buf, "AngleBracketChain", a); + if (vStringLength(buf) == 0) vStringCatS(buf, "REALLY-UNKNOWN"); + return vStringValue (buf); +} +#endif Modified: ctags/parsers/cxx/cxx_keyword.c 639 lines changed, 639 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,639 @@ +/* +* Copyright (c) 2016, Szymon Tomasz Stefanek +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains functions for parsing and scanning C++ source files +*/ + +#include "cxx_keyword.h" +#include "cxx_parser_internal.h" +#include "cxx_debug.h" + +#include "keyword.h" + +enum CXXKeywordFlag +{ + // Keywords that in most cases are parts of the name of a type. + // Examples: int, void, const, float, stuff like that + CXXKeywordFlagMayBePartOfTypeName = 1, + // struct, class, union, enum, typename + CXXKeywordIsTypeRefMarker = (1 << 1), + // Stuff that often appears together with a type name + // (for example a function return type or a variable type) + // but is not part of the type itself. + // Examples: virtual, inline, friend, static + CXXKeywordExcludeFromTypeNames = (1 << 2), + // true, false, nullptr + CXXKeywordIsConstant = (1 << 3), + // certain keywords are disabled "on-the-fly" to better + // handle C / C++ guessing errors (public, protected, private, namespace etc..) + CXXKeywordIsDisabled = (1 << 4), + // Similar to MayBePartOfTypeName but includes more keywords that are NOT part + // of the type itself. Keywords that do NOT have this flag simply cannot appear + // in a variable declaration. + // Examples: __global__, __host__, restrict, register... + CXXKeywordMayAppearInVariableDeclaration = (1 << 5) +}; + +typedef struct _CXXKeywordDescriptor +{ + const char * szName; + unsigned int uLanguages; + unsigned int uFlags; +} CXXKeywordDescriptor; + + +// This array is indexed by the CXXKeywordType enum +static CXXKeywordDescriptor g_aCXXKeywordTable[] = { + { + "__attribute__", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration + }, + { + "__constant__", + CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__declspec", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__device__", + CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__fastcall", + CXXLanguageCPP + }, + { + "__forceinline", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordExcludeFromTypeNames + }, + { + "__forceinline__", + CXXLanguageCUDA, + CXXKeywordExcludeFromTypeNames + }, + { + "__global__", + CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__host__", + CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__inline", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__inline__", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__managed__", + CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__noinline__", + CXXLanguageCUDA, + CXXKeywordExcludeFromTypeNames + }, + { + "__restrict", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__restrict__", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__shared__", + CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "__stdcall", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "__thiscall", + CXXLanguageCPP, + 0 + }, + { + "alignas", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration + }, + { + "alignof", + CXXLanguageCPP, + 0 + }, + //{ 1, "and", 0 }, + //{ 1, "and_eq", 0 }, + { + "asm", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "auto", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + //{ 1, "bitand", 0 }, + //{ 1, "bitor", 0 }, + { + "bool", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "break", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "case", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "catch", + CXXLanguageCPP, + 0 + }, + { + "char", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "char16_t", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "char32_t", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "class", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName | + CXXKeywordIsTypeRefMarker + }, + //{ 0, "compl", 0 }, + { + "concept", + CXXLanguageCPP, + 0 + }, + { + "const", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "constexpr", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "const_cast", + CXXLanguageCPP, + 0 + }, + { + "continue", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "decltype", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "default", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "delete", + CXXLanguageCPP, + 0 + }, + { + "do", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "double", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "dynamic_cast", + CXXLanguageCPP, + 0 + }, + { + "else", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "enum", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName | + CXXKeywordIsTypeRefMarker + }, + { + "explicit", + CXXLanguageCPP, + 0 + }, + { + "export", + CXXLanguageCPP, + 0 + }, + { + "extern", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "false", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordIsConstant + }, + // this is a keyword only in special contexts (we have a switch to enable/disable it) + { + "final", + CXXLanguageCPP, + 0 + }, + { + "float", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "for", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "friend", + CXXLanguageCPP, + CXXKeywordExcludeFromTypeNames + }, + { + "goto", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "if", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "inline", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "int", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "long", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "mutable", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration + }, + { + "namespace", + CXXLanguageCPP, + 0 + }, + { + "new", + CXXLanguageCPP, + 0 + }, + { + "noexcept", + CXXLanguageCPP, + 0 + }, + //{ 0, "not", 0 }, + //{ 0, "not_eq", 0 }, + { + "nullptr", + CXXLanguageCPP, + CXXKeywordIsConstant + }, + { + "operator", + CXXLanguageCPP, + 0 + }, + //{ 0, "or", 0 }, + //{ 0, "or_eq", 0 }, + // override is a keyword only after function declarators, + // it's easier handling it as identifier + //{ 0, "override", 0 }, + { + "private", + CXXLanguageCPP, + 0 + }, + { + "protected", + CXXLanguageCPP, + 0 + }, + { + "public", + CXXLanguageCPP, + 0 + }, + { + "register", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration + }, + { + "reinterpret_cast", + CXXLanguageCPP, + 0 + }, + { + "requires", + CXXLanguageCPP, + 0 + }, + { + "restrict", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "return", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "short", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "signed", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "sizeof", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "static", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordExcludeFromTypeNames + }, + { + "static_assert", + CXXLanguageCPP, + 0 + }, + { + "static_cast", + CXXLanguageCPP, + 0 + }, + { + "struct", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName | + CXXKeywordIsTypeRefMarker + }, + { + "switch", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "template", + CXXLanguageCPP, + 0 + }, + { + "this", + CXXLanguageCPP, + 0 + }, + { + "thread_local", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration + }, + { + "throw", + CXXLanguageCPP, + 0 + }, + { + "true", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordIsConstant + }, + { + "try", + CXXLanguageCPP, + 0 + }, + { + "typedef", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + { + "typeid", + CXXLanguageCPP, + 0 + }, + { + "typename", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName | + CXXKeywordIsTypeRefMarker + }, + { + "union", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName | + CXXKeywordIsTypeRefMarker + }, + { + "unsigned", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "using", + CXXLanguageCPP, + 0 + }, + { + "virtual", + CXXLanguageCPP, + CXXKeywordExcludeFromTypeNames + }, + { + "void", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "volatile", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + CXXKeywordMayAppearInVariableDeclaration + }, + { + "wchar_t", + CXXLanguageCPP, + CXXKeywordMayAppearInVariableDeclaration | CXXKeywordFlagMayBePartOfTypeName + }, + { + "while", + CXXLanguageC | CXXLanguageCPP | CXXLanguageCUDA, + 0 + }, + //{ 0, "xor", 0 }, + //{ 0, 1, "xor_eq", 0 } +}; + +const char * cxxKeywordName(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].szName; +} + +bool cxxKeywordMayBePartOfTypeName(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].uFlags & + CXXKeywordFlagMayBePartOfTypeName; +} + +bool cxxKeywordMayAppearInVariableDeclaration(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].uFlags & + CXXKeywordMayAppearInVariableDeclaration; +} + +bool cxxKeywordIsTypeRefMarker(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].uFlags & + CXXKeywordIsTypeRefMarker; +} + +bool cxxKeywordIsConstant(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].uFlags & + CXXKeywordIsConstant; +} + +bool cxxKeywordIsCPPSpecific(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].uLanguages == CXXLanguageCPP; +} + +bool cxxKeywordExcludeFromTypeNames(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].uFlags & + CXXKeywordExcludeFromTypeNames; +} + +bool cxxKeywordIsDisabled(CXXKeyword eKeywordId) +{ + return g_aCXXKeywordTable[eKeywordId].uFlags & + CXXKeywordIsDisabled; +} + +bool cxxKeywordEnablePublicProtectedPrivate(bool bEnableIt) +{ + bool bEnabledNow = + !(g_aCXXKeywordTable[CXXKeywordPUBLIC].uFlags & CXXKeywordIsDisabled); + + if(bEnabledNow == bEnableIt) + return bEnabledNow; + + if(bEnableIt) + { + CXX_DEBUG_PRINT("Enabling public/protected/private keywords"); + + g_aCXXKeywordTable[CXXKeywordPUBLIC].uFlags &= ~CXXKeywordIsDisabled; + g_aCXXKeywordTable[CXXKeywordPROTECTED].uFlags &= ~CXXKeywordIsDisabled; + g_aCXXKeywordTable[CXXKeywordPRIVATE].uFlags &= ~CXXKeywordIsDisabled; + } else { + CXX_DEBUG_PRINT("Disabling public/protected/private keywords"); + + g_aCXXKeywordTable[CXXKeywordPUBLIC].uFlags |= CXXKeywordIsDisabled; + g_aCXXKeywordTable[CXXKeywordPROTECTED].uFlags |= CXXKeywordIsDisabled; + g_aCXXKeywordTable[CXXKeywordPRIVATE].uFlags |= CXXKeywordIsDisabled; + } + + return bEnabledNow; +} + +void cxxKeywordEnableFinal(bool bEnableIt) +{ + if(bEnableIt) + g_aCXXKeywordTable[CXXKeywordFINAL].uFlags &= ~CXXKeywordIsDisabled; + else + g_aCXXKeywordTable[CXXKeywordFINAL].uFlags |= CXXKeywordIsDisabled; +} + + +void cxxBuildKeywordHash(const langType eLangType,unsigned int uLanguage) +{ + const size_t count = sizeof(g_aCXXKeywordTable) / sizeof(CXXKeywordDescriptor); + + size_t i; + + for(i = 0;i < count;i++) + { + const CXXKeywordDescriptor * p = g_aCXXKeywordTable + i; + if(p->uLanguages & uLanguage) + addKeyword(p->szName,eLangType,i); + } +} Modified: ctags/parsers/cxx/cxx_keyword.h 178 lines changed, 178 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,178 @@ +#ifndef ctags_cxx_keyword_h_ +#define ctags_cxx_keyword_h_ +/* +* Copyright (c) 2016, Szymon Tomasz Stefanek +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains functions for parsing and scanning C++ source files +*/ + +#include "general.h" +#include "parse.h" + +// WARNING: There is a table in cxx_keyword.c that must match order in this enum +typedef enum _CXXKeyword +{ + CXXKeyword__ATTRIBUTE__, // GCC + CXXKeyword__CONSTANT__, // CUDA + CXXKeyword__DECLSPEC, // Microsoft C/C++ + CXXKeyword__DEVICE__, // CUDA + CXXKeyword__FASTCALL, // Microsoft C/C++ + CXXKeyword__FORCEINLINE, // Microsoft C/C++ + CXXKeyword__FORCEINLINE__, // CUDA + CXXKeyword__GLOBAL__, // CUDA + CXXKeyword__HOST__, // CUDA + CXXKeyword__INLINE, // Microsoft C/C++ + CXXKeyword__INLINE__, // GCC + CXXKeyword__MANAGED__, // CUDA + CXXKeyword__NOINLINE__, // CUDA + CXXKeyword__RESTRICT, // Microsoft C/C++ + CXXKeyword__RESTRICT__, // CUDA + CXXKeyword__SHARED__, // CUDA + CXXKeyword__STDCALL, // Microsoft C/C++ + CXXKeyword__THISCALL, // Microsoft C/C++ + CXXKeywordALIGNAS, // (since C++11) + CXXKeywordALIGNOF, // (since C++11) + //CXXKeywordAND, + //CXXKeywordAND_EQ, + CXXKeywordASM, + CXXKeywordAUTO, + //CXXKeywordBITAND, + //CXXKeywordBITOR, + CXXKeywordBOOL, + CXXKeywordBREAK, + CXXKeywordCASE, + CXXKeywordCATCH, + CXXKeywordCHAR, + CXXKeywordCHAR16_T, // (since C++11) + CXXKeywordCHAR32_T, // (since C++11) + CXXKeywordCLASS, + //CXXKeywordCOMPL, + CXXKeywordCONCEPT, // Concepts TS + CXXKeywordCONST, + CXXKeywordCONSTEXPR, // (since C++11) + CXXKeywordCONST_CAST, + CXXKeywordCONTINUE, + CXXKeywordDECLTYPE, // (since C++11) + CXXKeywordDEFAULT, + CXXKeywordDELETE, + CXXKeywordDO, + CXXKeywordDOUBLE, + CXXKeywordDYNAMIC_CAST, + CXXKeywordELSE, + CXXKeywordENUM, + CXXKeywordEXPLICIT, + CXXKeywordEXPORT, + CXXKeywordEXTERN, + CXXKeywordFALSE, + CXXKeywordFINAL, // not really a keyword, has meanings in some specific contexts + CXXKeywordFLOAT, + CXXKeywordFOR, + CXXKeywordFRIEND, + CXXKeywordGOTO, + CXXKeywordIF, + CXXKeywordINLINE, + CXXKeywordINT, + CXXKeywordLONG, + CXXKeywordMUTABLE, + CXXKeywordNAMESPACE, + CXXKeywordNEW, + CXXKeywordNOEXCEPT, // (since C++11) + //CXXKeywordNOT, + //CXXKeywordNOT_EQ, + CXXKeywordNULLPTR, // (since C++11) + CXXKeywordOPERATOR, + //CXXKeywordOR, + //CXXKeywordOR_EQ, + //CXXKeywordOVERRIDE, // not really a keyword, has meanings in some specific contexts + CXXKeywordPRIVATE, + CXXKeywordPROTECTED, + CXXKeywordPUBLIC, + CXXKeywordREGISTER, + CXXKeywordREINTERPRET_CAST, + CXXKeywordREQUIRES, // (Concepts TS) + CXXKeywordRESTRICT, // C99 extension + CXXKeywordRETURN, + CXXKeywordSHORT, + CXXKeywordSIGNED, + CXXKeywordSIZEOF, + CXXKeywordSTATIC, + CXXKeywordSTATIC_ASSERT, // (since C++11) + CXXKeywordSTATIC_CAST, + CXXKeywordSTRUCT, + CXXKeywordSWITCH, + CXXKeywordTEMPLATE, + CXXKeywordTHIS, + CXXKeywordTHREAD_LOCAL, // (since C++11) + CXXKeywordTHROW, + CXXKeywordTRUE, + CXXKeywordTRY, + CXXKeywordTYPEDEF, + CXXKeywordTYPEID, + CXXKeywordTYPENAME, + CXXKeywordUNION, + CXXKeywordUNSIGNED, + CXXKeywordUSING, + CXXKeywordVIRTUAL, + CXXKeywordVOID, + CXXKeywordVOLATILE, + CXXKeywordWCHAR_T, + CXXKeywordWHILE, + //CXXKeywordXOR, + //CXXKeywordXOR_EQ, + // WARNING: There is a table in cxx_keyword.c that must match order in this enumeration +} CXXKeyword; + +bool cxxKeywordIsConstant(CXXKeyword eKeywordId); +bool cxxKeywordMayBePartOfTypeName(CXXKeyword eKeywordId); +bool cxxKeywordIsTypeRefMarker(CXXKeyword eKeywordId); +bool cxxKeywordExcludeFromTypeNames(CXXKeyword eKeywordId); +bool cxxKeywordMayAppearInVariableDeclaration(CXXKeyword eKeywordId); +bool cxxKeywordIsCPPSpecific(CXXKeyword eKeywordId); + + +const char * cxxKeywordName(CXXKeyword eKeywordId); + +// uLanguage is really CXXLanguage, but we keep it as unsigned int to avoid +// problems with header inclusions. It works anyway. +void cxxBuildKeywordHash(const langType eLangType,unsigned int uLanguage); + +// Keyword enabled/disabled state management. +// +// public, protected, private, class, namespace... keywords are C++ only. +// However when parsing .h files we don't know if they belong to a C program or C++ +// one and thus for safety we parse them as C++. If our guess is wrong then the parser +// may become confused and in some cases even bail out. +// +// For this reason we enable/disable the processing of certain keyword sets +// in certain contexts. + + +// +// "public,protected,private" keywords +// +// In header files we disable processing of such keywords until we either figure +// out that the file really contains C++ or we start parsing a struct/union. +// +// This flag is meaningful only when parsing a .h file as C++ since in C +// public/protected/private are never keywords and we assume that .cpp files +// have C++ content (so public/protected/private are always keywords). +// +// This function returns the previous state of the public/protected/private keywords +// enabled flag so it can be easily restored. +bool cxxKeywordEnablePublicProtectedPrivate(bool bEnableIt); + +// +// "final" keyword +// +// This is actually special at C++ level: it's a keyword only within a specific part +// of a class declaration. In other contexts it's not a keyword. +void cxxKeywordEnableFinal(bool bEnableIt); + +// Is the specific keyword currently disabled? +bool cxxKeywordIsDisabled(CXXKeyword eKeywordId); + + +#endif //!ctags_cxx_keyword_h_ \ No newline at end of file Modified: ctags/parsers/cxx/cxx_parser.c 2023 lines changed, 2023 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2023 @@ +/* +* Copyright (c) 2016, Szymon Tomasz Stefanek +* +* This source code is released for free distribution under the terms of the +* GNU General Public License version 2 or (at your option) any later version. +* +* This module contains functions for parsing and scanning C++ source files +*/ +#include "cxx_parser.h" +#include "cxx_parser_internal.h" + +#include "cxx_debug.h" +#include "cxx_keyword.h" +#include "cxx_token.h" +#include "cxx_token_chain.h" +#include "cxx_scope.h" +#include "cxx_tag.h" +#include "cxx_subparser_internal.h" + +#include "parse.h" +#include "vstring.h" +#include "../cpreprocessor.h" +#include "debug.h" +#include "keyword.h" +#include "read.h" +#include "ptrarray.h" +#include "trashbox.h" + +#include <string.h> + +// +// The global parser state +// +CXXParserState g_cxx; + +// +// This is set to false once the parser is run at least one time. +// Used by cleanup routines. +// +bool g_bFirstRun = true; + +// +// Reset parser state: +// - Clear the token chain +// - Reset "seen" keywords +// +void cxxParserNewStatement(void) +{ + cxxTokenChainClear(g_cxx.pTokenChain); + if(g_cxx.pTemplateTokenChain) + { + cxxTokenChainDestroy(g_cxx.pTemplateTokenChain); + g_cxx.pTemplateTokenChain = NULL; + g_cxx.oTemplateParameters.uCount = 0; + } else { + // we don't car@@ Diff output truncated at 100000 characters. @@ -------------- 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 December 2021