Branch: refs/heads/master
Author: Nick Treleaven <nick.treleaven(a)btinternet.com>
Committer: Nick Treleaven <nick.treleaven(a)btinternet.com>
Date: Wed, 25 Apr 2012 14:54:56
Commit: a56373cabdceafb9e282ee5e287b5b3c7ce25b9f
https://github.com/geany/geany/commit/a56373cabdceafb9e282ee5e287b5b3c7ce25…
Log Message:
-----------
Support PREFIX* in ignore.tags
Modified Paths:
--------------
doc/geany.html
doc/geany.txt
tagmanager/options.c
Modified: doc/geany.html
6 files changed, 5 insertions(+), 1 deletions(-)
===================================================================
@@ -2106,6 +2106,10 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
identifiers is replaced by the second identifiers for parsing purposes.</blockquote>
<p>For even more detailed information please read the manual page of
Exuberant Ctags.</p>
+<p>Geany extends Ctags with a '*' character suffix - this means use
+prefix matching, e.g. G_GNUC_* will match G_GNUC_NULL_TERMINATED, etc.
+Note that prefix match items should be put after other items to ensure
+that items like G_GNUC_PRINTF+ get parsed correctly.</p>
</div>
</div>
<div class="section" id="preferences">
@@ -6772,7 +6776,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2012-04-24 15:38 UTC.
+Generated on: 2012-04-25 14:39 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: doc/geany.txt
5 files changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -1704,6 +1704,11 @@ manual page:
For even more detailed information please read the manual page of
Exuberant Ctags.
+Geany extends Ctags with a '*' character suffix - this means use
+prefix matching, e.g. G_GNUC_* will match G_GNUC_NULL_TERMINATED, etc.
+Note that prefix match items should be put after other items to ensure
+that items like G_GNUC_PRINTF+ get parsed correctly.
+
Preferences
-----------
Modified: tagmanager/options.c
9 files changed, 7 insertions(+), 2 deletions(-)
===================================================================
@@ -175,11 +175,16 @@ extern boolean isIgnoreToken (const char *const name,
for (i = 0 ; i < len ; ++i)
{
vString *token = vStringNewInit (c_tags_ignore[i]);
+ const size_t tokenLen = vStringLength (token);
+ if (tokenLen >= 2 && vStringChar (token, tokenLen - 1) == '*' &&
+ strncmp (vStringValue (token), name, tokenLen - 1) == 0)
+ {
+ result = TRUE;
+ break;
+ }
if (strncmp (vStringValue (token), name, nameLen) == 0)
{
- const size_t tokenLen = vStringLength (token);
-
if (nameLen == tokenLen)
{
result = TRUE;
@@ Diff output truncated at 100000 characters. @@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).