HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up tm_workspace_find()

Browse Source 
1. Factor-out the part common to tags_array and global_tags
2. Get both C/CPP tags when either of the languages is specified (both
for global_tags and tags_array)
3. Remove unnecessary strcmp()s (tm_tags_find() should return only tags
with the specified name)
4. Various minor cleanups
This commit is contained in:
Jiří Techet 2015-05-07 01:02:29 +02:00
parent 0f5e379ec8
commit 5c6b423f70
1 changed files with 35 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
tagmanager/src/tm_workspace.c
View File

@ -32,6 +32,7 @@
#include "tm_workspace.h" #include "tm_workspace.h"
#include "tm_tag.h" #include "tm_tag.h"
#include "tm_parser.h"
/* when changing, always keep the three sort criteria below in sync */ /* when changing, always keep the three sort criteria below in sync */
@ -671,6 +672,31 @@ gboolean tm_workspace_create_global_tags(const char *pre_process, const char **i
} }
static void add_filtered_tags(GPtrArray *tags, TMTag **matches, guint tagCount,
TMTagType type, langType lang)
{
guint tagIter;
for (tagIter = 0; tagIter < tagCount; ++tagIter)
{
gint tag_lang = (*matches)->lang;
gint tag_lang_alt = tag_lang;
/* Accept CPP tags for C lang and vice versa */
if (tag_lang == TM_PARSER_C)
tag_lang_alt = TM_PARSER_CPP;
else if (tag_lang == TM_PARSER_CPP)
tag_lang_alt = TM_PARSER_C;
if ((type & (*matches)->type) &&
(lang == -1 || tag_lang == lang || tag_lang_alt == lang))
g_ptr_array_add(tags, *matches);
matches++;
}
}
/* Returns all matching tags found in the workspace. /* Returns all matching tags found in the workspace.
@param name The name of the tag to find. @param name The name of the tag to find.
@param type The tag types to return (TMTagType). Can be a bitmask. @param type The tag types to return (TMTagType). Can be a bitmask.
@ -684,83 +710,25 @@ const GPtrArray *tm_workspace_find(const char *name, TMTagType type, TMTagAttrTy
gboolean partial, langType lang) gboolean partial, langType lang)
{ {
static GPtrArray *tags = NULL; static GPtrArray *tags = NULL;
TMTag **matches[2]; TMTag **matches;
size_t len; guint tagCount;
guint tagCount[2]={0,0}, tagIter;
if (!name) if (!name || !*name)
return NULL;
len = strlen(name);
if (!len)
return NULL; return NULL;
if (tags) if (tags)
g_ptr_array_set_size(tags, 0); g_ptr_array_set_size(tags, 0);
else else
tags = g_ptr_array_new(); tags = g_ptr_array_new();
matches[0] = tm_tags_find(theWorkspace->tags_array, name, partial, TRUE, matches = tm_tags_find(theWorkspace->tags_array, name, partial, TRUE, &tagCount);
&tagCount[0]); add_filtered_tags(tags, matches, tagCount, type, lang);
matches[1] = tm_tags_find(theWorkspace->global_tags, name, partial, TRUE, &tagCount[1]); matches = tm_tags_find(theWorkspace->global_tags, name, partial, TRUE, &tagCount);
add_filtered_tags(tags, matches, tagCount, type, lang);
/* file tags */
if (matches[0] && *matches[0])
{
for (tagIter=0;tagIter<tagCount[0];++tagIter)
{
gint tag_lang = (*matches[0])->lang;
if ((type & (*matches[0])->type) && (lang == -1 || tag_lang == lang))
g_ptr_array_add(tags, *matches[0]);
if (partial)
{
if (0 != strncmp((*matches[0])->name, name, len))
break;
}
else
{
if (0 != strcmp((*matches[0])->name, name))
break;
}
++ matches[0];
}
}
/* global tags */
if (matches[1] && *matches[1])
{
for (tagIter=0;tagIter<tagCount[1];++tagIter)
{
gint tag_lang = (*matches[1])->lang;
gint tag_lang_alt = 0;
/* tag_lang_alt is used to load C global tags only once for C and C++
* lang = 1 is C++, lang = 0 is C
* if we have lang 0, than accept also lang 1 for C++ */
if (tag_lang == 0) /* C or C++ */
tag_lang_alt = 1;
else
tag_lang_alt = tag_lang; /* otherwise just ignore it */
if ((type & (*matches[1])->type) && (lang == -1 ||
tag_lang == lang || tag_lang_alt == lang))
g_ptr_array_add(tags, *matches[1]);
if (partial)
{
if (0 != strncmp((*matches[1])->name, name, len))
break;
}
else
{
if (0 != strcmp((*matches[1])->name, name))
break;
}
++ matches[1];
}
}
if (attrs) if (attrs)
tm_tags_sort(tags, attrs, TRUE, FALSE); tm_tags_sort(tags, attrs, TRUE, FALSE);
return tags; return tags;
} }