Plugins-Commits April 2010

plugins-commits@lists.geany.org

7 participants
98 discussions

SF.net SVN: geany-plugins:[1269] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 21 Apr '10

21 Apr '10

Revision: 1269 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1269&view=rev Author: frlan Date: 2010-04-21 17:26:15 +0000 (Wed, 21 Apr 2010) Log Message: ----------- GeanyLaTeX: Fix a double assignment for fontsize Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-04-21 14:03:03 UTC (rev 1268) +++ trunk/geanylatex/src/geanylatex.c 2010-04-21 17:26:15 UTC (rev 1269) @@ -1168,8 +1168,6 @@ } } } - fontsize = gtk_combo_box_get_active_text( - GTK_COMBO_BOX(glatex_wizard.fontsize_combobox)); if (papersize != NULL) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1268] trunk/geanygendoc/src/ggd-plugin.c
by colombanw＠users.sourceforge.net 21 Apr '10

21 Apr '10

Revision: 1268 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1268&view=rev Author: colombanw Date: 2010-04-21 14:03:03 +0000 (Wed, 21 Apr 2010) Log Message: ----------- GeanyGenDoc: Make menu items document-sensitive when it makes sense Modified Paths: -------------- trunk/geanygendoc/src/ggd-plugin.c Modified: trunk/geanygendoc/src/ggd-plugin.c =================================================================== --- trunk/geanygendoc/src/ggd-plugin.c 2010-04-21 14:02:28 UTC (rev 1267) +++ trunk/geanygendoc/src/ggd-plugin.c 2010-04-21 14:03:03 UTC (rev 1268) @@ -297,10 +297,12 @@ item = gtk_menu_item_new_with_mnemonic (_("_Document current symbol")); g_signal_connect (item, "activate", G_CALLBACK (insert_comment), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + ui_add_document_sensitive (item); /* build "document all" item */ item = gtk_menu_item_new_with_mnemonic (_("Document _all symbols")); g_signal_connect (item, "activate", G_CALLBACK (insert_all_comments), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + ui_add_document_sensitive (item); /* separator */ item = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); @@ -314,9 +316,10 @@ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); /* language filetypes opener */ item = gtk_menu_item_new_with_mnemonic (_("_Edit current language configuration")); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "activate", G_CALLBACK (open_current_filetype_conf_handler), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + ui_add_document_sensitive (item); /* build tools menu item */ item = gtk_menu_item_new_with_mnemonic (_("_Documentation generator")); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1267] trunk/geanygendoc/po/fr.po
by colombanw＠users.sourceforge.net 21 Apr '10

21 Apr '10

Revision: 1267 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1267&view=rev Author: colombanw Date: 2010-04-21 14:02:28 +0000 (Wed, 21 Apr 2010) Log Message: ----------- GeanyGenDoc: Update French translation Modified Paths: -------------- trunk/geanygendoc/po/fr.po Modified: trunk/geanygendoc/po/fr.po =================================================================== --- trunk/geanygendoc/po/fr.po 2010-04-21 14:01:59 UTC (rev 1266) +++ trunk/geanygendoc/po/fr.po 2010-04-21 14:02:28 UTC (rev 1267) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: geanygendoc 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-16 01:06+0200\n" +"POT-Creation-Date: 2010-04-21 15:38+0200\n" "PO-Revision-Date: 2010-04-16 00:38+0200\n" "Last-Translator: Colomban Wendling <ban(a)herbesfolles.org>\n" "Language-Team: French\n" @@ -17,12 +17,12 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/ggd.c:63 +#: src/ggd.c:64 #, c-format msgid "Failed to resize memory output stream" msgstr "Impossible de redimensionner le flux de sortie mémoire" -#: src/ggd.c:89 +#: src/ggd.c:92 #, c-format msgid "" "Argument parsing regular expression did not match (argument list was: \"%s\")" @@ -30,17 +30,17 @@ "L'expression régulière d'analyse des arguments n'a pas correspondu (la liste " "d'arguments était : « %s »)" -#: src/ggd.c:220 +#: src/ggd.c:223 #, c-format msgid "Failed to build comment: %s" msgstr "Impossible de construire le commentaire : %s" -#: src/ggd.c:370 +#: src/ggd.c:374 #, c-format msgid "No valid tag for line %d" msgstr "Pas de tag valide pour la ligne %d" -#: src/ggd.c:380 +#: src/ggd.c:384 src/ggd.c:424 #, c-format msgid "No documentation type \"%s\" for language \"%s\"" msgstr "Pas de type de documentation « %s » pour le langage « %s »" @@ -205,57 +205,67 @@ msgstr "" "Erreur lors de la récupération de l'entrée de fichier de clé %s::%s : %s" -#: src/ggd-plugin.c:55 +#: src/ggd-plugin.c:52 msgid "Generates documentation comments basis from source code" msgstr "" "Génères des bases de commentaires de documentation depuis le code source" -#: src/ggd-plugin.c:139 +#: src/ggd-plugin.c:150 #, c-format msgid "Failed to load configuration: %s" msgstr "Impossible de charger la configuration : %s" -#: src/ggd-plugin.c:160 +#: src/ggd-plugin.c:171 #, c-format msgid "Failed to save configuration: %s" msgstr "Impossible d'enregistrer la configuration : %s" -#: src/ggd-plugin.c:213 src/ggd-plugin.c:224 +#: src/ggd-plugin.c:224 src/ggd-plugin.c:235 msgid "Insert documentation comment" msgstr "Insérer un commentaire de documentation" -#: src/ggd-plugin.c:256 +#: src/ggd-plugin.c:267 #, c-format msgid "Failed to find configuration file for file type \"%s\": %s" msgstr "" "Impossible de trouver le fichier de configuration pour le type de fichier « %" "s » : %s" +#. build "document current symbol" item +#: src/ggd-plugin.c:297 +msgid "_Document current symbol" +msgstr "_Documenter le symbole courant" + +#. build "document all" item +#: src/ggd-plugin.c:301 +msgid "Document _all symbols" +msgstr "Documenter _tous les symboles" + #. build "reload" item -#: src/ggd-plugin.c:286 +#: src/ggd-plugin.c:308 msgid "_Reload configuration files" msgstr "_Recharger les fichiers de configuration" #. language filetypes opener -#: src/ggd-plugin.c:294 +#: src/ggd-plugin.c:316 msgid "_Edit current language configuration" msgstr "Édit_er la configuration du langage courant" #. build tools menu item -#: src/ggd-plugin.c:299 +#: src/ggd-plugin.c:321 msgid "_Documentation generator" msgstr "Générateur de _documentation" -#: src/ggd-plugin.c:371 +#: src/ggd-plugin.c:394 msgid "Documentation _type:" msgstr "_Type de documentation :" #. auto-save -#: src/ggd-plugin.c:378 +#: src/ggd-plugin.c:401 msgid "_Save file before generating comment" msgstr "_Enregistrer le fichier avant de générer le commentaire" -#: src/ggd-plugin.c:380 +#: src/ggd-plugin.c:403 msgid "" "Whether to automatically save the file in which insert comment before " "generating the comment. This is currently needed to have an up-to-date tag " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1266] trunk/geanygendoc/src/ggd-plugin.c
by colombanw＠users.sourceforge.net 21 Apr '10

21 Apr '10

Revision: 1266 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1266&view=rev Author: colombanw Date: 2010-04-21 14:01:59 +0000 (Wed, 21 Apr 2010) Log Message: ----------- GeanyGenDoc: Add the "Document current symbol" item to the plugin's menu too Modified Paths: -------------- trunk/geanygendoc/src/ggd-plugin.c Modified: trunk/geanygendoc/src/ggd-plugin.c =================================================================== --- trunk/geanygendoc/src/ggd-plugin.c 2010-04-21 13:22:58 UTC (rev 1265) +++ trunk/geanygendoc/src/ggd-plugin.c 2010-04-21 14:01:59 UTC (rev 1266) @@ -293,10 +293,13 @@ /* build submenu */ menu = gtk_menu_new (); + /* build "document current symbol" item */ + item = gtk_menu_item_new_with_mnemonic (_("_Document current symbol")); + g_signal_connect (item, "activate", G_CALLBACK (insert_comment), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); /* build "document all" item */ - item = gtk_menu_item_new_with_mnemonic (_("_Document all")); - g_signal_connect (item, "activate", - G_CALLBACK (insert_all_comments), NULL); + item = gtk_menu_item_new_with_mnemonic (_("Document _all symbols")); + g_signal_connect (item, "activate", G_CALLBACK (insert_all_comments), NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); /* separator */ item = gtk_separator_menu_item_new (); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1265] trunk/geanygendoc/src
by colombanw＠users.sourceforge.net 21 Apr '10

21 Apr '10

Revision: 1265 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1265&view=rev Author: colombanw Date: 2010-04-21 13:22:58 +0000 (Wed, 21 Apr 2010) Log Message: ----------- GeanyGenDoc: Add ability to document a whole file at once Modified Paths: -------------- trunk/geanygendoc/src/ggd-plugin.c trunk/geanygendoc/src/ggd.c trunk/geanygendoc/src/ggd.h Modified: trunk/geanygendoc/src/ggd-plugin.c =================================================================== --- trunk/geanygendoc/src/ggd-plugin.c 2010-04-21 13:22:25 UTC (rev 1264) +++ trunk/geanygendoc/src/ggd-plugin.c 2010-04-21 13:22:58 UTC (rev 1265) @@ -34,9 +34,6 @@ /* - * TODO: - * * add option to generate comments for the whole file - * * Questions: * * how to update tag list? (tm_source_file_buffer_update() is not found in * symbols table) @@ -121,6 +118,20 @@ } } +/* tries to insert comments for all the document */ +static void +insert_all_comments (void) +{ + GeanyDocument *doc; + + doc = document_get_current (); + if (DOC_VALID (doc)) { + /* try to ensure tags corresponds to the actual state of the file */ + refresh_tag_list (doc->tm_file, doc->editor->sci, doc); + ggd_insert_all_comments (doc, OPT_doctype); + } +} + static gboolean load_configuration (void) { @@ -189,7 +200,7 @@ } static void -keybinding_activated_handler (guint key_id) +insert_comment_keybinding_handler (guint key_id) { (void)key_id; @@ -219,7 +230,7 @@ /* make item document-presence sensitive */ ui_add_document_sensitive (pdata->edit_menu_item); /* and attach a keybinding */ - keybindings_set_item (plugin_key_group, KB_INSERT, keybinding_activated_handler, + keybindings_set_item (plugin_key_group, KB_INSERT, insert_comment_keybinding_handler, GDK_d, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "instert_doc", _("Insert documentation comment"), pdata->edit_menu_item); @@ -282,6 +293,14 @@ /* build submenu */ menu = gtk_menu_new (); + /* build "document all" item */ + item = gtk_menu_item_new_with_mnemonic (_("_Document all")); + g_signal_connect (item, "activate", + G_CALLBACK (insert_all_comments), NULL); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + /* separator */ + item = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); /* build "reload" item */ item = gtk_image_menu_item_new_with_mnemonic (_("_Reload configuration files")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), Modified: trunk/geanygendoc/src/ggd.c =================================================================== --- trunk/geanygendoc/src/ggd.c 2010-04-21 13:22:25 UTC (rev 1264) +++ trunk/geanygendoc/src/ggd.c 2010-04-21 13:22:58 UTC (rev 1265) @@ -28,6 +28,7 @@ #include "ggd-file-type.h" #include "ggd-file-type-manager.h" +#include "ggd-utils.h" #include "ggd-plugin.h" @@ -395,3 +396,65 @@ return success; } + +/** + * ggd_insert_all_comments: + * @doc: A #GeanyDocument for which insert the comments + * @doc_type: Documentation type identifier + * + * Tries to insert a comment for each symbol of a document. + * + * Returns: %TRUE on full success, %FALSE otherwise. + */ +gboolean +ggd_insert_all_comments (GeanyDocument *doc, + const gchar *doc_type) +{ + gboolean success = FALSE; + GgdFileType *ft; + + g_return_val_if_fail (DOC_VALID (doc), FALSE); + + ft = ggd_file_type_manager_get_file_type (doc->file_type->id); + if (ft) { + GgdDocType *doctype; + + doctype = ggd_file_type_get_doc (ft, doc_type); + if (! doctype) { + msgwin_status_add (_("No documentation type \"%s\" for language \"%s\""), + doc_type, doc->file_type->name); + } else { + GPtrArray *tag_array; + ScintillaObject *sci = doc->editor->sci; + const TMTag *tag; + guint i; + GHashTable *tag_done_table; /* keeps the list of documented tags. + * Useful since documenting a tag might + * actually document another one */ + + success = TRUE; + tag_array = doc->tm_file->tags_array; + tag_done_table = g_hash_table_new (NULL, NULL); + /* sort the tags to be sure to insert by the end of the document, then we + * don't modify the element's position of tags we'll work on */ + ggd_tag_sort_by_line (tag_array, GGD_SORT_DESC); + sci_start_undo_action (sci); + GGD_PTR_ARRAY_FOR (tag_array, i, tag) { + GgdDocSetting *setting; + + setting = get_setting_from_tag (doctype, tag_array, tag, &tag); + if (! setting) { + success = FALSE; + break; + } else if (! g_hash_table_lookup (tag_done_table, tag)) { + success = do_insert_comment (sci, tag_array, tag, ft, setting); + g_hash_table_insert (tag_done_table, (gpointer)tag, (gpointer)tag); + } + } + sci_end_undo_action (sci); + g_hash_table_destroy (tag_done_table); + } + } + + return success; +} Modified: trunk/geanygendoc/src/ggd.h =================================================================== --- trunk/geanygendoc/src/ggd.h 2010-04-21 13:22:25 UTC (rev 1264) +++ trunk/geanygendoc/src/ggd.h 2010-04-21 13:22:58 UTC (rev 1265) @@ -29,6 +29,8 @@ gboolean ggd_insert_comment (GeanyDocument *doc, gint line, const gchar *doc_type); +gboolean ggd_insert_all_comments (GeanyDocument *doc, + const gchar *doc_type); G_END_DECLS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1264] trunk/geanygendoc/src
by colombanw＠users.sourceforge.net 21 Apr '10

21 Apr '10

Revision: 1264 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1264&view=rev Author: colombanw Date: 2010-04-21 13:22:25 +0000 (Wed, 21 Apr 2010) Log Message: ----------- GeanyGenDoc: Add sort direction argument to ggd_tag_sort_by_line() Provide a way to chose sort direction (ascending or descending) with ggd_tag_sort_by_line(). Modified Paths: -------------- trunk/geanygendoc/src/ggd-tag-utils.c trunk/geanygendoc/src/ggd-tag-utils.h Modified: trunk/geanygendoc/src/ggd-tag-utils.c =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-21 13:21:51 UTC (rev 1263) +++ trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-21 13:22:25 UTC (rev 1264) @@ -28,22 +28,25 @@ /* Compare function for g_ptr_array_sort() to compare two TMTag by their - * lines */ + * lines. + * (gint)data is strictly positive for ASC sort, strictly negative DESC sort */ static gint tag_cmp_by_line (gconstpointer a, - gconstpointer b) + gconstpointer b, + gpointer data) { - const TMTag *t1 = *((const TMTag**)a); - const TMTag *t2 = *((const TMTag**)b); - gint rv; + const TMTag *t1 = *((const TMTag**)a); + const TMTag *t2 = *((const TMTag**)b); + gint direction = GPOINTER_TO_INT (data); + gint rv; if (t1->type & tm_tag_file_t || t2->type & tm_tag_file_t) { rv = 0; } else { if (t1->atts.entry.line > t2->atts.entry.line) { - rv = 1; + rv = +direction; } else if (t1->atts.entry.line < t2->atts.entry.line) { - rv = -1; + rv = -direction; } else { rv = 0; } @@ -52,12 +55,24 @@ return rv; } +/** + * ggd_tag_sort_by_line: + * @tags: A #GPtrArray of #TMTags + * @direction: Sort direction: %GGD_SORT_ASC for an ascending sort or + * %GGD_SORT_DESC for a descending sort. + * + * Sorts a #GPtrArray of #TMTags by the tags' line position. The sort + * direction depend on @direction. + */ void -ggd_tag_sort_by_line (GPtrArray *tags) +ggd_tag_sort_by_line (GPtrArray *tags, + gint direction) { g_return_if_fail (tags != NULL); + g_return_if_fail (direction != 0); - g_ptr_array_sort (tags, tag_cmp_by_line); + g_ptr_array_sort_with_data (tags, tag_cmp_by_line, + GINT_TO_POINTER (direction)); } TMTag * Modified: trunk/geanygendoc/src/ggd-tag-utils.h =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.h 2010-04-21 13:21:51 UTC (rev 1263) +++ trunk/geanygendoc/src/ggd-tag-utils.h 2010-04-21 13:22:25 UTC (rev 1264) @@ -26,7 +26,11 @@ G_BEGIN_DECLS -void ggd_tag_sort_by_line (GPtrArray *tags); +#define GGD_SORT_ASC (1) +#define GGD_SORT_DESC (-1) + +void ggd_tag_sort_by_line (GPtrArray *tags, + gint direction); TMTag *ggd_tag_find_from_line (const GPtrArray *tags, gulong line); TMTag *ggd_tag_find_at_current_pos (GeanyDocument *doc); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1263] trunk/geanygendoc/src
by colombanw＠users.sourceforge.net 21 Apr '10

21 Apr '10

Revision: 1263 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1263&view=rev Author: colombanw Date: 2010-04-21 13:21:51 +0000 (Wed, 21 Apr 2010) Log Message: ----------- GeanyGenDoc: Move GGD_PTR_ARRAY_FOR() to ggd-utils Modified Paths: -------------- trunk/geanygendoc/src/ggd-tag-utils.c trunk/geanygendoc/src/ggd-utils.h Modified: trunk/geanygendoc/src/ggd-tag-utils.c =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-20 20:56:12 UTC (rev 1262) +++ trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-21 13:21:51 UTC (rev 1263) @@ -23,28 +23,10 @@ #include <geanyplugin.h> #include <glib.h> +#include "ggd-utils.h" #include "ggd-plugin.h" /* to access Geany data/funcs */ -/* a `for` header to walk on an GPtrArray - * @array: the array to traverse - * @idx: A guint variable to use as iterator (may be modified) - * @el: a TMTag pointer to fill with the current element in the array - * - * usage: - * - * guint i; - * TMTag *tag; - * - * PTR_ARRAY_FOR (ptr_array, i, tag) { - * // use @tag here... - * } - */ -#define PTR_ARRAY_FOR(array, idx, el) \ - for ((idx) = 0; ((el) = g_ptr_array_index ((array), (idx)), \ - (idx) < (array)->len); (idx)++) - - /* Compare function for g_ptr_array_sort() to compare two TMTag by their * lines */ static gint @@ -88,7 +70,7 @@ g_return_val_if_fail (tags != NULL, NULL); - PTR_ARRAY_FOR (tags, i, el) { + GGD_PTR_ARRAY_FOR (tags, i, el) { if (! (el->type & tm_tag_file_t)) { if (el->atts.entry.line <= line && (! tag || el->atts.entry.line > tag->atts.entry.line)) { @@ -144,7 +126,7 @@ } /*g_debug ("%s: parent_name = %s", G_STRFUNC, parent_name); g_debug ("%s: parent_scope = %s", G_STRFUNC, parent_scope);*/ - PTR_ARRAY_FOR (tags, i, el) { + GGD_PTR_ARRAY_FOR (tags, i, el) { if (! (el->type & tm_tag_file_t) && (utils_str_equal (el->name, parent_name) && utils_str_equal (el->atts.entry.scope, parent_scope))) { @@ -293,7 +275,7 @@ g_return_val_if_fail (tags != NULL, NULL); g_return_val_if_fail (name != NULL, NULL); - PTR_ARRAY_FOR (tags, i, el) { + GGD_PTR_ARRAY_FOR (tags, i, el) { if (! (el->type & tm_tag_file_t) && utils_str_equal (el->name, name)) { tag = el; @@ -383,7 +365,7 @@ } else { fake_scope = g_strdup (parent->name); } - PTR_ARRAY_FOR (tags, i, el) { + GGD_PTR_ARRAY_FOR (tags, i, el) { if (scope_child_matches (fake_scope, el->atts.entry.scope, depth)) { children = g_list_append (children, el); } Modified: trunk/geanygendoc/src/ggd-utils.h =================================================================== --- trunk/geanygendoc/src/ggd-utils.h 2010-04-20 20:56:12 UTC (rev 1262) +++ trunk/geanygendoc/src/ggd-utils.h 2010-04-21 13:21:51 UTC (rev 1263) @@ -21,6 +21,7 @@ #define H_GGD_UTILS #include <glib.h> +#include <geanyplugin.h> /* Geany's utils for some wrappers */ G_BEGIN_DECLS @@ -38,7 +39,19 @@ GgdPerms perms_req, GError **error); +/** + * GGD_PTR_ARRAY_FOR: + * @ptr_array: A #GPtrArray + * @idx: A guint variable to use as the index of the current element in the + * array + * @item: A pointer to set to the array's current element + * + * <code>for</code> header to iterate over a #GPtrArray. + */ +#define GGD_PTR_ARRAY_FOR(ptr_array, idx, item) \ + foreach_ptr_array ((item), (idx), (ptr_array)) + G_END_DECLS #endif /* guard */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1262] trunk/geanygendoc/src
by colombanw＠users.sourceforge.net 20 Apr '10

20 Apr '10

Revision: 1262 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1262&view=rev Author: colombanw Date: 2010-04-20 20:56:12 +0000 (Tue, 20 Apr 2010) Log Message: ----------- GeanyGenDoc: Make tag find functions take a const array Tag find functions actually doesn't and shouldn't have to modify the the given tag list they work on. Modified Paths: -------------- trunk/geanygendoc/src/ggd-tag-utils.c trunk/geanygendoc/src/ggd-tag-utils.h Modified: trunk/geanygendoc/src/ggd-tag-utils.c =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-20 20:55:44 UTC (rev 1261) +++ trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-20 20:56:12 UTC (rev 1262) @@ -79,8 +79,8 @@ } TMTag * -ggd_tag_find_from_line (GPtrArray *tags, - gulong line) +ggd_tag_find_from_line (const GPtrArray *tags, + gulong line) { TMTag *tag = NULL; TMTag *el; @@ -114,8 +114,8 @@ } TMTag * -ggd_tag_find_parent (GPtrArray *tags, - const TMTag *child) +ggd_tag_find_parent (const GPtrArray *tags, + const TMTag *child) { TMTag *tag = NULL; @@ -238,8 +238,8 @@ * Returns: the tag's type hierarchy or %NULL if invalid. */ gchar * -ggd_tag_resolve_type_hierarchy (GPtrArray *tags, - const TMTag *tag) +ggd_tag_resolve_type_hierarchy (const GPtrArray *tags, + const TMTag *tag) { gchar *scope = NULL; @@ -283,8 +283,8 @@ * Returns: The #TMTag named @name, or %NULL if none matches */ TMTag * -ggd_tag_find_from_name (GPtrArray *tags, - const gchar *name) +ggd_tag_find_from_name (const GPtrArray *tags, + const gchar *name) { TMTag *tag = NULL; guint i; @@ -365,9 +365,9 @@ * Returns: The list of found children */ GList * -ggd_tag_find_children (GPtrArray *tags, - const TMTag *parent, - gint depth) +ggd_tag_find_children (const GPtrArray *tags, + const TMTag *parent, + gint depth) { GList *children = NULL; guint i; Modified: trunk/geanygendoc/src/ggd-tag-utils.h =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.h 2010-04-20 20:55:44 UTC (rev 1261) +++ trunk/geanygendoc/src/ggd-tag-utils.h 2010-04-20 20:56:12 UTC (rev 1262) @@ -27,18 +27,18 @@ void ggd_tag_sort_by_line (GPtrArray *tags); -TMTag *ggd_tag_find_from_line (GPtrArray *tags, - gulong line); +TMTag *ggd_tag_find_from_line (const GPtrArray *tags, + gulong line); TMTag *ggd_tag_find_at_current_pos (GeanyDocument *doc); -TMTag *ggd_tag_find_parent (GPtrArray *tags, - const TMTag *child); -GList *ggd_tag_find_children (GPtrArray *tags, - const TMTag *parent, - gint depth); -gchar *ggd_tag_resolve_type_hierarchy (GPtrArray *tags, - const TMTag *tag); -TMTag *ggd_tag_find_from_name (GPtrArray *tags, - const gchar *name); +TMTag *ggd_tag_find_parent (const GPtrArray *tags, + const TMTag *child); +GList *ggd_tag_find_children (const GPtrArray *tags, + const TMTag *parent, + gint depth); +gchar *ggd_tag_resolve_type_hierarchy (const GPtrArray *tags, + const TMTag *tag); +TMTag *ggd_tag_find_from_name (const GPtrArray *tags, + const gchar *name); const gchar *ggd_tag_get_type_name (const TMTag *tag); const gchar *ggd_tag_type_get_name (TMTagType type); TMTagType ggd_tag_type_from_name (const gchar *name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1261] trunk/geanygendoc/src
by colombanw＠users.sourceforge.net 20 Apr '10

20 Apr '10

Revision: 1261 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1261&view=rev Author: colombanw Date: 2010-04-20 20:55:44 +0000 (Tue, 20 Apr 2010) Log Message: ----------- GeanyGenDoc: Add ggd_tag_sort_by_line() Add ggd_tag_sort_by_line() function that sorts a tag array by tag's line. Modified Paths: -------------- trunk/geanygendoc/src/ggd-tag-utils.c trunk/geanygendoc/src/ggd-tag-utils.h Modified: trunk/geanygendoc/src/ggd-tag-utils.c =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-20 20:55:17 UTC (rev 1260) +++ trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-20 20:55:44 UTC (rev 1261) @@ -70,6 +70,14 @@ return rv; } +void +ggd_tag_sort_by_line (GPtrArray *tags) +{ + g_return_if_fail (tags != NULL); + + g_ptr_array_sort (tags, tag_cmp_by_line); +} + TMTag * ggd_tag_find_from_line (GPtrArray *tags, gulong line) Modified: trunk/geanygendoc/src/ggd-tag-utils.h =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.h 2010-04-20 20:55:17 UTC (rev 1260) +++ trunk/geanygendoc/src/ggd-tag-utils.h 2010-04-20 20:55:44 UTC (rev 1261) @@ -26,6 +26,7 @@ G_BEGIN_DECLS +void ggd_tag_sort_by_line (GPtrArray *tags); TMTag *ggd_tag_find_from_line (GPtrArray *tags, gulong line); TMTag *ggd_tag_find_at_current_pos (GeanyDocument *doc); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1260] trunk/geanygendoc/src/ggd-tag-utils.c
by colombanw＠users.sourceforge.net 20 Apr '10

20 Apr '10

Revision: 1260 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1260&view=rev Author: colombanw Date: 2010-04-20 20:55:17 +0000 (Tue, 20 Apr 2010) Log Message: ----------- GeanyGenDoc: Improve tag search for a given line Make ggd_tag_find_from_line() use only a linear search rather than sorting the tag array and then doing an almost linear search. Benefits are probable speed improvement (array sorting isn't a cheap operation) and no more modification of the given tag array. Modified Paths: -------------- trunk/geanygendoc/src/ggd-tag-utils.c Modified: trunk/geanygendoc/src/ggd-tag-utils.c =================================================================== --- trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-19 21:26:52 UTC (rev 1259) +++ trunk/geanygendoc/src/ggd-tag-utils.c 2010-04-20 20:55:17 UTC (rev 1260) @@ -80,17 +80,10 @@ g_return_val_if_fail (tags != NULL, NULL); - /* FIXME: try to use an algorithm that doesn't need to have a sorted array. - * it would be faster (well, array sorting is probably everything but - * fast) and better as we wouldn't touch the array */ - /* sort the array to have the lines in the right order */ - g_ptr_array_sort (tags, tag_cmp_by_line); - /* FIXME: use dichotomy rather than a linear search? */ PTR_ARRAY_FOR (tags, i, el) { if (! (el->type & tm_tag_file_t)) { - if (el->atts.entry.line > line && tag) { - break; - } else { + if (el->atts.entry.line <= line && + (! tag || el->atts.entry.line > tag->atts.entry.line)) { tag = el; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits April 2010