Commits June 2016

commits@lists.geany.org

1 participants
104 discussions

[geany/geany] 7411f9: Remove an unused variable
by Colomban Wendling 10 Jun '16

10 Jun '16

1 0

[geany/geany] fdc451: Don't use char array subscript as it may be signed
by Colomban Wendling 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 06 May 2016 14:48:04 UTC Commit: fdc4510864f715248a9e83b65cc89df514714166 https://github.com/geany/geany/commit/fdc4510864f715248a9e83b65cc89df514714… Log Message: ----------- Don't use char array subscript as it may be signed Modified Paths: -------------- tagmanager/src/tm_parser.c Modified: tagmanager/src/tm_parser.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -634,7 +634,7 @@ void tm_parser_verify_type_mappings(void) g_warning("Tag type '%c' found in ctags but not in TM for %s", kinds[i], tm_ctags_get_lang_name(lang)); - presence_map[map->entries[i].kind]++; + presence_map[(unsigned char) map->entries[i].kind]++; } for (i = 0; i < sizeof(presence_map); i++) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b72b85: Clean up messy tm_workspace_create_global_tags()
by Jiří Techet 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 21 Mar 2016 17:28:36 UTC Commit: b72b8596346c5dcecb4ecb55d12311b2405a470f https://github.com/geany/geany/commit/b72b8596346c5dcecb4ecb55d12311b2405a4… Log Message: ----------- Clean up messy tm_workspace_create_global_tags() At the same time ignore tags of the type tm_tag_undef_t when parsing - we cannot query them anyway and this eliminates the need to call tm_tags_extract(source_file->tags_array, tm_tag_max_t); when creating tags file. Modified Paths: -------------- tagmanager/src/tm_source_file.c tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_source_file.c 17 lines changed, 12 insertions(+), 5 deletions(-) =================================================================== @@ -239,14 +239,17 @@ static char get_tag_access(const char *access) */ static gboolean init_tag(TMTag *tag, TMSourceFile *file, const tagEntryInfo *tag_entry) { - if (NULL == tag_entry) + TMTagType type; + + if (!tag_entry) return FALSE; - /* This is a normal tag entry */ - if (NULL == tag_entry->name) + type = get_tag_type(tag_entry->kindName); + if (!tag_entry->name || type == tm_tag_undef_t) return FALSE; + tag->name = g_strdup(tag_entry->name); - tag->type = get_tag_type(tag_entry->kindName); + tag->type = type; tag->local = tag_entry->isFileScope; tag->pointerOrder = 0; /* backward compatibility (use var_type instead) */ tag->line = tag_entry->lineNumber; @@ -736,7 +739,11 @@ static gboolean tm_source_file_tags(const tagEntryInfo *const tag, tm_tag = tm_tag_new(); - init_tag(tm_tag, current_source_file, tag); + if (!init_tag(tm_tag, current_source_file, tag)) + { + tm_tag_unref(tm_tag); + return TRUE; + } if (tm_tag->lang == TM_PARSER_PYTHON) update_python_arglist(tm_tag, current_source_file); Modified: tagmanager/src/tm_workspace.c 304 lines changed, 161 insertions(+), 143 deletions(-) =================================================================== @@ -372,15 +372,16 @@ static guint tm_file_inode_hash(gconstpointer key) { GStatBuf file_stat; const char *filename = (const char*)key; + if (g_stat(filename, &file_stat) == 0) { #ifdef TM_DEBUG g_message ("Hash for '%s' is '%d'\n", filename, file_stat.st_ino); #endif return g_direct_hash ((gpointer)(intptr_t)file_stat.st_ino); - } else { - return 0; } + + return 0; } @@ -391,15 +392,18 @@ static void tm_move_entries_to_g_list(gpointer key, gpointer value, gpointer use if (user_data == NULL) return; - *pp_list = g_list_prepend(*pp_list, value); + *pp_list = g_list_prepend(*pp_list, g_strdup(value)); } -static void write_includes_file(FILE *fp, GList *includes_files) +static gboolean write_includes_file(const gchar *outf, GList *includes_files) { - GList *node; + FILE *fp = g_fopen(outf, "w"); + GList *node = includes_files; + + if (!fp) + return FALSE; - node = includes_files; while (node) { char *str = g_strdup_printf("#include \"%s\"\n", (char*)node->data); @@ -409,14 +413,21 @@ static void write_includes_file(FILE *fp, GList *includes_files) g_free(str); node = g_list_next(node); } + + fclose(fp); + + return TRUE; } -static void append_to_temp_file(FILE *fp, GList *file_list) +static gboolean append_to_temp_file(const gchar *outf, GList *file_list) { - GList *node; + FILE *fp = g_fopen(outf, "w"); + GList *node = file_list; + + if (!fp) + return FALSE; - node = file_list; while (node) { const char *fname = node->data; @@ -437,6 +448,10 @@ static void append_to_temp_file(FILE *fp, GList *file_list) } node = g_list_next (node); } + + fclose(fp); + + return TRUE; } @@ -454,187 +469,190 @@ static gchar *create_temp_file(const gchar *tpl) return name; } - -/* Creates a list of global tags. Ideally, this should be created once during - installations so that all users can use the same file. This is because a full - scale global tag list can occupy several megabytes of disk space. - @param pre_process The pre-processing command. This is executed via system(), - so you can pass stuff like 'gcc -E -dD -P `gnome-config --cflags gnome`'. - @param includes Include files to process. Wildcards such as '/usr/include/a*.h' - are allowed. - @param tags_file The file where the tags will be stored. - @param lang The language to use for the tags file. - @return TRUE on success, FALSE on failure. -*/ -gboolean tm_workspace_create_global_tags(const char *pre_process, const char **includes, - int includes_count, const char *tags_file, TMParserType lang) +static GList *lookup_includes(const gchar **includes, gint includes_count) { + GList *includes_files = NULL; + GHashTable *table; + gint i; #ifdef HAVE_GLOB_H glob_t globbuf; size_t idx_glob; #endif - int idx_inc; - char *command; - guint i; - FILE *fp; - TMSourceFile *source_file; - GPtrArray *tags_array; - GHashTable *includes_files_hash; - GList *includes_files = NULL; - gchar *temp_file = create_temp_file("tmp_XXXXXX.cpp"); - gchar *temp_file2 = create_temp_file("tmp_XXXXXX.cpp"); - gboolean ret; - - if (NULL == temp_file || NULL == temp_file2 || - NULL == (fp = g_fopen(temp_file, "w"))) - { - g_free(temp_file); - g_free(temp_file2); - return FALSE; - } - includes_files_hash = g_hash_table_new_full (tm_file_inode_hash, - g_direct_equal, - NULL, g_free); + table = g_hash_table_new_full(tm_file_inode_hash, g_direct_equal, NULL, g_free); #ifdef HAVE_GLOB_H globbuf.gl_offs = 0; if (includes[0][0] == '"') /* leading \" char for glob matching */ - for(idx_inc = 0; idx_inc < includes_count; idx_inc++) { - size_t dirty_len = strlen(includes[idx_inc]); - char *clean_path = g_malloc(dirty_len - 1); + for (i = 0; i < includes_count; i++) + { + size_t dirty_len = strlen(includes[i]); + gchar *clean_path = g_malloc(dirty_len - 1); - strncpy(clean_path, includes[idx_inc] + 1, dirty_len - 1); - clean_path[dirty_len - 2] = 0; + strncpy(clean_path, includes[i] + 1, dirty_len - 1); + clean_path[dirty_len - 2] = 0; #ifdef TM_DEBUG - g_message ("[o][%s]\n", clean_path); + g_message ("[o][%s]\n", clean_path); #endif - glob(clean_path, 0, NULL, &globbuf); + glob(clean_path, 0, NULL, &globbuf); #ifdef TM_DEBUG - g_message ("matches: %d\n", globbuf.gl_pathc); + g_message ("matches: %d\n", globbuf.gl_pathc); #endif - for(idx_glob = 0; idx_glob < globbuf.gl_pathc; idx_glob++) - { + for (idx_glob = 0; idx_glob < globbuf.gl_pathc; idx_glob++) + { #ifdef TM_DEBUG - g_message (">>> %s\n", globbuf.gl_pathv[idx_glob]); + g_message (">>> %s\n", globbuf.gl_pathv[idx_glob]); #endif - if (!g_hash_table_lookup(includes_files_hash, - globbuf.gl_pathv[idx_glob])) - { - char* file_name_copy = strdup(globbuf.gl_pathv[idx_glob]); - g_hash_table_insert(includes_files_hash, file_name_copy, - file_name_copy); + if (!g_hash_table_lookup(table, globbuf.gl_pathv[idx_glob])) + { + gchar *file_name_copy = strdup(globbuf.gl_pathv[idx_glob]); + + g_hash_table_insert(table, file_name_copy, file_name_copy); #ifdef TM_DEBUG - g_message ("Added ...\n"); + g_message ("Added ...\n"); #endif + } } + globfree(&globbuf); + g_free(clean_path); } - globfree(&globbuf); - g_free(clean_path); - } - else -#endif - /* no glob support or globbing not wanted */ - for(idx_inc = 0; idx_inc < includes_count; idx_inc++) + } + else +#endif /* HAVE_GLOB_H */ { - if (!g_hash_table_lookup(includes_files_hash, - includes[idx_inc])) + /* no glob support or globbing not wanted */ + for (i = 0; i < includes_count; i++) { - char* file_name_copy = strdup(includes[idx_inc]); - g_hash_table_insert(includes_files_hash, file_name_copy, - file_name_copy); + if (!g_hash_table_lookup(table, includes[i])) + { + gchar* file_name_copy = strdup(includes[i]); + + g_hash_table_insert(table, file_name_copy, file_name_copy); + } } - } + } + + g_hash_table_foreach(table, tm_move_entries_to_g_list, &includes_files); + g_hash_table_destroy(table); - /* Checks for duplicate file entries which would case trouble */ - g_hash_table_foreach(includes_files_hash, tm_move_entries_to_g_list, - &includes_files); + return g_list_reverse(includes_files); +} - includes_files = g_list_reverse (includes_files); +static gchar *pre_process_file(const gchar *cmd, const gchar *inf) +{ + gint ret; + gchar *outf = create_temp_file("tmp_XXXXXX.cpp"); + gchar *tmp_errfile = create_temp_file("tmp_XXXXXX"); + gchar *errors = NULL; + gchar *command; + if (!outf) + return NULL; + if (!tmp_errfile) + { + g_unlink(outf); + g_free(outf); + return NULL; + } + + command = g_strdup_printf("%s %s >%s 2>%s", + cmd, inf, outf, tmp_errfile); #ifdef TM_DEBUG - g_message ("writing out files to %s\n", temp_file); + g_message("Executing: %s", command); #endif - if (pre_process != NULL) - write_includes_file(fp, includes_files); - else - append_to_temp_file(fp, includes_files); + ret = system(command); + g_free(command); - g_list_free (includes_files); - g_hash_table_destroy(includes_files_hash); - includes_files_hash = NULL; - includes_files = NULL; - fclose(fp); + g_file_get_contents(tmp_errfile, &errors, NULL, NULL); + if (errors && *errors) + g_printerr("%s", errors); + g_free(errors); + g_unlink(tmp_errfile); + g_free(tmp_errfile); - if (pre_process != NULL) + if (ret == -1) { - gint ret; - gchar *tmp_errfile = create_temp_file("tmp_XXXXXX"); - gchar *errors = NULL; - command = g_strdup_printf("%s %s >%s 2>%s", - pre_process, temp_file, temp_file2, tmp_errfile); + g_unlink(outf); + g_free(outf); + return NULL; + } + + return outf; +} + +/* Creates a list of global tags. Ideally, this should be created once during + installations so that all users can use the same file. This is because a full + scale global tag list can occupy several megabytes of disk space. + @param pre_process The pre-processing command. This is executed via system(), + so you can pass stuff like 'gcc -E -dD -P `gnome-config --cflags gnome`'. + @param includes Include files to process. Wildcards such as '/usr/include/a*.h' + are allowed. + @param tags_file The file where the tags will be stored. + @param lang The language to use for the tags file. + @return TRUE on success, FALSE on failure. +*/ +gboolean tm_workspace_create_global_tags(const char *pre_process, const char **includes, + int includes_count, const char *tags_file, TMParserType lang) +{ + gboolean ret = FALSE; + TMSourceFile *source_file; + GList *includes_files; + gchar *temp_file = create_temp_file("tmp_XXXXXX.cpp"); + + if (!temp_file) + return FALSE; + + includes_files = lookup_includes(includes, includes_count); + #ifdef TM_DEBUG - g_message("Executing: %s", command); + g_message ("writing out files to %s\n", temp_file); #endif - ret = system(command); - g_free(command); - g_unlink(temp_file); - g_free(temp_file); - g_file_get_contents(tmp_errfile, &errors, NULL, NULL); - if (errors && *errors) - g_printerr("%s", errors); - g_free(errors); - g_unlink(tmp_errfile); - g_free(tmp_errfile); - if (ret == -1) - { - g_unlink(temp_file2); - return FALSE; - } - } + if (pre_process) + ret = write_includes_file(temp_file, includes_files); else + ret = append_to_temp_file(temp_file, includes_files); + + g_list_free_full(includes_files, g_free); + if (!ret) + goto cleanup; + ret = FALSE; + + if (pre_process) { - /* no pre-processing needed, so temp_file2 = temp_file */ - g_unlink(temp_file2); - g_free(temp_file2); - temp_file2 = temp_file; - temp_file = NULL; + gchar *temp_file2 = pre_process_file(pre_process, temp_file); + + if (temp_file2) + { + g_unlink(temp_file); + g_free(temp_file); + temp_file = temp_file2; + } + else + goto cleanup; } - source_file = tm_source_file_new(temp_file2, tm_source_file_get_lang_name(lang)); + + source_file = tm_source_file_new(temp_file, tm_source_file_get_lang_name(lang)); + if (!source_file) + goto cleanup; update_source_file(source_file, NULL, 0, FALSE, FALSE); - if (NULL == source_file) + if (source_file->tags_array->len == 0) { - g_unlink(temp_file2); - return FALSE; - } - g_unlink(temp_file2); - g_free(temp_file2); - if (0 == source_file->tags_array->len) - { - tm_source_file_free(source_file); - return FALSE; - } - tags_array = tm_tags_extract(source_file->tags_array, tm_tag_max_t); - if ((NULL == tags_array) || (0 == tags_array->len)) - { - if (tags_array) - g_ptr_array_free(tags_array, TRUE); tm_source_file_free(source_file); - return FALSE; + goto cleanup; } - if (FALSE == tm_tags_sort(tags_array, global_tags_sort_attrs, TRUE, FALSE)) - { - tm_source_file_free(source_file); - return FALSE; - } - ret = tm_source_file_write_tags_file(tags_file, tags_array); + + tm_tags_sort(source_file->tags_array, global_tags_sort_attrs, TRUE, FALSE); + ret = tm_source_file_write_tags_file(tags_file, source_file->tags_array); tm_source_file_free(source_file); - g_ptr_array_free(tags_array, TRUE); + +cleanup: + g_unlink(temp_file); + g_free(temp_file); return ret; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2bdc96: Use proper C prototypes
by Colomban Wendling 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 04 May 2016 17:11:13 UTC Commit: 2bdc96776c62d171920b7b2a18374bc2d84577f6 https://github.com/geany/geany/commit/2bdc96776c62d171920b7b2a18374bc2d8457… Log Message: ----------- Use proper C prototypes Modified Paths: -------------- tagmanager/src/tm_ctags_wrappers.c tagmanager/src/tm_ctags_wrappers.h tagmanager/src/tm_source_file.c tagmanager/src/tm_source_file.h Modified: tagmanager/src/tm_ctags_wrappers.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -32,7 +32,7 @@ typedef struct { } CallbackUserData; -void tm_ctags_init() +void tm_ctags_init(void) { initializeParsing(); installLanguageMapDefaults(); @@ -165,7 +165,7 @@ gboolean tm_ctags_is_using_regex_parser(TMParserType lang) } -guint tm_ctags_get_lang_count() +guint tm_ctags_get_lang_count(void) { return LanguageCount; } Modified: tagmanager/src/tm_ctags_wrappers.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -34,7 +34,7 @@ typedef gboolean (*tm_ctags_callback) (const tagEntryInfo *const tag, gboolean invalidate, void *user_data); -void tm_ctags_init(); +void tm_ctags_init(void); void tm_ctags_parse(guchar *buffer, gsize buffer_size, const gchar *file_name, TMParserType lang, tm_ctags_callback callback, @@ -52,7 +52,7 @@ gchar tm_ctags_get_kind_from_name(const gchar *name, TMParserType lang); gboolean tm_ctags_is_using_regex_parser(TMParserType lang); -guint tm_ctags_get_lang_count(); +guint tm_ctags_get_lang_count(void); G_END_DECLS Modified: tagmanager/src/tm_source_file.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -661,7 +661,7 @@ static gboolean tm_source_file_tags(const tagEntryInfo *const tag, return TRUE; } -void tm_source_file_ctags_init() +void tm_source_file_ctags_init(void) { tm_ctags_init(); tm_parser_verify_type_mappings(); Modified: tagmanager/src/tm_source_file.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -38,7 +38,7 @@ typedef struct TMSourceFile GType tm_source_file_get_type(void); -void tm_source_file_ctags_init(); +void tm_source_file_ctags_init(void); TMSourceFile *tm_source_file_new(const char *file_name, const char *name); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1c4aaa: Add an API-like ctags layer
by Jiří Techet 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 21 Mar 2016 17:28:36 UTC Commit: 1c4aaa0eb72aa9e3c60cd604d4c20ca5f7dc5c8f https://github.com/geany/geany/commit/1c4aaa0eb72aa9e3c60cd604d4c20ca5f7dc5… Log Message: ----------- Add an API-like ctags layer At the moment it is a bit hard to distinguish which of the functions we are using belong to ctags. To make more explicit what we need from ctags, wrap all ctags-related code and access ctags only using this layer. The interface from tm_ctags_wrappers.h can serve as a base for proper ctags interface if ctags becomes a library. Modified Paths: -------------- tagmanager/src/Makefile.am tagmanager/src/tm_ctags_wrappers.c tagmanager/src/tm_ctags_wrappers.h tagmanager/src/tm_source_file.c Modified: tagmanager/src/Makefile.am 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -28,4 +28,6 @@ libtagmanager_la_SOURCES =\ tm_tag.h \ tm_tag.c \ tm_workspace.h \ - tm_workspace.c + tm_workspace.c \ + tm_ctags_wrappers.h \ + tm_ctags_wrappers.c Modified: tagmanager/src/tm_ctags_wrappers.c 119 lines changed, 119 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,119 @@ +/* + * tm_ctags_wrappers.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2016 Jiri Techet <techet(at)gmail(dot)com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "tm_ctags_wrappers.h" + +#include "general.h" +#include "entry.h" +#include "parse.h" +#include "read.h" + + +typedef struct { + tm_ctags_callback callback; + gpointer user_data; +} CallbackUserData; + + +void tm_ctags_init() +{ + initializeParsing(); + installLanguageMapDefaults(); +} + + +static gboolean parse_callback(const tagEntryInfo *tag, gpointer user_data) +{ + CallbackUserData *callback_data = user_data; + + return callback_data->callback(tag, FALSE, callback_data->user_data); +} + + +void tm_ctags_parse(guchar *buffer, gsize buffer_size, + const gchar *file_name, TMParserType lang, tm_ctags_callback callback, + gpointer user_data) +{ + CallbackUserData callback_data = {callback, user_data}; + gboolean retry = TRUE; + guint passCount = 0; + + g_return_if_fail(buffer || file_name); + + if (! LanguageTable [lang]->enabled) + { +#ifdef TM_DEBUG + g_warning("ignoring %s (language disabled)\n", file_name); +#endif + return; + } + + setTagEntryFunction(parse_callback, &callback_data); + while (retry && passCount < 3) + { + callback(NULL, TRUE, user_data); + if (!buffer && fileOpen (file_name, lang)) + { + if (LanguageTable [lang]->parser != NULL) + { + LanguageTable [lang]->parser (); + fileClose (); + retry = FALSE; + break; + } + else if (LanguageTable [lang]->parser2 != NULL) + retry = LanguageTable [lang]->parser2 (passCount); + fileClose (); + } + else if (buffer && bufferOpen (buffer, buffer_size, file_name, lang)) + { + if (LanguageTable [lang]->parser != NULL) + { + LanguageTable [lang]->parser (); + bufferClose (); + retry = FALSE; + break; + } + else if (LanguageTable [lang]->parser2 != NULL) + retry = LanguageTable [lang]->parser2 (passCount); + bufferClose (); + } + else + { + g_warning("Unable to open %s", file_name); + return; + } + ++ passCount; + } +} + + +const gchar *tm_ctags_get_lang_name(TMParserType lang) +{ + return getLanguageName(lang); +} + + +TMParserType tm_ctags_get_named_lang(const gchar *name) +{ + return getNamedLanguage(name); +} + + Modified: tagmanager/src/tm_ctags_wrappers.h 49 lines changed, 49 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,49 @@ +/* + * tm_ctags_wrappers.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2016 Jiri Techet <techet(at)gmail(dot)com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef TM_CTAGS_WRAPPERS +#define TM_CTAGS_WRAPPERS + +#include <glib.h> + +#include "tm_parser.h" + +#include "entry.h" /* for sTagEntryInfo */ + + +G_BEGIN_DECLS + +typedef gboolean (*tm_ctags_callback) (const tagEntryInfo *const tag, + gboolean invalidate, void *user_data); + + +void tm_ctags_init(); + +void tm_ctags_parse(guchar *buffer, gsize buffer_size, + const gchar *file_name, TMParserType lang, tm_ctags_callback callback, + gpointer user_data); + +const gchar *tm_ctags_get_lang_name(TMParserType lang); + +TMParserType tm_ctags_get_named_lang(const gchar *name); + +G_END_DECLS + +#endif /* TM_CTAGS_WRAPPERS */ Modified: tagmanager/src/tm_source_file.c 82 lines changed, 22 insertions(+), 60 deletions(-) =================================================================== @@ -18,6 +18,7 @@ #include <limits.h> #include <stdlib.h> #include <string.h> +#include <ctype.h> #include <sys/stat.h> #include <glib/gstdio.h> #ifdef G_OS_WIN32 @@ -26,14 +27,10 @@ # include <windows.h> /* for GetFullPathName */ #endif -#include "general.h" -#include "entry.h" -#include "parse.h" -#include "read.h" - #include "tm_source_file.h" #include "tm_tag.h" #include "tm_parser.h" +#include "tm_ctags_wrappers.h" typedef struct { @@ -725,10 +722,19 @@ static void update_python_arglist(const TMTag *tag, TMSourceFile *current_source it finds a new tag. You should not have to use this function. @see tm_source_file_parse() */ -static int tm_source_file_tags(const tagEntryInfo *tag, void *user_data) +static gboolean tm_source_file_tags(const tagEntryInfo *const tag, + gboolean invalidate, void *user_data) { TMSourceFile *current_source_file = user_data; - TMTag *tm_tag = tm_tag_new(); + TMTag *tm_tag; + + if (invalidate) + { + tm_tags_array_free(current_source_file->tags_array, FALSE); + return TRUE; + } + + tm_tag = tm_tag_new(); init_tag(tm_tag, current_source_file, tag); @@ -742,8 +748,7 @@ static int tm_source_file_tags(const tagEntryInfo *tag, void *user_data) void tm_source_file_ctags_init() { - initializeParsing(); - installLanguageMapDefaults(); + tm_ctags_init(); } /* Initializes a TMSourceFile structure from a file name. */ @@ -783,7 +788,7 @@ static gboolean tm_source_file_init(TMSourceFile *source_file, const char *file_ if (name == NULL) source_file->lang = TM_PARSER_NONE; else - source_file->lang = getNamedLanguage(name); + source_file->lang = tm_ctags_get_named_lang(name); return TRUE; } @@ -920,54 +925,11 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gsize return TRUE; } - if (! LanguageTable [source_file->lang]->enabled) - { -#ifdef TM_DEBUG - g_warning("ignoring %s (language disabled)\n", file_name); -#endif - } - else - { - setTagEntryFunction(tm_source_file_tags, source_file); - guint passCount = 0; - while (retry && passCount < 3) - { - tm_tags_array_free(source_file->tags_array, FALSE); - if (parse_file && fileOpen (file_name, source_file->lang)) - { - if (LanguageTable [source_file->lang]->parser != NULL) - { - LanguageTable [source_file->lang]->parser (); - fileClose (); - retry = FALSE; - break; - } - else if (LanguageTable [source_file->lang]->parser2 != NULL) - retry = LanguageTable [source_file->lang]->parser2 (passCount); - fileClose (); - } - else if (!parse_file && bufferOpen (text_buf, buf_size, file_name, source_file->lang)) - { - if (LanguageTable [source_file->lang]->parser != NULL) - { - LanguageTable [source_file->lang]->parser (); - bufferClose (); - retry = FALSE; - break; - } - else if (LanguageTable [source_file->lang]->parser2 != NULL) - retry = LanguageTable [source_file->lang]->parser2 (passCount); - bufferClose (); - } - else - { - g_warning("Unable to open %s", file_name); - return FALSE; - } - ++ passCount; - } - } - + tm_tags_array_free(source_file->tags_array, FALSE); + + tm_ctags_parse(parse_file ? NULL : text_buf, buf_size, file_name, + source_file->lang, tm_source_file_tags, source_file); + if (free_buf) g_free(text_buf); return !retry; @@ -979,7 +941,7 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gsize */ const gchar *tm_source_file_get_lang_name(TMParserType lang) { - return getLanguageName(lang); + return tm_ctags_get_lang_name(lang); } /* Gets the language index for \a name. @@ -988,5 +950,5 @@ const gchar *tm_source_file_get_lang_name(TMParserType lang) */ TMParserType tm_source_file_get_named_lang(const gchar *name) { - return getNamedLanguage(name); + return tm_ctags_get_named_lang(name); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aea7d7: Remove some unused return values and unnecessary checks
by Jiří Techet 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 21 Mar 2016 17:28:36 UTC Commit: aea7d7845917843dd6b02e5a8dc9031cabc87a86 https://github.com/geany/geany/commit/aea7d7845917843dd6b02e5a8dc9031cabc87… Log Message: ----------- Remove some unused return values and unnecessary checks Modified Paths: -------------- tagmanager/src/tm_tag.c tagmanager/src/tm_tag.h Modified: tagmanager/src/tm_tag.c 32 lines changed, 16 insertions(+), 16 deletions(-) =================================================================== @@ -236,18 +236,19 @@ gboolean tm_tags_equal(const TMTag *a, const TMTag *b) Removes NULL tag entries from an array of tags. Called after tm_tags_dedup() since this function substitutes duplicate entries with NULL @param tags_array Array of tags to dedup - @return TRUE on success, FALSE on failure */ -gboolean tm_tags_prune(GPtrArray *tags_array) +void tm_tags_prune(GPtrArray *tags_array) { guint i, count; + + g_return_if_fail(tags_array); + for (i=0, count = 0; i < tags_array->len; ++i) { if (NULL != tags_array->pdata[i]) tags_array->pdata[count++] = tags_array->pdata[i]; } tags_array->len = count; - return TRUE; } /* @@ -256,15 +257,16 @@ gboolean tm_tags_prune(GPtrArray *tags_array) @param tags_array Array of tags to dedup. @param sort_attributes Attributes the array is sorted on. They will be deduped on the same criteria. - @return TRUE on success, FALSE on failure */ -gboolean tm_tags_dedup(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gboolean unref_duplicates) +void tm_tags_dedup(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gboolean unref_duplicates) { TMSortOptions sort_options; guint i; - if ((!tags_array) || (!tags_array->len)) - return TRUE; + g_return_if_fail(tags_array); + if (tags_array->len < 2) + return; + sort_options.sort_attrs = sort_attributes; sort_options.partial = FALSE; for (i = 1; i < tags_array->len; ++i) @@ -277,7 +279,6 @@ gboolean tm_tags_dedup(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gb } } tm_tags_prune(tags_array); - return TRUE; } /* @@ -286,21 +287,19 @@ gboolean tm_tags_dedup(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gb @param tags_array The array of tags to be sorted @param sort_attributes Attributes to be sorted on (int array terminated by 0) @param dedup Whether to deduplicate the sorted array - @return TRUE on success, FALSE on failure */ -gboolean tm_tags_sort(GPtrArray *tags_array, TMTagAttrType *sort_attributes, +void tm_tags_sort(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gboolean dedup, gboolean unref_duplicates) { TMSortOptions sort_options; - - if ((!tags_array) || (!tags_array->len)) - return TRUE; + + g_return_if_fail(tags_array); + sort_options.sort_attrs = sort_attributes; sort_options.partial = FALSE; g_ptr_array_sort_with_data(tags_array, tm_tag_compare, &sort_options); if (dedup) tm_tags_dedup(tags_array, sort_attributes, unref_duplicates); - return TRUE; } void tm_tags_remove_file_tags(TMSourceFile *source_file, GPtrArray *tags_array) @@ -501,8 +500,9 @@ GPtrArray *tm_tags_extract(GPtrArray *tags_array, TMTagType tag_types) { GPtrArray *new_tags; guint i; - if (NULL == tags_array) - return NULL; + + g_return_val_if_fail(tags_array, NULL); + new_tags = g_ptr_array_new(); for (i=0; i < tags_array->len; ++i) { Modified: tagmanager/src/tm_tag.h 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -145,14 +145,14 @@ void tm_tags_remove_file_tags(TMSourceFile *source_file, GPtrArray *tags_array); GPtrArray *tm_tags_merge(GPtrArray *big_array, GPtrArray *small_array, TMTagAttrType *sort_attributes, gboolean unref_duplicates); -gboolean tm_tags_sort(GPtrArray *tags_array, TMTagAttrType *sort_attributes, +void tm_tags_sort(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gboolean dedup, gboolean unref_duplicates); GPtrArray *tm_tags_extract(GPtrArray *tags_array, guint tag_types); -gboolean tm_tags_prune(GPtrArray *tags_array); +void tm_tags_prune(GPtrArray *tags_array); -gboolean tm_tags_dedup(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gboolean unref_duplicates); +void tm_tags_dedup(GPtrArray *tags_array, TMTagAttrType *sort_attributes, gboolean unref_duplicates); TMTag **tm_tags_find(const GPtrArray *tags_array, const char *name, gboolean partial, guint * tagCount); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 103d2c: Move code related to various tag file formats into tm_source_file.c
by Jiří Techet 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 21 Mar 2016 17:28:36 UTC Commit: 103d2c535862ae2682022dcfd714c2ffd983c42f https://github.com/geany/geany/commit/103d2c535862ae2682022dcfd714c2ffd983c… Log Message: ----------- Move code related to various tag file formats into tm_source_file.c This patch moves code related to reading/writing various tag file formats into form TMTag and TMWorkspace to TMSourceFile. The benefits of this change are: * only tm_source_file.c interfaces with ctags after this change * tagEntryInfo is removed from headers, no redefinitions needed any more * source code is more evenly distributed among tm_source_file.c, tm_tag.c and tm_workspace.c after the change (tm_tag.c got smaller) * all tag reading/writing is at a single place Despite its size, this patch mostly just moves code. Notable changes are: * tm_tag_new() now creates just an empty tag. The tag is filled by various init_* functions inside tm_source_file.c * there are new functions tm_source_file_read_tags_file() and tm_source_file_write_tags_file() - these hide tags file reading/writing details from tm_workspace.c * tm_source_file_write() debugging function got removed - tm_source_file_write_tags_file() does a similar thing and there's no need to keep around two functions doing the same. Modified Paths: -------------- tagmanager/src/tm_source_file.c tagmanager/src/tm_source_file.h tagmanager/src/tm_tag.c tagmanager/src/tm_tag.h tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_source_file.c 624 lines changed, 587 insertions(+), 37 deletions(-) =================================================================== @@ -31,7 +31,6 @@ #include "parse.h" #include "read.h" -#define LIBCTAGS_DEFINED #include "tm_source_file.h" #include "tm_tag.h" #include "tm_parser.h" @@ -42,6 +41,77 @@ typedef struct guint refcount; } TMSourceFilePriv; + +typedef enum { + TM_FILE_FORMAT_TAGMANAGER, + TM_FILE_FORMAT_PIPE, + TM_FILE_FORMAT_CTAGS +} TMFileFormat; + +/* Note: To preserve binary compatibility, it is very important + that you only *append* to this list ! */ +enum +{ + TA_NAME = 200, + TA_LINE, + TA_LOCAL, + TA_POS, /* Obsolete */ + TA_TYPE, + TA_ARGLIST, + TA_SCOPE, + TA_VARTYPE, + TA_INHERITS, + TA_TIME, + TA_ACCESS, + TA_IMPL, + TA_LANG, + TA_INACTIVE, /* Obsolete */ + TA_POINTER +}; + +static const char *s_tag_type_names[] = { + "class", /* classes */ + "enum", /* enumeration names */ + "enumerator", /* enumerators (values inside an enumeration) */ + "externvar", /* external variable declarations */ + "field", /* fields */ + "function", /* function definitions */ + "interface", /* interfaces */ + "macro", /* macro definitions */ + "member", /* class, struct, and union members */ + "method", /* methods */ + "namespace", /* namespaces */ + "package", /* packages */ + "prototype", /* function prototypes */ + "struct", /* structure names */ + "typedef", /* typedefs */ + "union", /* union names */ + "variable", /* variable definitions */ + "other" /* Other tag type (non C/C++/Java) */ +}; + +static TMTagType s_tag_types[] = { + tm_tag_class_t, + tm_tag_enum_t, + tm_tag_enumerator_t, + tm_tag_externvar_t, + tm_tag_field_t, + tm_tag_function_t, + tm_tag_interface_t, + tm_tag_macro_t, + tm_tag_member_t, + tm_tag_method_t, + tm_tag_namespace_t, + tm_tag_package_t, + tm_tag_prototype_t, + tm_tag_struct_t, + tm_tag_typedef_t, + tm_tag_union_t, + tm_tag_variable_t, + tm_tag_other_t +}; + + #define SOURCE_FILE_NEW(S) ((S) = g_slice_new(TMSourceFilePriv)) #define SOURCE_FILE_FREE(S) g_slice_free(TMSourceFilePriv, (TMSourceFilePriv *) S) @@ -107,6 +177,519 @@ gchar *tm_get_real_path(const gchar *file_name) return NULL; } +static TMTagType get_tag_type(const char *tag_name) +{ + unsigned int i; + int cmp; + g_return_val_if_fail(tag_name, 0); + for (i=0; i < sizeof(s_tag_type_names)/sizeof(char *); ++i) + { + cmp = strcmp(tag_name, s_tag_type_names[i]); + if (0 == cmp) + return s_tag_types[i]; + else if (cmp < 0) + break; + } + /* other is not checked above as it is last, not sorted alphabetically */ + if (strcmp(tag_name, "other") == 0) + return tm_tag_other_t; +#ifdef TM_DEBUG + fprintf(stderr, "Unknown tag type %s\n", tag_name); +#endif + return tm_tag_undef_t; +} + +static char get_tag_impl(const char *impl) +{ + if ((0 == strcmp("virtual", impl)) + || (0 == strcmp("pure virtual", impl))) + return TAG_IMPL_VIRTUAL; + +#ifdef TM_DEBUG + g_warning("Unknown implementation %s", impl); +#endif + return TAG_IMPL_UNKNOWN; +} + +static char get_tag_access(const char *access) +{ + if (0 == strcmp("public", access)) + return TAG_ACCESS_PUBLIC; + else if (0 == strcmp("protected", access)) + return TAG_ACCESS_PROTECTED; + else if (0 == strcmp("private", access)) + return TAG_ACCESS_PRIVATE; + else if (0 == strcmp("friend", access)) + return TAG_ACCESS_FRIEND; + else if (0 == strcmp("default", access)) + return TAG_ACCESS_DEFAULT; + +#ifdef TM_DEBUG + g_warning("Unknown access type %s", access); +#endif + return TAG_ACCESS_UNKNOWN; +} + +/* + Initializes a TMTag structure with information from a tagEntryInfo struct + used by the ctags parsers. Note that the TMTag structure must be malloc()ed + before calling this function. This function is called by tm_tag_new() - you + should not need to call this directly. + @param tag The TMTag structure to initialize + @param file Pointer to a TMSourceFile struct (it is assigned to the file member) + @param tag_entry Tag information gathered by the ctags parser + @return TRUE on success, FALSE on failure +*/ +static gboolean init_tag(TMTag *tag, TMSourceFile *file, const tagEntryInfo *tag_entry) +{ + if (NULL == tag_entry) + return FALSE; + + /* This is a normal tag entry */ + if (NULL == tag_entry->name) + return FALSE; + tag->name = g_strdup(tag_entry->name); + tag->type = get_tag_type(tag_entry->kindName); + tag->local = tag_entry->isFileScope; + tag->pointerOrder = 0; /* backward compatibility (use var_type instead) */ + tag->line = tag_entry->lineNumber; + if (NULL != tag_entry->extensionFields.arglist) + tag->arglist = g_strdup(tag_entry->extensionFields.arglist); + if ((NULL != tag_entry->extensionFields.scope[1]) && + (0 != tag_entry->extensionFields.scope[1][0])) + tag->scope = g_strdup(tag_entry->extensionFields.scope[1]); + if (tag_entry->extensionFields.inheritance != NULL) + tag->inheritance = g_strdup(tag_entry->extensionFields.inheritance); + if (tag_entry->extensionFields.varType != NULL) + tag->var_type = g_strdup(tag_entry->extensionFields.varType); + if (tag_entry->extensionFields.access != NULL) + tag->access = get_tag_access(tag_entry->extensionFields.access); + if (tag_entry->extensionFields.implementation != NULL) + tag->impl = get_tag_impl(tag_entry->extensionFields.implementation); + if ((tm_tag_macro_t == tag->type) && (NULL != tag->arglist)) + tag->type = tm_tag_macro_with_arg_t; + tag->file = file; + tag->lang = file->lang; + return TRUE; +} + +/* + Initializes an already malloc()ed TMTag structure by reading a tag entry + line from a file. The structure should be allocated beforehand. + @param tag The TMTag structure to populate + @param file The TMSourceFile struct (assigned to the file member) + @param fp FILE pointer from where the tag line is read + @return TRUE on success, FALSE on FAILURE +*/ +static gboolean init_tag_from_file(TMTag *tag, TMSourceFile *file, FILE *fp) +{ + guchar buf[BUFSIZ]; + guchar *start, *end; + gboolean status; + guchar changed_char = TA_NAME; + + tag->refcount = 1; + if ((NULL == fgets((gchar*)buf, BUFSIZ, fp)) || ('\0' == *buf)) + return FALSE; + for (start = end = buf, status = TRUE; (TRUE == status); start = end, ++ end) + { + while ((*end < TA_NAME) && (*end != '\0') && (*end != '\n')) + ++ end; + if (('\0' == *end) || ('\n' == *end)) + status = FALSE; + changed_char = *end; + *end = '\0'; + if (NULL == tag->name) + { + if (!isprint(*start)) + return FALSE; + else + tag->name = g_strdup((gchar*)start); + } + else + { + switch (*start) + { + case TA_LINE: + tag->line = atol((gchar*)start + 1); + break; + case TA_LOCAL: + tag->local = atoi((gchar*)start + 1); + break; + case TA_TYPE: + tag->type = (TMTagType) atoi((gchar*)start + 1); + break; + case TA_ARGLIST: + tag->arglist = g_strdup((gchar*)start + 1); + break; + case TA_SCOPE: + tag->scope = g_strdup((gchar*)start + 1); + break; + case TA_POINTER: + tag->pointerOrder = atoi((gchar*)start + 1); + break; + case TA_VARTYPE: + tag->var_type = g_strdup((gchar*)start + 1); + break; + case TA_INHERITS: + tag->inheritance = g_strdup((gchar*)start + 1); + break; + case TA_TIME: /* Obsolete */ + break; + case TA_LANG: /* Obsolete */ + break; + case TA_INACTIVE: /* Obsolete */ + break; + case TA_ACCESS: + tag->access = (char) *(start + 1); + break; + case TA_IMPL: + tag->impl = (char) *(start + 1); + break; + default: +#ifdef GEANY_DEBUG + g_warning("Unknown attribute %s", start + 1); +#endif + break; + } + } + *end = changed_char; + } + if (NULL == tag->name) + return FALSE; + tag->file = file; + return TRUE; +} + +/* alternative parser for Pascal and LaTeX global tags files with the following format + * tagname|return value|arglist|description\n */ +static gboolean init_tag_from_file_alt(TMTag *tag, TMSourceFile *file, FILE *fp) +{ + guchar buf[BUFSIZ]; + guchar *start, *end; + gboolean status; + /*guchar changed_char = TA_NAME;*/ + + tag->refcount = 1; + if ((NULL == fgets((gchar*)buf, BUFSIZ, fp)) || ('\0' == *buf)) + return FALSE; + { + gchar **fields; + guint field_len; + for (start = end = buf, status = TRUE; (TRUE == status); start = end, ++ end) + { + while ((*end < TA_NAME) && (*end != '\0') && (*end != '\n')) + ++ end; + if (('\0' == *end) || ('\n' == *end)) + status = FALSE; + /*changed_char = *end;*/ + *end = '\0'; + if (NULL == tag->name && !isprint(*start)) + return FALSE; + + fields = g_strsplit((gchar*)start, "|", -1); + field_len = g_strv_length(fields); + + if (field_len >= 1) tag->name = g_strdup(fields[0]); + else tag->name = NULL; + if (field_len >= 2 && fields[1] != NULL) tag->var_type = g_strdup(fields[1]); + if (field_len >= 3 && fields[2] != NULL) tag->arglist = g_strdup(fields[2]); + tag->type = tm_tag_prototype_t; + g_strfreev(fields); + } + } + + if (NULL == tag->name) + return FALSE; + tag->file = file; + return TRUE; +} + +/* + CTags tag file format (http://ctags.sourceforge.net/FORMAT) +*/ +static gboolean init_tag_from_file_ctags(TMTag *tag, TMSourceFile *file, FILE *fp) +{ + gchar buf[BUFSIZ]; + gchar *p, *tab; + + tag->refcount = 1; + tag->type = tm_tag_function_t; /* default type is function if no kind is specified */ + do + { + if ((NULL == fgets(buf, BUFSIZ, fp)) || ('\0' == *buf)) + return FALSE; + } + while (strncmp(buf, "!_TAG_", 6) == 0); /* skip !_TAG_ lines */ + + p = buf; + + /* tag name */ + if (! (tab = strchr(p, '\t')) || p == tab) + return FALSE; + tag->name = g_strndup(p, (gsize)(tab - p)); + p = tab + 1; + + /* tagfile, unused */ + if (! (tab = strchr(p, '\t'))) + { + g_free(tag->name); + tag->name = NULL; + return FALSE; + } + p = tab + 1; + /* Ex command, unused */ + if (*p == '/' || *p == '?') + { + gchar c = *p; + for (++p; *p && *p != c; p++) + { + if (*p == '\\' && p[1]) + p++; + } + } + else /* assume a line */ + tag->line = atol(p); + tab = strstr(p, ";\""); + /* read extension fields */ + if (tab) + { + p = tab + 2; + while (*p && *p != '\n' && *p != '\r') + { + gchar *end; + const gchar *key, *value = NULL; + + /* skip leading tabulations */ + while (*p && *p == '\t') p++; + /* find the separator (:) and end (\t) */ + key = end = p; + while (*end && *end != '\t' && *end != '\n' && *end != '\r') + { + if (*end == ':' && ! value) + { + *end = 0; /* terminate the key */ + value = end + 1; + } + end++; + } + /* move p paste the so we won't stop parsing by setting *end=0 below */ + p = *end ? end + 1 : end; + *end = 0; /* terminate the value (or key if no value) */ + + if (! value || 0 == strcmp(key, "kind")) /* tag kind */ + { + const gchar *kind = value ? value : key; + + if (kind[0] && kind[1]) + tag->type = get_tag_type(kind); + else + { + switch (*kind) + { + case 'c': tag->type = tm_tag_class_t; break; + case 'd': tag->type = tm_tag_macro_t; break; + case 'e': tag->type = tm_tag_enumerator_t; break; + case 'F': tag->type = tm_tag_other_t; break; /* Obsolete */ + case 'f': tag->type = tm_tag_function_t; break; + case 'g': tag->type = tm_tag_enum_t; break; + case 'I': tag->type = tm_tag_class_t; break; + case 'i': tag->type = tm_tag_interface_t; break; + case 'l': tag->type = tm_tag_variable_t; break; + case 'M': tag->type = tm_tag_macro_t; break; + case 'm': tag->type = tm_tag_member_t; break; + case 'n': tag->type = tm_tag_namespace_t; break; + case 'P': tag->type = tm_tag_package_t; break; + case 'p': tag->type = tm_tag_prototype_t; break; + case 's': tag->type = tm_tag_struct_t; break; + case 't': tag->type = tm_tag_typedef_t; break; + case 'u': tag->type = tm_tag_union_t; break; + case 'v': tag->type = tm_tag_variable_t; break; + case 'x': tag->type = tm_tag_externvar_t; break; + default: +#ifdef TM_DEBUG + g_warning("Unknown tag kind %c", *kind); +#endif + tag->type = tm_tag_other_t; break; + } + } + } + else if (0 == strcmp(key, "inherits")) /* comma-separated list of classes this class inherits from */ + { + g_free(tag->inheritance); + tag->inheritance = g_strdup(value); + } + else if (0 == strcmp(key, "implementation")) /* implementation limit */ + tag->impl = get_tag_impl(value); + else if (0 == strcmp(key, "line")) /* line */ + tag->line = atol(value); + else if (0 == strcmp(key, "access")) /* access */ + tag->access = get_tag_access(value); + else if (0 == strcmp(key, "class") || + 0 == strcmp(key, "enum") || + 0 == strcmp(key, "function") || + 0 == strcmp(key, "struct") || + 0 == strcmp(key, "union")) /* Name of the class/enum/function/struct/union in which this tag is a member */ + { + g_free(tag->scope); + tag->scope = g_strdup(value); + } + else if (0 == strcmp(key, "file")) /* static (local) tag */ + tag->local = TRUE; + else if (0 == strcmp(key, "signature")) /* arglist */ + { + g_free(tag->arglist); + tag->arglist = g_strdup(value); + } + } + } + + tag->file = file; + return TRUE; +} + +static TMTag *new_tag_from_tags_file(TMSourceFile *file, FILE *fp, TMParserType mode, TMFileFormat format) +{ + TMTag *tag = tm_tag_new(); + gboolean result = FALSE; + + switch (format) + { + case TM_FILE_FORMAT_TAGMANAGER: + result = init_tag_from_file(tag, file, fp); + break; + case TM_FILE_FORMAT_PIPE: + result = init_tag_from_file_alt(tag, file, fp); + break; + case TM_FILE_FORMAT_CTAGS: + result = init_tag_from_file_ctags(tag, file, fp); + break; + } + + if (! result) + { + tm_tag_unref(tag); + return NULL; + } + tag->lang = mode; + return tag; +} + +/* + Writes tag information to the given FILE *. + @param tag The tag information to write. + @param file FILE pointer to which the tag information is written. + @param attrs Attributes to be written (bitmask). + @return TRUE on success, FALSE on failure. +*/ +static gboolean write_tag(TMTag *tag, FILE *fp, TMTagAttrType attrs) +{ + fprintf(fp, "%s", tag->name); + if (attrs & tm_tag_attr_type_t) + fprintf(fp, "%c%d", TA_TYPE, tag->type); + if ((attrs & tm_tag_attr_arglist_t) && (NULL != tag->arglist)) + fprintf(fp, "%c%s", TA_ARGLIST, tag->arglist); + if (attrs & tm_tag_attr_line_t) + fprintf(fp, "%c%ld", TA_LINE, tag->line); + if (attrs & tm_tag_attr_local_t) + fprintf(fp, "%c%d", TA_LOCAL, tag->local); + if ((attrs & tm_tag_attr_scope_t) && (NULL != tag->scope)) + fprintf(fp, "%c%s", TA_SCOPE, tag->scope); + if ((attrs & tm_tag_attr_inheritance_t) && (NULL != tag->inheritance)) + fprintf(fp, "%c%s", TA_INHERITS, tag->inheritance); + if (attrs & tm_tag_attr_pointer_t) + fprintf(fp, "%c%d", TA_POINTER, tag->pointerOrder); + if ((attrs & tm_tag_attr_vartype_t) && (NULL != tag->var_type)) + fprintf(fp, "%c%s", TA_VARTYPE, tag->var_type); + if ((attrs & tm_tag_attr_access_t) && (TAG_ACCESS_UNKNOWN != tag->access)) + fprintf(fp, "%c%c", TA_ACCESS, tag->access); + if ((attrs & tm_tag_attr_impl_t) && (TAG_IMPL_UNKNOWN != tag->impl)) + fprintf(fp, "%c%c", TA_IMPL, tag->impl); + + if (fprintf(fp, "\n")) + return TRUE; + else + return FALSE; +} + +GPtrArray *tm_source_file_read_tags_file(const gchar *tags_file, TMParserType mode) +{ + guchar buf[BUFSIZ]; + FILE *fp; + GPtrArray *file_tags, *new_tags; + TMTag *tag; + TMFileFormat format = TM_FILE_FORMAT_TAGMANAGER; + + if (NULL == (fp = g_fopen(tags_file, "r"))) + return NULL; + if ((NULL == fgets((gchar*) buf, BUFSIZ, fp)) || ('\0' == *buf)) + { + fclose(fp); + return NULL; /* early out on error */ + } + else + { /* We read the first line for the format specification. */ + if (buf[0] == '#' && strstr((gchar*) buf, "format=pipe") != NULL) + format = TM_FILE_FORMAT_PIPE; + else if (buf[0] == '#' && strstr((gchar*) buf, "format=tagmanager") != NULL) + format = TM_FILE_FORMAT_TAGMANAGER; + else if (buf[0] == '#' && strstr((gchar*) buf, "format=ctags") != NULL) + format = TM_FILE_FORMAT_CTAGS; + else if (strncmp((gchar*) buf, "!_TAG_", 6) == 0) + format = TM_FILE_FORMAT_CTAGS; + else + { /* We didn't find a valid format specification, so we try to auto-detect the format + * by counting the pipe characters on the first line and asumme pipe format when + * we find more than one pipe on the line. */ + guint i, pipe_cnt = 0, tab_cnt = 0; + for (i = 0; i < BUFSIZ && buf[i] != '\0' && pipe_cnt < 2; i++) + { + if (buf[i] == '|') + pipe_cnt++; + else if (buf[i] == '\t') + tab_cnt++; + } + if (pipe_cnt > 1) + format = TM_FILE_FORMAT_PIPE; + else if (tab_cnt > 1) + format = TM_FILE_FORMAT_CTAGS; + } + rewind(fp); /* reset the file pointer, to start reading again from the beginning */ + } + + file_tags = g_ptr_array_new(); + while (NULL != (tag = new_tag_from_tags_file(NULL, fp, mode, format))) + g_ptr_array_add(file_tags, tag); + fclose(fp); + + return file_tags; +} + +gboolean tm_source_file_write_tags_file(const gchar *tags_file, GPtrArray *tags_array) +{ + guint i; + FILE *fp; + + g_return_val_if_fail(tags_array && tags_file, FALSE); + + fp = g_fopen(tags_file, "w"); + if (!fp) + return FALSE; + + fprintf(fp, "# format=tagmanager\n"); + for (i = 0; i < tags_array->len; i++) + { + TMTag *tag = TM_TAG(tags_array->pdata[i]); + + write_tag(tag, fp, tm_tag_attr_type_t + | tm_tag_attr_scope_t | tm_tag_attr_arglist_t | tm_tag_attr_vartype_t + | tm_tag_attr_pointer_t); + } + fclose(fp); + + return TRUE; +} + /* add argument list of __init__() Python methods to the class tag */ static void update_python_arglist(const TMTag *tag, TMSourceFile *current_source_file) { @@ -145,7 +728,9 @@ static void update_python_arglist(const TMTag *tag, TMSourceFile *current_source static int tm_source_file_tags(const tagEntryInfo *tag, void *user_data) { TMSourceFile *current_source_file = user_data; - TMTag *tm_tag = tm_tag_new(current_source_file, tag); + TMTag *tm_tag = tm_tag_new(); + + init_tag(tm_tag, current_source_file, tag); if (tm_tag->lang == TM_PARSER_PYTHON) update_python_arglist(tm_tag, current_source_file); @@ -405,38 +990,3 @@ TMParserType tm_source_file_get_named_lang(const gchar *name) { return getNamedLanguage(name); } - -#if 0 -/* - Writes all tags of a source file (including the file tag itself) to the passed - file pointer. - @param source_file The source file to write. - @param fp The file pointer to write to. - @param attrs The attributes to write. - @return TRUE on success, FALSE on failure. -*/ -static gboolean tm_source_file_write(TMSourceFile *source_file, FILE *fp, guint attrs) -{ - TMTag *tag; - guint i; - - if (NULL != source_file) - { - if (NULL != (tag = tm_tag_new(source_file, NULL))) - { - tm_tag_write(tag, fp, tm_tag_attr_max_t); - tm_tag_unref(tag); - if (NULL != source_file->tags_array) - { - for (i=0; i < source_file->tags_array->len; ++i) - { - tag = TM_TAG(source_file->tags_array->pdata[i]); - if (TRUE != tm_tag_write(tag, fp, attrs)) - return FALSE; - } - } - } - } - return TRUE; -} -#endif Modified: tagmanager/src/tm_source_file.h 9 lines changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -16,10 +16,6 @@ #include "tm_parser.h" -#ifndef LIBCTAGS_DEFINED -typedef void tagEntryInfo; -#endif - G_BEGIN_DECLS /* Casts a pointer to a pointer to a TMSourceFile structure */ @@ -50,7 +46,6 @@ void tm_source_file_free(TMSourceFile *source_file); gchar *tm_get_real_path(const gchar *file_name); - #ifdef GEANY_PRIVATE const gchar *tm_source_file_get_lang_name(TMParserType lang); @@ -60,6 +55,10 @@ TMParserType tm_source_file_get_named_lang(const gchar *name); gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gsize buf_size, gboolean use_buffer); +GPtrArray *tm_source_file_read_tags_file(const gchar *tags_file, TMParserType mode); + +gboolean tm_source_file_write_tags_file(const gchar *tags_file, GPtrArray *tags_array); + #endif /* GEANY_PRIVATE */ G_END_DECLS Modified: tagmanager/src/tm_tag.c 527 lines changed, 2 insertions(+), 525 deletions(-) =================================================================== @@ -11,13 +11,7 @@ #include <string.h> #include <glib-object.h> -#include "general.h" -#include "entry.h" -#include "parse.h" -#include "read.h" -#define LIBCTAGS_DEFINED #include "tm_tag.h" -#include "tm_parser.h" #define TAG_NEW(T) ((T) = g_slice_new0(TMTag)) @@ -79,32 +73,6 @@ static void log_tag_free(TMTag *tag) #endif /* DEBUG_TAG_REFS */ -const TMTagType TM_GLOBAL_TYPE_MASK = - tm_tag_class_t | tm_tag_enum_t | tm_tag_interface_t | - tm_tag_struct_t | tm_tag_typedef_t | tm_tag_union_t | tm_tag_namespace_t; - - -/* Note: To preserve binary compatibility, it is very important - that you only *append* to this list ! */ -enum -{ - TA_NAME = 200, - TA_LINE, - TA_LOCAL, - TA_POS, /* Obsolete */ - TA_TYPE, - TA_ARGLIST, - TA_SCOPE, - TA_VARTYPE, - TA_INHERITS, - TA_TIME, - TA_ACCESS, - TA_IMPL, - TA_LANG, - TA_INACTIVE, /* Obsolete */ - TA_POINTER -}; - typedef struct { guint *sort_attrs; @@ -113,48 +81,6 @@ typedef struct gboolean first; } TMSortOptions; -static const char *s_tag_type_names[] = { - "class", /* classes */ - "enum", /* enumeration names */ - "enumerator", /* enumerators (values inside an enumeration) */ - "externvar", /* external variable declarations */ - "field", /* fields */ - "function", /* function definitions */ - "interface", /* interfaces */ - "macro", /* macro definitions */ - "member", /* class, struct, and union members */ - "method", /* methods */ - "namespace", /* namespaces */ - "package", /* packages */ - "prototype", /* function prototypes */ - "struct", /* structure names */ - "typedef", /* typedefs */ - "union", /* union names */ - "variable", /* variable definitions */ - "other" /* Other tag type (non C/C++/Java) */ -}; - -static TMTagType s_tag_types[] = { - tm_tag_class_t, - tm_tag_enum_t, - tm_tag_enumerator_t, - tm_tag_externvar_t, - tm_tag_field_t, - tm_tag_function_t, - tm_tag_interface_t, - tm_tag_macro_t, - tm_tag_member_t, - tm_tag_method_t, - tm_tag_namespace_t, - tm_tag_package_t, - tm_tag_prototype_t, - tm_tag_struct_t, - tm_tag_typedef_t, - tm_tag_union_t, - tm_tag_variable_t, - tm_tag_other_t -}; - /* Gets the GType for a TMTag */ GType tm_tag_get_type(void) { @@ -167,470 +93,21 @@ GType tm_tag_get_type(void) return gtype; } -static TMTagType get_tag_type(const char *tag_name) -{ - unsigned int i; - int cmp; - g_return_val_if_fail(tag_name, 0); - for (i=0; i < sizeof(s_tag_type_names)/sizeof(char *); ++i) - { - cmp = strcmp(tag_name, s_tag_type_names[i]); - if (0 == cmp) - return s_tag_types[i]; - else if (cmp < 0) - break; - } - /* other is not checked above as it is last, not sorted alphabetically */ - if (strcmp(tag_name, "other") == 0) - return tm_tag_other_t; -#ifdef TM_DEBUG - fprintf(stderr, "Unknown tag type %s\n", tag_name); -#endif - return tm_tag_undef_t; -} - -static char get_tag_impl(const char *impl) -{ - if ((0 == strcmp("virtual", impl)) - || (0 == strcmp("pure virtual", impl))) - return TAG_IMPL_VIRTUAL; - -#ifdef TM_DEBUG - g_warning("Unknown implementation %s", impl); -#endif - return TAG_IMPL_UNKNOWN; -} - -static char get_tag_access(const char *access) -{ - if (0 == strcmp("public", access)) - return TAG_ACCESS_PUBLIC; - else if (0 == strcmp("protected", access)) - return TAG_ACCESS_PROTECTED; - else if (0 == strcmp("private", access)) - return TAG_ACCESS_PRIVATE; - else if (0 == strcmp("friend", access)) - return TAG_ACCESS_FRIEND; - else if (0 == strcmp("default", access)) - return TAG_ACCESS_DEFAULT; - -#ifdef TM_DEBUG - g_warning("Unknown access type %s", access); -#endif - return TAG_ACCESS_UNKNOWN; -} - -/* - Initializes a TMTag structure with information from a tagEntryInfo struct - used by the ctags parsers. Note that the TMTag structure must be malloc()ed - before calling this function. This function is called by tm_tag_new() - you - should not need to call this directly. - @param tag The TMTag structure to initialize - @param file Pointer to a TMSourceFile struct (it is assigned to the file member) - @param tag_entry Tag information gathered by the ctags parser - @return TRUE on success, FALSE on failure -*/ -static gboolean tm_tag_init(TMTag *tag, TMSourceFile *file, const tagEntryInfo *tag_entry) -{ - tag->refcount = 1; - if (NULL == tag_entry) - return FALSE; - - /* This is a normal tag entry */ - if (NULL == tag_entry->name) - return FALSE; - tag->name = g_strdup(tag_entry->name); - tag->type = get_tag_type(tag_entry->kindName); - tag->local = tag_entry->isFileScope; - tag->pointerOrder = 0; /* backward compatibility (use var_type instead) */ - tag->line = tag_entry->lineNumber; - if (NULL != tag_entry->extensionFields.arglist) - tag->arglist = g_strdup(tag_entry->extensionFields.arglist); - if ((NULL != tag_entry->extensionFields.scope[1]) && - (0 != tag_entry->extensionFields.scope[1][0])) - tag->scope = g_strdup(tag_entry->extensionFields.scope[1]); - if (tag_entry->extensionFields.inheritance != NULL) - tag->inheritance = g_strdup(tag_entry->extensionFields.inheritance); - if (tag_entry->extensionFields.varType != NULL) - tag->var_type = g_strdup(tag_entry->extensionFields.varType); - if (tag_entry->extensionFields.access != NULL) - tag->access = get_tag_access(tag_entry->extensionFields.access); - if (tag_entry->extensionFields.implementation != NULL) - tag->impl = get_tag_impl(tag_entry->extensionFields.implementation); - if ((tm_tag_macro_t == tag->type) && (NULL != tag->arglist)) - tag->type = tm_tag_macro_with_arg_t; - tag->file = file; - tag->lang = file->lang; - return TRUE; -} - /* - Creates a new tag structure from a tagEntryInfo pointer and a TMSOurceFile pointer - and returns a pointer to it. - @param file - Pointer to the TMSourceFile structure containing the tag - @param tag_entry Contains tag information generated by ctags + Creates a new tag structure and returns a pointer to it. @return the new TMTag structure. This should be free()-ed using tm_tag_free() */ -TMTag *tm_tag_new(TMSourceFile *file, const tagEntryInfo *tag_entry) +TMTag *tm_tag_new(void) { TMTag *tag; TAG_NEW(tag); - if (FALSE == tm_tag_init(tag, file, tag_entry)) - { - TAG_FREE(tag); - return NULL; - } - return tag; -} - -/* - Initializes an already malloc()ed TMTag structure by reading a tag entry - line from a file. The structure should be allocated beforehand. - @param tag The TMTag structure to populate - @param file The TMSourceFile struct (assigned to the file member) - @param fp FILE pointer from where the tag line is read - @return TRUE on success, FALSE on FAILURE -*/ -static gboolean tm_tag_init_from_file(TMTag *tag, TMSourceFile *file, FILE *fp) -{ - guchar buf[BUFSIZ]; - guchar *start, *end; - gboolean status; - guchar changed_char = TA_NAME; - - tag->refcount = 1; - if ((NULL == fgets((gchar*)buf, BUFSIZ, fp)) || ('\0' == *buf)) - return FALSE; - for (start = end = buf, status = TRUE; (TRUE == status); start = end, ++ end) - { - while ((*end < TA_NAME) && (*end != '\0') && (*end != '\n')) - ++ end; - if (('\0' == *end) || ('\n' == *end)) - status = FALSE; - changed_char = *end; - *end = '\0'; - if (NULL == tag->name) - { - if (!isprint(*start)) - return FALSE; - else - tag->name = g_strdup((gchar*)start); - } - else - { - switch (*start) - { - case TA_LINE: - tag->line = atol((gchar*)start + 1); - break; - case TA_LOCAL: - tag->local = atoi((gchar*)start + 1); - break; - case TA_TYPE: - tag->type = (TMTagType) atoi((gchar*)start + 1); - break; - case TA_ARGLIST: - tag->arglist = g_strdup((gchar*)start + 1); - break; - case TA_SCOPE: - tag->scope = g_strdup((gchar*)start + 1); - break; - case TA_POINTER: - tag->pointerOrder = atoi((gchar*)start + 1); - break; - case TA_VARTYPE: - tag->var_type = g_strdup((gchar*)start + 1); - break; - case TA_INHERITS: - tag->inheritance = g_strdup((gchar*)start + 1); - break; - case TA_TIME: /* Obsolete */ - break; - case TA_LANG: /* Obsolete */ - break; - case TA_INACTIVE: /* Obsolete */ - break; - case TA_ACCESS: - tag->access = (char) *(start + 1); - break; - case TA_IMPL: - tag->impl = (char) *(start + 1); - break; - default: -#ifdef GEANY_DEBUG - g_warning("Unknown attribute %s", start + 1); -#endif - break; - } - } - *end = changed_char; - } - if (NULL == tag->name) - return FALSE; - tag->file = file; - return TRUE; -} - -/* alternative parser for Pascal and LaTeX global tags files with the following format - * tagname|return value|arglist|description\n */ -static gboolean tm_tag_init_from_file_alt(TMTag *tag, TMSourceFile *file, FILE *fp) -{ - guchar buf[BUFSIZ]; - guchar *start, *end; - gboolean status; - /*guchar changed_char = TA_NAME;*/ - - tag->refcount = 1; - if ((NULL == fgets((gchar*)buf, BUFSIZ, fp)) || ('\0' == *buf)) - return FALSE; - { - gchar **fields; - guint field_len; - for (start = end = buf, status = TRUE; (TRUE == status); start = end, ++ end) - { - while ((*end < TA_NAME) && (*end != '\0') && (*end != '\n')) - ++ end; - if (('\0' == *end) || ('\n' == *end)) - status = FALSE; - /*changed_char = *end;*/ - *end = '\0'; - if (NULL == tag->name && !isprint(*start)) - return FALSE; - - fields = g_strsplit((gchar*)start, "|", -1); - field_len = g_strv_length(fields); - - if (field_len >= 1) tag->name = g_strdup(fields[0]); - else tag->name = NULL; - if (field_len >= 2 && fields[1] != NULL) tag->var_type = g_strdup(fields[1]); - if (field_len >= 3 && fields[2] != NULL) tag->arglist = g_strdup(fields[2]); - tag->type = tm_tag_prototype_t; - g_strfreev(fields); - } - } - - if (NULL == tag->name) - return FALSE; - tag->file = file; - return TRUE; -} - -/* - Same as tm_tag_init_from_file(), but parsing CTags tag file format - (http://ctags.sourceforge.net/FORMAT) -*/ -static gboolean tm_tag_init_from_file_ctags(TMTag *tag, TMSourceFile *file, FILE *fp) -{ - gchar buf[BUFSIZ]; - gchar *p, *tab; - tag->refcount = 1; - tag->type = tm_tag_function_t; /* default type is function if no kind is specified */ - do - { - if ((NULL == fgets(buf, BUFSIZ, fp)) || ('\0' == *buf)) - return FALSE; - } - while (strncmp(buf, "!_TAG_", 6) == 0); /* skip !_TAG_ lines */ - - p = buf; - - /* tag name */ - if (! (tab = strchr(p, '\t')) || p == tab) - return FALSE; - tag->name = g_strndup(p, (gsize)(tab - p)); - p = tab + 1; - - /* tagfile, unused */ - if (! (tab = strchr(p, '\t'))) - { - g_free(tag->name); - tag->name = NULL; - return FALSE; - } - p = tab + 1; - /* Ex command, unused */ - if (*p == '/' || *p == '?') - { - gchar c = *p; - for (++p; *p && *p != c; p++) - { - if (*p == '\\' && p[1]) - p++; - } - } - else /* assume a line */ - tag->line = atol(p); - tab = strstr(p, ";\""); - /* read extension fields */ - if (tab) - { - p = tab + 2; - while (*p && *p != '\n' && *p != '\r') - { - gchar *end; - const gchar *key, *value = NULL; - - /* skip leading tabulations */ - while (*p && *p == '\t') p++; - /* find the separator (:) and end (\t) */ - key = end = p; - while (*end && *end != '\t' && *end != '\n' && *end != '\r') - { - if (*end == ':' && ! value) - { - *end = 0; /* terminate the key */ - value = end + 1; - } - end++; - } - /* move p paste the so we won't stop parsing by setting *end=0 below */ - p = *end ? end + 1 : end; - *end = 0; /* terminate the value (or key if no value) */ - - if (! value || 0 == strcmp(key, "kind")) /* tag kind */ - { - const gchar *kind = value ? value : key; - if (kind[0] && kind[1]) - tag->type = get_tag_type(kind); - else - { - switch (*kind) - { - case 'c': tag->type = tm_tag_class_t; break; - case 'd': tag->type = tm_tag_macro_t; break; - case 'e': tag->type = tm_tag_enumerator_t; break; - case 'F': tag->type = tm_tag_other_t; break; /* Obsolete */ - case 'f': tag->type = tm_tag_function_t; break; - case 'g': tag->type = tm_tag_enum_t; break; - case 'I': tag->type = tm_tag_class_t; break; - case 'i': tag->type = tm_tag_interface_t; break; - case 'l': tag->type = tm_tag_variable_t; break; - case 'M': tag->type = tm_tag_macro_t; break; - case 'm': tag->type = tm_tag_member_t; break; - case 'n': tag->type = tm_tag_namespace_t; break; - case 'P': tag->type = tm_tag_package_t; break; - case 'p': tag->type = tm_tag_prototype_t; break; - case 's': tag->type = tm_tag_struct_t; break; - case 't': tag->type = tm_tag_typedef_t; break; - case 'u': tag->type = tm_tag_union_t; break; - case 'v': tag->type = tm_tag_variable_t; break; - case 'x': tag->type = tm_tag_externvar_t; break; - default: -#ifdef TM_DEBUG - g_warning("Unknown tag kind %c", *kind); -#endif - tag->type = tm_tag_other_t; break; - } - } - } - else if (0 == strcmp(key, "inherits")) /* comma-separated list of classes this class inherits from */ - { - g_free(tag->inheritance); - tag->inheritance = g_strdup(value); - } - else if (0 == strcmp(key, "implementation")) /* implementation limit */ - tag->impl = get_tag_impl(value); - else if (0 == strcmp(key, "line")) /* line */ - tag->line = atol(value); - else if (0 == strcmp(key, "access")) /* access */ - tag->access = get_tag_access(value); - else if (0 == strcmp(key, "class") || - 0 == strcmp(key, "enum") || - 0 == strcmp(key, "function") || - 0 == strcmp(key, "struct") || - 0 == strcmp(key, "union")) /* Name of the class/enum/function/struct/union in which this tag is a member */ - { - g_free(tag->scope); - tag->scope = g_strdup(value); - } - else if (0 == strcmp(key, "file")) /* static (local) tag */ - tag->local = TRUE; - else if (0 == strcmp(key, "signature")) /* arglist */ - { - g_free(tag->arglist); - tag->arglist = g_strdup(value); - } - } - } - - tag->file = file; - return TRUE; -} - -/* - Same as tm_tag_new() except that the tag attributes are read from file. - @param mode TMParserType to use for the tag. -*/ -TMTag *tm_tag_new_from_file(TMSourceFile *file, FILE *fp, TMParserType mode, TMFileFormat format) -{ - TMTag *tag; - gboolean result = FALSE; - - TAG_NEW(tag); - - switch (format) - { - case TM_FILE_FORMAT_TAGMANAGER: - result = tm_tag_init_from_file(tag, file, fp); - break; - case TM_FILE_FORMAT_PIPE: - result = tm_tag_init_from_file_alt(tag, file, fp); - break; - case TM_FILE_FORMAT_CTAGS: - result = tm_tag_init_from_file_ctags(tag, file, fp); - break; - } - - if (! result) - { - TAG_FREE(tag); - return NULL; - } - tag->lang = mode; return tag; } /* - Writes tag information to the given FILE *. - @param tag The tag information to write. - @param file FILE pointer to which the tag information is written. - @param attrs Attributes to be written (bitmask). - @return TRUE on success, FALSE on failure. -*/ -gboolean tm_tag_write(TMTag *tag, FILE *fp, TMTagAttrType attrs) -{ - fprintf(fp, "%s", tag->name); - if (attrs & tm_tag_attr_type_t) - fprintf(fp, "%c%d", TA_TYPE, tag->type); - if ((attrs & tm_tag_attr_arglist_t) && (NULL != tag->arglist)) - fprintf(fp, "%c%s", TA_ARGLIST, tag->arglist); - if (attrs & tm_tag_attr_line_t) - fprintf(fp, "%c%ld", TA_LINE, tag->line); - if (attrs & tm_tag_attr_local_t) - fprintf(fp, "%c%d", TA_LOCAL, tag->local); - if ((attrs & tm_tag_attr_scope_t) && (NULL != tag->scope)) - fprintf(fp, "%c%s", TA_SCOPE, tag->scope); - if ((attrs & tm_tag_attr_inheritance_t) && (NULL != tag->inheritance)) - fprintf(fp, "%c%s", TA_INHERITS, tag->inheritance); - if (attrs & tm_tag_attr_pointer_t) - fprintf(fp, "%c%d", TA_POINTER, tag->pointerOrder); - if ((attrs & tm_tag_attr_vartype_t) && (NULL != tag->var_type)) - fprintf(fp, "%c%s", TA_VARTYPE, tag->var_type); - if ((attrs & tm_tag_attr_access_t) && (TAG_ACCESS_UNKNOWN != tag->access)) - fprintf(fp, "%c%c", TA_ACCESS, tag->access); - if ((attrs & tm_tag_attr_impl_t) && (TAG_IMPL_UNKNOWN != tag->impl)) - fprintf(fp, "%c%c", TA_IMPL, tag->impl); - - if (fprintf(fp, "\n")) - return TRUE; - else - return FALSE; -} - -/* Destroys a TMTag structure, i.e. frees all elements except the tag itself. @param tag The TMTag structure to destroy @see tm_tag_free() Modified: tagmanager/src/tm_tag.h 23 lines changed, 1 insertions(+), 22 deletions(-) =================================================================== @@ -110,13 +110,6 @@ typedef enum #define TAG_IMPL_VIRTUAL 'v' /**< Virtual implementation */ #define TAG_IMPL_UNKNOWN 'x' /**< Unknown implementation */ -/** - This structure holds all information about a tag, including the file - pseudo tag. It should always be created indirectly with one of the tag - creation functions such as tm_source_file_parse() or tm_tag_new_from_file(). - Once created, they can be sorted, deduped, etc. using functions such as - tm_tags_sort() or tm_tags_dedup() -*/ typedef struct _TMTag { char *name; /**< Name of tag */ @@ -140,26 +133,12 @@ typedef struct _TMTag #ifdef GEANY_PRIVATE -extern const TMTagType TM_GLOBAL_TYPE_MASK; - - -typedef enum { - TM_FILE_FORMAT_TAGMANAGER, - TM_FILE_FORMAT_PIPE, - TM_FILE_FORMAT_CTAGS -} TMFileFormat; - - /* The GType for a TMTag */ #define TM_TYPE_TAG (tm_tag_get_type()) GType tm_tag_get_type(void) G_GNUC_CONST; -TMTag *tm_tag_new(TMSourceFile *file, const tagEntryInfo *tag_entry); - -TMTag *tm_tag_new_from_file(TMSourceFile *file, FILE *fp, TMParserType mode, TMFileFormat format); - -gboolean tm_tag_write(TMTag *tag, FILE *file, guint attrs); +TMTag *tm_tag_new(void); void tm_tags_remove_file_tags(TMSourceFile *source_file, GPtrArray *tags_array); Modified: tagmanager/src/tm_workspace.c 69 lines changed, 10 insertions(+), 59 deletions(-) =================================================================== @@ -60,6 +60,10 @@ static TMTagType TM_TYPE_WITH_MEMBERS = tm_tag_class_t | tm_tag_struct_t | tm_tag_union_t | tm_tag_enum_t | tm_tag_interface_t; +static TMTagType TM_GLOBAL_TYPE_MASK = + tm_tag_class_t | tm_tag_enum_t | tm_tag_interface_t | + tm_tag_struct_t | tm_tag_typedef_t | tm_tag_union_t | tm_tag_namespace_t; + static TMWorkspace *theWorkspace = NULL; @@ -342,54 +346,12 @@ void tm_workspace_remove_source_files(GPtrArray *source_files) */ gboolean tm_workspace_load_global_tags(const char *tags_file, TMParserType mode) { - guchar buf[BUFSIZ]; - FILE *fp; GPtrArray *file_tags, *new_tags; - TMTag *tag; - TMFileFormat format = TM_FILE_FORMAT_TAGMANAGER; - if (NULL == (fp = g_fopen(tags_file, "r"))) + file_tags = tm_source_file_read_tags_file(tags_file, mode); + if (!file_tags) return FALSE; - if ((NULL == fgets((gchar*) buf, BUFSIZ, fp)) || ('\0' == *buf)) - { - fclose(fp); - return FALSE; /* early out on error */ - } - else - { /* We read the first line for the format specification. */ - if (buf[0] == '#' && strstr((gchar*) buf, "format=pipe") != NULL) - format = TM_FILE_FORMAT_PIPE; - else if (buf[0] == '#' && strstr((gchar*) buf, "format=tagmanager") != NULL) - format = TM_FILE_FORMAT_TAGMANAGER; - else if (buf[0] == '#' && strstr((gchar*) buf, "format=ctags") != NULL) - format = TM_FILE_FORMAT_CTAGS; - else if (strncmp((gchar*) buf, "!_TAG_", 6) == 0) - format = TM_FILE_FORMAT_CTAGS; - else - { /* We didn't find a valid format specification, so we try to auto-detect the format - * by counting the pipe characters on the first line and asumme pipe format when - * we find more than one pipe on the line. */ - guint i, pipe_cnt = 0, tab_cnt = 0; - for (i = 0; i < BUFSIZ && buf[i] != '\0' && pipe_cnt < 2; i++) - { - if (buf[i] == '|') - pipe_cnt++; - else if (buf[i] == '\t') - tab_cnt++; - } - if (pipe_cnt > 1) - format = TM_FILE_FORMAT_PIPE; - else if (tab_cnt > 1) - format = TM_FILE_FORMAT_CTAGS; - } - rewind(fp); /* reset the file pointer, to start reading again from the beginning */ - } - - file_tags = g_ptr_array_new(); - while (NULL != (tag = tm_tag_new_from_file(NULL, fp, mode, format))) - g_ptr_array_add(file_tags, tag); - fclose(fp); - + tm_tags_sort(file_tags, global_tags_sort_attrs, TRUE, TRUE); /* reorder the whole array, because tm_tags_find expects a sorted array */ @@ -521,6 +483,7 @@ gboolean tm_workspace_create_global_tags(const char *pre_process, const char **i GList *includes_files = NULL; gchar *temp_file = create_temp_file("tmp_XXXXXX.cpp"); gchar *temp_file2 = create_temp_file("tmp_XXXXXX.cpp"); + gboolean ret; if (NULL == temp_file || NULL == temp_file2 || NULL == (fp = g_fopen(temp_file, "w"))) @@ -669,22 +632,10 @@ gboolean tm_workspace_create_global_tags(const char *pre_process, const char **i tm_source_file_free(source_file); return FALSE; } - if (NULL == (fp = g_fopen(tags_file, "w"))) - { - tm_source_file_free(source_file); - return FALSE; - } - fprintf(fp, "# format=tagmanager\n"); - for (i = 0; i < tags_array->len; ++i) - { - tm_tag_write(TM_TAG(tags_array->pdata[i]), fp, tm_tag_attr_type_t - | tm_tag_attr_scope_t | tm_tag_attr_arglist_t | tm_tag_attr_vartype_t - | tm_tag_attr_pointer_t); - } - fclose(fp); + ret = tm_source_file_write_tags_file(tags_file, tags_array); tm_source_file_free(source_file); g_ptr_array_free(tags_array, TRUE); - return TRUE; + return ret; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4dcc82: Remove unused tm_tagmanager.h
by Jiří Techet 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 21 Mar 2016 17:28:36 UTC Commit: 4dcc829e724a9018f92a8ef5201c2c0f257eeaa7 https://github.com/geany/geany/commit/4dcc829e724a9018f92a8ef5201c2c0f257ee… Log Message: ----------- Remove unused tm_tagmanager.h Nobody uses it, the comment there doesn't provide any valuable information and we don't need an umbrella TM header like this. Modified Paths: -------------- tagmanager/src/Makefile.am tagmanager/src/tm_tagmanager.h Modified: tagmanager/src/Makefile.am 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -17,13 +17,11 @@ tagmanager_includedir = $(includedir)/geany/tagmanager tagmanager_include_HEADERS = \ tm_source_file.h \ tm_tag.h \ - tm_tagmanager.h \ tm_workspace.h \ tm_parser.h libtagmanager_la_SOURCES =\ - tm_tagmanager.h \ tm_parser.h \ tm_source_file.h \ tm_source_file.c \ Modified: tagmanager/src/tm_tagmanager.h 39 lines changed, 0 insertions(+), 39 deletions(-) =================================================================== @@ -1,39 +0,0 @@ -/* -* -* Copyright (c) 2001-2002, Biswapesh Chattopadhyay -* -* This source code is released for free distribution under the terms of the -* GNU General Public License. -* -*/ - -#ifndef TM_TAGMANAGER_H -#define TM_TAGMANAGER_H - -#include "tm_tag.h" -#include "tm_workspace.h" -#include "tm_source_file.h" -#ifdef GEANY_PRIVATE -#include "tm_parser.h" -#endif /* GEANY_PRIVATE */ - -/** @mainpage Introduction - @section Introduction - TagManager is a library and a set of utility programs which can be integrated into - Integrated Development Environments to provide features such as code completion, - calltips, etc. Tag Manager is based on <a href="http://ctags.sourceforge.net"> - Exuberent Ctags</a> with some added features. - @section Licence - TagManager is <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>, - licenced under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. You can only - use it with free software (GPL compatible) projects. This is chiefly because it uses - code from ctags which is under GPL. -*/ - -/** @file - Include this file in all programs using the tag manager library. Including this - automatically includes all the necessary files, namely, tm_tag.h, tm_source_file.h - and tm_workspace.h -*/ - -#endif /* TM_TAGMANAGER_H */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1de139: Improve ctags callback API
by Jiří Techet 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 21 Mar 2016 17:28:36 UTC Commit: 1de139854f4ba791fc7fce8358490cec90e695d3 https://github.com/geany/geany/commit/1de139854f4ba791fc7fce8358490cec90e69… Log Message: ----------- Improve ctags callback API Communicate with ctags only using function calls and don't assign ctags variables directly. Modified Paths: -------------- tagmanager/ctags/entry.c tagmanager/ctags/parse.c tagmanager/ctags/parse.h tagmanager/src/tm_source_file.c Modified: tagmanager/ctags/entry.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -393,7 +393,7 @@ extern void makeTagEntry (const tagEntryInfo *const tag) int length = 0; if (NULL != TagEntryFunction) - length = TagEntryFunction(tag); + length = TagEntryFunction(tag, TagEntryUserData); ++TagFile.numTags.added; rememberMaxLengths (strlen (tag->name), (size_t) length); Modified: tagmanager/ctags/parse.c 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -33,11 +33,19 @@ static parserDefinitionFunc* BuiltInParsers[] = { PARSER_LIST }; parserDefinition** LanguageTable = NULL; static unsigned int LanguageCount = 0; tagEntryFunction TagEntryFunction = NULL; +void *TagEntryUserData = NULL; /* * FUNCTION DEFINITIONS */ +extern void setTagEntryFunction(tagEntryFunction entry_function, void *user_data) +{ + TagEntryFunction = entry_function; + TagEntryUserData = user_data; +} + + extern void makeSimpleTag (const vString* const name, kindOption* const kinds, const int kind) { Modified: tagmanager/ctags/parse.h 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -36,7 +36,7 @@ typedef void (*createRegexTag) (const vString* const name); typedef void (*simpleParser) (void); typedef boolean (*rescanParser) (const unsigned int passCount); typedef void (*parserInitialize) (langType language); -typedef int (*tagEntryFunction) (const tagEntryInfo *const tag); +typedef int (*tagEntryFunction) (const tagEntryInfo *const tag, void *user_data); typedef struct sKindOption { boolean enabled; /* are tags for kind enabled? */ @@ -128,7 +128,8 @@ extern void checkRegex (void); /* Extra stuff for Tag Manager */ extern tagEntryFunction TagEntryFunction; -extern void setTagEntryFunction(tagEntryFunction entry_function); +extern void *TagEntryUserData; +extern void setTagEntryFunction(tagEntryFunction entry_function, void *user_data); #endif /* _PARSE_H */ Modified: tagmanager/src/tm_source_file.c 15 lines changed, 5 insertions(+), 10 deletions(-) =================================================================== @@ -45,8 +45,6 @@ typedef struct #define SOURCE_FILE_NEW(S) ((S) = g_slice_new(TMSourceFilePriv)) #define SOURCE_FILE_FREE(S) g_slice_free(TMSourceFilePriv, (TMSourceFilePriv *) S) -static TMSourceFile *current_source_file = NULL; - static int get_path_max(const char *path) { #ifdef PATH_MAX @@ -110,7 +108,7 @@ gchar *tm_get_real_path(const gchar *file_name) } /* add argument list of __init__() Python methods to the class tag */ -static void update_python_arglist(const TMTag *tag) +static void update_python_arglist(const TMTag *tag, TMSourceFile *current_source_file) { guint i; const char *parent_tag_name; @@ -144,15 +142,13 @@ static void update_python_arglist(const TMTag *tag) it finds a new tag. You should not have to use this function. @see tm_source_file_parse() */ -static int tm_source_file_tags(const tagEntryInfo *tag) +static int tm_source_file_tags(const tagEntryInfo *tag, void *user_data) { - if (NULL == current_source_file) - return 0; - + TMSourceFile *current_source_file = user_data; TMTag *tm_tag = tm_tag_new(current_source_file, tag); if (tm_tag->lang == TM_PARSER_PYTHON) - update_python_arglist(tm_tag); + update_python_arglist(tm_tag, current_source_file); g_ptr_array_add(current_source_file->tags_array, tm_tag); @@ -163,7 +159,6 @@ void tm_source_file_ctags_init() { initializeParsing(); installLanguageMapDefaults(); - TagEntryFunction = tm_source_file_tags; } /* Initializes a TMSourceFile structure from a file name. */ @@ -340,7 +335,6 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gsize return TRUE; } - current_source_file = source_file; if (! LanguageTable [source_file->lang]->enabled) { #ifdef TM_DEBUG @@ -349,6 +343,7 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gsize } else { + setTagEntryFunction(tm_source_file_tags, source_file); guint passCount = 0; while (retry && passCount < 3) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 75c5cb: Use G_BEGIN_DECLS/G_END_DECLS
by Jiří Techet 10 Jun '16

10 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 21 Mar 2016 17:28:36 UTC Commit: 75c5cb6a9c8009ad018ca08d2c583f8ae06d9514 https://github.com/geany/geany/commit/75c5cb6a9c8009ad018ca08d2c583f8ae06d9… Log Message: ----------- Use G_BEGIN_DECLS/G_END_DECLS Modified Paths: -------------- tagmanager/src/tm_source_file.h tagmanager/src/tm_tag.h tagmanager/src/tm_workspace.h Modified: tagmanager/src/tm_source_file.h 9 lines changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -20,10 +20,7 @@ typedef void tagEntryInfo; #endif -#ifdef __cplusplus -extern "C" -{ -#endif +G_BEGIN_DECLS /* Casts a pointer to a pointer to a TMSourceFile structure */ #define TM_SOURCE_FILE(source_file) ((TMSourceFile *) source_file) @@ -65,8 +62,6 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gsize #endif /* GEANY_PRIVATE */ -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* TM_SOURCE_FILE_H */ Modified: tagmanager/src/tm_tag.h 9 lines changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -32,10 +32,7 @@ #include "tm_source_file.h" #include <glib-object.h> -#ifdef __cplusplus -extern "C" -{ -#endif +G_BEGIN_DECLS /** Use the TM_TAG() macro to cast a pointer to (TMTag *) */ #define TM_TAG(tag) ((TMTag *) tag) @@ -213,8 +210,6 @@ gint tm_tag_scope_depth(const TMTag *t); #endif /* GEANY_PRIVATE */ -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* TM_TAG_H */ Modified: tagmanager/src/tm_workspace.h 9 lines changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -15,10 +15,7 @@ #include "tm_tag.h" -#ifdef __cplusplus -extern "C" -{ -#endif +G_BEGIN_DECLS /** The Tag Manager Workspace. This is a singleton object containing a list @@ -79,8 +76,6 @@ void tm_workspace_dump(void); #endif /* GEANY_PRIVATE */ -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* TM_WORKSPACE_H */ -------------- 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 June 2016