Commits November 2024

commits@lists.geany.org

1 participants
67 discussions

[geany/geany] 8fad65: Update documentation
by Jiří Techet 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 20 Nov 2024 14:58:31 UTC Commit: 8fad65c66c6f088a78eeae2c0397ab4c4f470bee https://github.com/geany/geany/commit/8fad65c66c6f088a78eeae2c0397ab4c4f470… Log Message: ----------- Update documentation Modified Paths: -------------- HACKING doc/geany.txt Modified: HACKING 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -536,8 +536,7 @@ first (scintilla or ctags). If you want to reuse an existing lexer and/or tag parser, making a custom filetype is probably easier - it doesn't require any changes to the source code. Follow instructions in the manual: -https://geany.org/manual/index.html#custom-filetypes. Don't forget to -update the ``[Groups]`` section in ``filetype_extensions.conf``. +https://geany.org/manual/index.html#custom-filetypes. .. warning:: You should use the newer `[build-menu]` section for default build Modified: doc/geany.txt 29 lines changed, 0 insertions(+), 29 deletions(-) =================================================================== @@ -4219,7 +4219,6 @@ support for the following has been implemented: * Recognizing and setting the filetype (after the user has manually updated the `filetype extensions`_ file). -* `Filetype group membership`_. * Reading filetype settings in the ``[settings]`` section, including: * Using an existing syntax highlighting lexer (`lexer_filetype`_ key). * Using an existing tags parser (`tag_parser`_ key). @@ -4892,34 +4891,6 @@ should look like:: [Extensions] Make=Makefile*;*.mk;Buildfile; -Filetype group membership -^^^^^^^^^^^^^^^^^^^^^^^^^ -Filetype groups are used in the `Document->Set Filetype` menu. - -Group membership is also stored in ``filetype_extensions.conf``. This -file is used to store information Geany needs at startup, whereas the -separate filetype definition files hold information only needed when -a document with their filetype is used. - -The format looks like:: - - [Groups] - Programming=C;C++; - Script=Perl;Python; - Markup=HTML;XML; - Misc=Diff;Conf; - None=None; - -The key names cannot be configured. - -.. note:: - Group membership is only read at startup. - -.. tip:: - You can make commonly used filetypes appear in the top-level of the - filetype menu by adding them to the `None` group, e.g. - `None=C;Python`. - Preferences file format ----------------------- -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0b4732: Regroup filetypes by letter
by Jiří Techet 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 20 Nov 2024 14:58:23 UTC Commit: 0b4732d9f7fae9d7064c5330316f7ed654425294 https://github.com/geany/geany/commit/0b4732d9f7fae9d7064c5330316f7ed654425… Log Message: ----------- Regroup filetypes by letter This patch converts the currently used groups like "Programming languages", "Scripting languages", etc. to groups based on the starting letter of the language only. There are two main reasons for this change: 1. Some languages are hard to categorize by some semantic group name and the group names are not really fitting. In addition, the currently used group name "Programming languages" isn't very good as "Scripting languages" are also a subset of programming languages. On the other hand it's hard to find a good substitute for "Programming languages" - mostly these are "Compiled languages" but not always and some languages allow to be both interpreted and compiled which complicates the situation. 2. The "Programming languages" group is too big and the menu is so long that it doesn't fit the display on smaller screens and one has to scroll the menu to get to the right item which isn't user friendly. Things will get only worse as there are still many "Programming languages" that Geany does not support yet and that might be added to the editor in the future. The newly introduced alphabetic groups are: A-B C D-E-F G-H-I J-K-L M-N-O P-Q R-S T-U-V-W X-Y-Z These allow roughly even distribution of existing languages into smaller groups with enough space for possible future language additions. While it would be possible to make the group names more symmetrical, e.g. by having "R-S-T", "U-V-W", I found that the asymmetry helps quicker navigation as one remembers the group with his favorite language is e.g. "the one before the long group" without thinking where exactly in the alphabet the letter is. Some notes to the implementation: 1. It mostly follows the existing implementation trying to do minimal changes and doing things in a "dumb and straightforward way". This means that group names are hard coded (they could also be autogenerated, possibly auto-attempting to distribute languages into evenly sized groups). 2. Technically this change breaks API as it modifies GeanyFiletypeGroupID which is used for the group member of GeanyFiletype which is accessible to plugins. However, this member isn't documented to plugins and no existing plugin from geany-plugins uses it so probably not a big problem. 3. Because grouping happens automatically now, the [Groups] section from filetype_extensions.conf can be removed and is not read any more. 4. Because grouping happens automatically now, the [5] argument from FT_INIT() can be removed. 5. In addition, this patch also removes the [4] argument from FT_INIT() which determined the suffix in the filetype menu like "C++ source file" - IMO the "source file", "file", etc. suffix for all the languages in the menu introduced just a visual clutter and made legibility worse. In addition with the removal of [Groups] from filetype_extensions.conf in (3), it would not be possible to determine the right suffix for custom file types. 6. The newly introduced groups are untranslatable strings - there should be no need to translate those. 7. If users create a non-builtin filetype starting with a non-alphabetic character, it will be placed into a group called Other. This group won't be displayed if there are no such filetype. 8. Human-readable names of languages are converted to non-translatable strings because otherwise their placement into groups may be confusing. Also, these names should start with the same letter like the language name itself otherwise the grouping in Tools->Configuration Files-> Filetype Configuration might not correspond to the language name. Modified Paths: -------------- data/filetype_extensions.conf src/dialogs.c src/filetypes.c src/filetypes.h Modified: data/filetype_extensions.conf 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -88,11 +88,3 @@ YAML=*.yaml;*.yml; Zephir=*.zep; Zig=*.zig; None=*; - -# Note: restarting is required after editing groups -[Groups] -Programming=Arduino;Clojure;CUDA;Cython;Genie;Groovy;Kotlin;Scala;Swift;SystemVerilog; -Script=Dockerfile;Graphviz;TypeScript;Meson; -Markup= -Misc=JSON; -None= Modified: src/dialogs.c 60 lines changed, 46 insertions(+), 14 deletions(-) =================================================================== @@ -211,36 +211,68 @@ static void filetype_combo_cell_data_func(GtkCellLayout *cell_layout, GtkCellRen static GtkWidget *create_filetype_combo_box(void) { GtkTreeStore *store; - GtkTreeIter iter_compiled, iter_script, iter_markup, iter_misc, iter_detect; + GtkTreeIter iter_a_b, iter_c, iter_d_e_f, iter_g_h_i, iter_j_k_l, iter_m_n_o, + iter_p_q, iter_r_s, iter_t_u_v_w, iter_x_y_z, iter_other, iter_detect; GtkTreeIter *iter_parent; GtkWidget *combo; GtkCellRenderer *renderer; GSList *node; store = gtk_tree_store_new(2, G_TYPE_INT, G_TYPE_STRING); - gtk_tree_store_insert_with_values(store, &iter_detect, NULL, -1, + gtk_tree_store_insert_with_values(store, &iter_detect, NULL, -1, 0, -1 /* auto-detect */, 1, _("Detect from file"), -1); - gtk_tree_store_insert_with_values(store, &iter_compiled, NULL, -1, - 0, -1, 1, _("Programming Languages"), -1); - gtk_tree_store_insert_with_values(store, &iter_script, NULL, -1, - 0, -1, 1, _("Scripting Languages"), -1); - gtk_tree_store_insert_with_values(store, &iter_markup, NULL, -1, - 0, -1, 1, _("Markup Languages"), -1); - gtk_tree_store_insert_with_values(store, &iter_misc, NULL, -1, - 0, -1, 1, _("Miscellaneous"), -1); + gtk_tree_store_insert_with_values(store, &iter_a_b, NULL, -1, + 0, -1, 1, "A-B", -1); + gtk_tree_store_insert_with_values(store, &iter_c, NULL, -1, + 0, -1, 1, "C", -1); + gtk_tree_store_insert_with_values(store, &iter_d_e_f, NULL, -1, + 0, -1, 1, "D-E-F", -1); + gtk_tree_store_insert_with_values(store, &iter_g_h_i, NULL, -1, + 0, -1, 1, "G-H-I", -1); + gtk_tree_store_insert_with_values(store, &iter_j_k_l, NULL, -1, + 0, -1, 1, "J-K-L", -1); + gtk_tree_store_insert_with_values(store, &iter_m_n_o, NULL, -1, + 0, -1, 1, "M-N-O", -1); + gtk_tree_store_insert_with_values(store, &iter_p_q, NULL, -1, + 0, -1, 1, "P-Q", -1); + gtk_tree_store_insert_with_values(store, &iter_r_s, NULL, -1, + 0, -1, 1, "R-S", -1); + gtk_tree_store_insert_with_values(store, &iter_t_u_v_w, NULL, -1, + 0, -1, 1, "T-U-V-W", -1); + gtk_tree_store_insert_with_values(store, &iter_x_y_z, NULL, -1, + 0, -1, 1, "X-Y-Z", -1); + + foreach_slist (node, filetypes_by_title) + { + GeanyFiletype *ft = node->data; + + if (ft->group == GEANY_FILETYPE_GROUP_OTHER) + { + gtk_tree_store_insert_with_values(store, &iter_other, NULL, -1, + 0, -1, 1, _("Other"), -1); + break; + } + } foreach_slist (node, filetypes_by_title) { GeanyFiletype *ft = node->data; switch (ft->group) { - case GEANY_FILETYPE_GROUP_COMPILED: iter_parent = &iter_compiled; break; - case GEANY_FILETYPE_GROUP_SCRIPT: iter_parent = &iter_script; break; - case GEANY_FILETYPE_GROUP_MARKUP: iter_parent = &iter_markup; break; - case GEANY_FILETYPE_GROUP_MISC: iter_parent = &iter_misc; break; + case GEANY_FILETYPE_GROUP_A_B: iter_parent = &iter_a_b; break; + case GEANY_FILETYPE_GROUP_C: iter_parent = &iter_c; break; + case GEANY_FILETYPE_GROUP_D_E_F: iter_parent = &iter_d_e_f; break; + case GEANY_FILETYPE_GROUP_G_H_I: iter_parent = &iter_g_h_i; break; + case GEANY_FILETYPE_GROUP_J_K_L: iter_parent = &iter_j_k_l; break; + case GEANY_FILETYPE_GROUP_M_N_O: iter_parent = &iter_m_n_o; break; + case GEANY_FILETYPE_GROUP_P_Q: iter_parent = &iter_p_q; break; + case GEANY_FILETYPE_GROUP_R_S: iter_parent = &iter_r_s; break; + case GEANY_FILETYPE_GROUP_T_U_V_W: iter_parent = &iter_t_u_v_w; break; + case GEANY_FILETYPE_GROUP_X_Y_Z: iter_parent = &iter_x_y_z; break; + case GEANY_FILETYPE_GROUP_OTHER: iter_parent = &iter_other; break; case GEANY_FILETYPE_GROUP_NONE: default: iter_parent = NULL; } Modified: src/filetypes.c 292 lines changed, 146 insertions(+), 146 deletions(-) =================================================================== @@ -49,6 +49,7 @@ #include <stdlib.h> #include <string.h> +#include <ctype.h> #include <glib/gstdio.h> @@ -67,49 +68,68 @@ static void create_set_filetype_menu(gboolean config); static gchar *filetypes_get_filename(GeanyFiletype *ft, gboolean user); -enum TitleType +static GeanyFiletypeGroupID get_group(const gchar *name) { - TITLE_NONE, - TITLE_SOURCE_FILE, - TITLE_FILE, - TITLE_SCRIPT, - TITLE_DOCUMENT -}; - -/* Save adding many translation strings if the filetype name doesn't need translating */ -static gchar *filetype_make_title(const char *name, enum TitleType type) + gchar ch; + + if (EMPTY(name) || !isalpha(name[0])) + return GEANY_FILETYPE_GROUP_OTHER; + + ch = name[0]; + if (ch >= 'a') + ch -= 'a' - 'A'; + + if (ch >= 'A' && ch <= 'B') + return GEANY_FILETYPE_GROUP_A_B; + else if (ch == 'C') + return GEANY_FILETYPE_GROUP_C; + else if (ch >= 'D' && ch <= 'F') + return GEANY_FILETYPE_GROUP_D_E_F; + else if (ch >= 'G' && ch <= 'I') + return GEANY_FILETYPE_GROUP_G_H_I; + else if (ch >= 'J' && ch <= 'L') + return GEANY_FILETYPE_GROUP_J_K_L; + else if (ch >= 'M' && ch <= 'O') + return GEANY_FILETYPE_GROUP_M_N_O; + else if (ch >= 'P' && ch <= 'Q') + return GEANY_FILETYPE_GROUP_P_Q; + else if (ch >= 'R' && ch <= 'S') + return GEANY_FILETYPE_GROUP_R_S; + else if (ch >= 'T' && ch <= 'W') + return GEANY_FILETYPE_GROUP_T_U_V_W; + else if (ch >= 'X' && ch <= 'Z') + return GEANY_FILETYPE_GROUP_X_Y_Z; + + return GEANY_FILETYPE_GROUP_OTHER; +} + + +static GeanyFiletypeGroupID get_filetype_group(const gchar *title, const gchar *name) { - g_return_val_if_fail(name != NULL, NULL); + GeanyFiletypeGroupID ret; - switch (type) - { - case TITLE_SOURCE_FILE: return g_strdup_printf(_("%s source file"), name); - case TITLE_FILE: return g_strdup_printf(_("%s file"), name); - case TITLE_SCRIPT: return g_strdup_printf(_("%s script"), name); - case TITLE_DOCUMENT: return g_strdup_printf(_("%s document"), name); - case TITLE_NONE: /* fall through */ - default: return g_strdup(name); - } + if (g_strcmp0(name, "None") == 0) + return GEANY_FILETYPE_GROUP_NONE; + + return get_group(title); } /* name argument (ie filetype name) must not be translated as it is used for * filetype lookup. Use filetypes_get_display_name() instead.*/ static void ft_init(GeanyFiletypeID ft_id, TMParserType lang, const char *name, - const char *title_name, enum TitleType title_type, - GeanyFiletypeGroupID group_id) + const char *title_name) { GeanyFiletype *ft = filetypes[ft_id]; ft->lang = lang; ft->name = g_strdup(name); - ft->title = filetype_make_title((title_name != NULL) ? title_name : ft->name, title_type); - ft->group = group_id; + ft->title = g_strdup((title_name != NULL) ? title_name : ft->name); + ft->group = get_filetype_group(ft->title, ft->name); } /* Evil macro to save typing and make init_builtin_filetypes() more readable */ -#define FT_INIT(ft_id, parser_id, name, title_name, title_type, group_id) \ - ft_init(GEANY_FILETYPES_##ft_id, TM_PARSER_##parser_id, name, title_name, \ - TITLE_##title_type, GEANY_FILETYPE_GROUP_##group_id) +#define FT_INIT(ft_id, parser_id, name, title_name) \ + ft_init(GEANY_FILETYPES_##ft_id, TM_PARSER_##parser_id, name, title_name) /* Note: remember to update HACKING if this function is renamed. */ @@ -118,83 +138,82 @@ static void init_builtin_filetypes(void) /* Column legend: * [0] = Filetype constant (GEANY_FILETYPES_*) * [1] = CTags parser (TM_PARSER_*) - * [2] = Non-translated filetype name (*not* label for display) - * [3] = Translatable human filetype title prefix or NULL to use [2] - * [4] = Title type (TITLE_*) constant (ex. TITLE_SOURCE_FILE is 'source file' suffix) - * [5] = The filetype group constant (GEANY_FILETYPE_GROUP_*) - * -------------------------------------------------------------------------------------------------------------------------- - * [0] [1] [2] [3] [4] [5] */ - FT_INIT( NONE, NONE, "None", _("None"), NONE, NONE ); - FT_INIT( C, C, "C", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( CPP, CPP, "C++", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( OBJECTIVEC, OBJC, "Objective-C", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( CS, CSHARP, "C#", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( VALA, VALA, "Vala", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( D, D, "D", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( JAVA, JAVA, "Java", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( PASCAL, PASCAL, "Pascal", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( ASM, ASM, "ASM", "Assembler", SOURCE_FILE, COMPILED ); - FT_INIT( BASIC, FREEBASIC, "FreeBasic", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( FORTRAN, FORTRAN, "Fortran", "Fortran (F90)", SOURCE_FILE, COMPILED ); - FT_INIT( F77, FORTRAN, "F77", "Fortran (F77)", SOURCE_FILE, COMPILED ); - FT_INIT( GLSL, C, "GLSL", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( CAML, OCAML, "CAML", "(O)Caml", SOURCE_FILE, COMPILED ); - FT_INIT( PERL, PERL, "Perl", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( PHP, PHP, "PHP", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( JS, JAVASCRIPT, "Javascript", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( PYTHON, PYTHON, "Python", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( RUBY, RUBY, "Ruby", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( TCL, TCLOO, "Tcl", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( LUA, LUA, "Lua", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( GDSCRIPT, GDSCRIPT, "GDScript", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( HASKELL, HASKELL, "Haskell", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( MARKDOWN, MARKDOWN, "Markdown", NULL, SOURCE_FILE, MARKUP ); - FT_INIT( TXT2TAGS, TXT2TAGS, "Txt2tags", NULL, SOURCE_FILE, MARKUP ); - FT_INIT( ABC, ABC, "Abc", NULL, FILE, MISC ); - FT_INIT( SH, SH, "Sh", _("Shell"), SCRIPT, SCRIPT ); - FT_INIT( MAKE, MAKEFILE, "Make", _("Makefile"), NONE, SCRIPT ); - FT_INIT( XML, NONE, "XML", NULL, DOCUMENT, MARKUP ); - FT_INIT( DOCBOOK, DOCBOOK, "Docbook", NULL, DOCUMENT, MARKUP ); - FT_INIT( HTML, HTML, "HTML", NULL, DOCUMENT, MARKUP ); - FT_INIT( CSS, CSS, "CSS", _("Cascading Stylesheet"), NONE, MARKUP ); /* not really markup but fit quite well to HTML */ - FT_INIT( SQL, SQL, "SQL", NULL, FILE, MISC ); - FT_INIT( COBOL, COBOL, "COBOL", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( LATEX, LATEX, "LaTeX", NULL, SOURCE_FILE, MARKUP ); - FT_INIT( BIBTEX, BIBTEX, "BibTeX", NULL, SOURCE_FILE, MARKUP ); - FT_INIT( VHDL, VHDL, "VHDL", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( VERILOG, VERILOG, "Verilog", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( DIFF, DIFF, "Diff", NULL, FILE, MISC ); - FT_INIT( LISP, LISP, "Lisp", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( ERLANG, ERLANG, "Erlang", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( CONF, CONF, "Conf", _("Config"), FILE, MISC ); - FT_INIT( PO, NONE, "Po", _("Gettext translation"), FILE, MISC ); - FT_INIT( HAXE, HAXE, "Haxe", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( AS, ACTIONSCRIPT, "ActionScript", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( R, R, "R", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( REST, REST, "reStructuredText", NULL, SOURCE_FILE, MARKUP ); - FT_INIT( MATLAB, MATLAB, "Matlab/Octave", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( YAML, NONE, "YAML", NULL, FILE, MISC ); - FT_INIT( CMAKE, NONE, "CMake", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( NSIS, NSIS, "NSIS", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( ADA, ADA, "Ada", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( FORTH, FORTH, "Forth", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( ASCIIDOC, ASCIIDOC, "Asciidoc", NULL, SOURCE_FILE, MARKUP ); - FT_INIT( ABAQUS, ABAQUS, "Abaqus", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( BATCH, BATCH, "Batch", NULL, SCRIPT, SCRIPT ); - FT_INIT( POWERSHELL, POWERSHELL, "PowerShell", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( RUST, RUST, "Rust", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( GO, GO, "Go", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( ZEPHIR, ZEPHIR, "Zephir", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( SMALLTALK, NONE, "Smalltalk", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( JULIA, JULIA, "Julia", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( AU3, AUTOIT, "AutoIt", NULL, SCRIPT, SCRIPT ); - FT_INIT( RAKU, RAKU, "Raku", NULL, SOURCE_FILE, SCRIPT ); - FT_INIT( CIL, NONE, "CIL", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( PROLOG, NONE, "Prolog", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( NIM, NONE, "Nim", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( ZIG, NONE, "Zig", NULL, SOURCE_FILE, COMPILED ); - FT_INIT( DART, NONE, "Dart", NULL, SOURCE_FILE, COMPILED ); + * [2] = Non-translatable filetype name (*not* label for display) + * [3] = Non-translatable filetype label for display or NULL to use [2]. + * It should start with the same letter as [2] for correct categorization. + * ---------------------------------------------------------------------------------- + * [0] [1] [2] [3] */ + FT_INIT( NONE, NONE, "None", _("None") ); + FT_INIT( C, C, "C", NULL ); + FT_INIT( CPP, CPP, "C++", NULL ); + FT_INIT( OBJECTIVEC, OBJC, "Objective-C", NULL ); + FT_INIT( CS, CSHARP, "C#", NULL ); + FT_INIT( VALA, VALA, "Vala", NULL ); + FT_INIT( D, D, "D", NULL ); + FT_INIT( JAVA, JAVA, "Java", NULL ); + FT_INIT( PASCAL, PASCAL, "Pascal", NULL ); + FT_INIT( ASM, ASM, "ASM", "Assembler" ); + FT_INIT( BASIC, FREEBASIC, "FreeBasic", NULL ); + FT_INIT( FORTRAN, FORTRAN, "Fortran", "Fortran (F90)" ); + FT_INIT( F77, FORTRAN, "F77", "Fortran (F77)" ); + FT_INIT( GLSL, C, "GLSL", NULL ); + FT_INIT( CAML, OCAML, "CAML", "Caml/OCaml" ); + FT_INIT( PERL, PERL, "Perl", NULL ); + FT_INIT( PHP, PHP, "PHP", NULL ); + FT_INIT( JS, JAVASCRIPT, "Javascript", NULL ); + FT_INIT( PYTHON, PYTHON, "Python", NULL ); + FT_INIT( RUBY, RUBY, "Ruby", NULL ); + FT_INIT( TCL, TCLOO, "Tcl", NULL ); + FT_INIT( LUA, LUA, "Lua", NULL ); + FT_INIT( GDSCRIPT, GDSCRIPT, "GDScript", NULL ); + FT_INIT( HASKELL, HASKELL, "Haskell", NULL ); + FT_INIT( MARKDOWN, MARKDOWN, "Markdown", NULL ); + FT_INIT( TXT2TAGS, TXT2TAGS, "Txt2tags", NULL ); + FT_INIT( ABC, ABC, "Abc", NULL ); + FT_INIT( SH, SH, "Sh", "Shell" ); + FT_INIT( MAKE, MAKEFILE, "Make", "Makefile" ); + FT_INIT( XML, NONE, "XML", NULL ); + FT_INIT( DOCBOOK, DOCBOOK, "Docbook", NULL ); + FT_INIT( HTML, HTML, "HTML", NULL ); + FT_INIT( CSS, CSS, "CSS", NULL ); + FT_INIT( SQL, SQL, "SQL", NULL ); + FT_INIT( COBOL, COBOL, "COBOL", NULL ); + FT_INIT( LATEX, LATEX, "LaTeX", NULL ); + FT_INIT( BIBTEX, BIBTEX, "BibTeX", NULL ); + FT_INIT( VHDL, VHDL, "VHDL", NULL ); + FT_INIT( VERILOG, VERILOG, "Verilog", NULL ); + FT_INIT( DIFF, DIFF, "Diff", NULL ); + FT_INIT( LISP, LISP, "Lisp", NULL ); + FT_INIT( ERLANG, ERLANG, "Erlang", NULL ); + FT_INIT( CONF, CONF, "Conf", "Conf/Ini" ); + FT_INIT( PO, NONE, "Po", "Po (Gettext)" ); + FT_INIT( HAXE, HAXE, "Haxe", NULL ); + FT_INIT( AS, ACTIONSCRIPT, "ActionScript", NULL ); + FT_INIT( R, R, "R", NULL ); + FT_INIT( REST, REST, "reStructuredText", NULL ); + FT_INIT( MATLAB, MATLAB, "Matlab/Octave", NULL ); + FT_INIT( YAML, NONE, "YAML", NULL ); + FT_INIT( CMAKE, NONE, "CMake", NULL ); + FT_INIT( NSIS, NSIS, "NSIS", NULL ); + FT_INIT( ADA, ADA, "Ada", NULL ); + FT_INIT( FORTH, NONE, "Forth", NULL ); + FT_INIT( ASCIIDOC, ASCIIDOC, "Asciidoc", NULL ); + FT_INIT( ABAQUS, ABAQUS, "Abaqus", NULL ); + FT_INIT( BATCH, BATCH, "Batch", NULL ); + FT_INIT( POWERSHELL, POWERSHELL, "PowerShell", NULL ); + FT_INIT( RUST, RUST, "Rust", NULL ); + FT_INIT( COFFEESCRIPT, NONE, "CoffeeScript", NULL ); + FT_INIT( GO, GO, "Go", NULL ); + FT_INIT( ZEPHIR, ZEPHIR, "Zephir", NULL ); + FT_INIT( SMALLTALK, NONE, "Smalltalk", NULL ); + FT_INIT( JULIA, JULIA, "Julia", NULL ); + FT_INIT( AU3, AUTOIT, "AutoIt", NULL ); + FT_INIT( RAKU, RAKU, "Raku", NULL ); + FT_INIT( CIL, NONE, "CIL", NULL ); + FT_INIT( PROLOG, NONE, "Prolog", NULL ); + FT_INIT( NIM, NONE, "Nim", NULL ); + FT_INIT( ZIG, NONE, "Zig", NULL ); + FT_INIT( DART, NONE, "Dart", NULL ); } @@ -284,7 +303,8 @@ static void add_custom_filetype(const gchar *filename) ft = filetype_new(); ft->name = g_strdup(fn); - ft->title = filetype_make_title(ft->name, TITLE_FILE); + ft->title = g_strdup(ft->name); + ft->group = get_filetype_group(ft->title, ft->name); ft->priv->custom = TRUE; filetype_add(ft); geany_debug("Added filetype %s (%d).", ft->name, ft->id); @@ -437,10 +457,27 @@ static void create_set_filetype_menu(gboolean config) menu = config ? ui_widgets.config_files_filetype_menu : ui_lookup_widget(main_widgets.window, "set_filetype1_menu"); - group_menus[GEANY_FILETYPE_GROUP_COMPILED] = create_sub_menu(menu, _("_Programming Languages")); - group_menus[GEANY_FILETYPE_GROUP_SCRIPT] = create_sub_menu(menu, _("_Scripting Languages")); - group_menus[GEANY_FILETYPE_GROUP_MARKUP] = create_sub_menu(menu, _("_Markup Languages")); - group_menus[GEANY_FILETYPE_GROUP_MISC] = create_sub_menu(menu, _("M_iscellaneous")); + group_menus[GEANY_FILETYPE_GROUP_A_B] = create_sub_menu(menu, "A-B"); + group_menus[GEANY_FILETYPE_GROUP_C] = create_sub_menu(menu, "C"); + group_menus[GEANY_FILETYPE_GROUP_D_E_F] = create_sub_menu(menu, "D-E-F"); + group_menus[GEANY_FILETYPE_GROUP_G_H_I] = create_sub_menu(menu, "G-H-I"); + group_menus[GEANY_FILETYPE_GROUP_J_K_L] = create_sub_menu(menu, "J-K-L"); + group_menus[GEANY_FILETYPE_GROUP_M_N_O] = create_sub_menu(menu, "M-N-O"); + group_menus[GEANY_FILETYPE_GROUP_P_Q] = create_sub_menu(menu, "P-Q"); + group_menus[GEANY_FILETYPE_GROUP_R_S] = create_sub_menu(menu, "R-S"); + group_menus[GEANY_FILETYPE_GROUP_T_U_V_W] = create_sub_menu(menu, "T-U-V-W"); + group_menus[GEANY_FILETYPE_GROUP_X_Y_Z] = create_sub_menu(menu, "X-Y-Z"); + + foreach_slist(node, filetypes_by_title) + { + GeanyFiletype *ft = node->data; + + if (ft->group == GEANY_FILETYPE_GROUP_OTHER) + { + group_menus[GEANY_FILETYPE_GROUP_OTHER] = create_sub_menu(menu, _("Other")); + break; + } + } /* Append all filetypes to the menu */ foreach_slist(node, filetypes_by_title) @@ -1436,41 +1473,6 @@ static void read_extensions(GKeyFile *sysconfig, GKeyFile *userconfig) } -static void read_group(GKeyFile *config, const gchar *group_name, GeanyFiletypeGroupID group_id) -{ - gchar **names = g_key_file_get_string_list(config, "Groups", group_name, NULL, NULL); - gchar **name; - - foreach_strv(name, names) - { - GeanyFiletype *ft = filetypes_lookup_by_name(*name); - - if (ft) - { - ft->group = group_id; - if (ft->priv->custom && - (group_id == GEANY_FILETYPE_GROUP_COMPILED || group_id == GEANY_FILETYPE_GROUP_SCRIPT)) - { - SETPTR(ft->title, filetype_make_title(ft->name, TITLE_SOURCE_FILE)); - } - } - else - geany_debug("Filetype '%s' not found for group '%s'!", *name, group_name); - } - g_strfreev(names); -} - - -static void read_groups(GKeyFile *config) -{ - read_group(config, "Programming", GEANY_FILETYPE_GROUP_COMPILED); - read_group(config, "Script", GEANY_FILETYPE_GROUP_SCRIPT); - read_group(config, "Markup", GEANY_FILETYPE_GROUP_MARKUP); - read_group(config, "Misc", GEANY_FILETYPE_GROUP_MISC); - read_group(config, "None", GEANY_FILETYPE_GROUP_NONE); -} - - static void read_filetype_config(void) { gchar *sysconfigfile = g_build_filename(app->datadir, "filetype_extensions.conf", NULL); @@ -1482,8 +1484,6 @@ static void read_filetype_config(void) g_key_file_load_from_file(userconfig, userconfigfile, G_KEY_FILE_NONE, NULL); read_extensions(sysconfig, userconfig); - read_groups(sysconfig); - read_groups(userconfig); g_free(sysconfigfile); g_free(userconfigfile); Modified: src/filetypes.h 15 lines changed, 11 insertions(+), 4 deletions(-) =================================================================== @@ -128,10 +128,17 @@ GeanyFiletypeID; typedef enum { GEANY_FILETYPE_GROUP_NONE, - GEANY_FILETYPE_GROUP_COMPILED, - GEANY_FILETYPE_GROUP_SCRIPT, - GEANY_FILETYPE_GROUP_MARKUP, - GEANY_FILETYPE_GROUP_MISC, + GEANY_FILETYPE_GROUP_OTHER, + GEANY_FILETYPE_GROUP_A_B, + GEANY_FILETYPE_GROUP_C, + GEANY_FILETYPE_GROUP_D_E_F, + GEANY_FILETYPE_GROUP_G_H_I, + GEANY_FILETYPE_GROUP_J_K_L, + GEANY_FILETYPE_GROUP_M_N_O, + GEANY_FILETYPE_GROUP_P_Q, + GEANY_FILETYPE_GROUP_R_S, + GEANY_FILETYPE_GROUP_T_U_V_W, + GEANY_FILETYPE_GROUP_X_Y_Z, GEANY_FILETYPE_GROUP_COUNT } GeanyFiletypeGroupID; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 109d1e: Add alt.conf theme from Geany
by Jiří Techet 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 20 Nov 2024 14:14:13 UTC Commit: 109d1e34b7b21e56c1f2908145cbe5c4907b9d18 https://github.com/geany/geany-themes/commit/109d1e34b7b21e56c1f2908145cbe5… Log Message: ----------- Add alt.conf theme from Geany Modified Paths: -------------- AUTHORS colorschemes/alt.conf screenshots/alt.png Modified: AUTHORS 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,10 @@ abc-light.conf -------------- *irvirty <irvirty(at)gmail(dot)com> +alt.conf +-------------- + *Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + bespin.conf ----------- Alexandre da Silva (tm2gtksw2) Modified: colorschemes/alt.conf 114 lines changed, 114 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,114 @@ +# +# Copyright 2010 Nick Treleaven <nick(dot)treleaven(at)btinternet(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. +# + +[theme_info] +name=Alternate +description=Alternate Geany color scheme with styles like the Geany <= 0.19 Python/script defaults with gray comments. +version=0.01 +author=Nick Treleaven +url=https://github.com/geany/geany-themes + +[named_styles] + +default=0x000000;0xffffff;false;false +error=0xffffff;0xff0000 + +# Editor styles +#------------------------------------------------------------------------------- + +selection=0x000000;0xc0c0c0;false;true +current_line=0x000000;0xf0f0f0;true +brace_good=0x0000ff;0xFFFFFF;true;false +brace_bad=0xff0000;0xFFFFFF;true;false +margin_line_number=0x000000;0xd0d0d0 +margin_folding=0x000000;0xdfdfdf +fold_symbol_highlight=0xffffff +indent_guide=0xc0c0c0 +caret=0x000000;0x000000;false +marker_line=0x000000;0xffff00 +marker_search=0x000000;0x0000f0 +marker_mark=0x000000;0xb8f4b8 +call_tips=0xc0c0c0;0xffffff;false;false +white_space=0xc0c0c0;0xffffff;true;false + +# Programming languages +#------------------------------------------------------------------------------- + +comment=0x808080 +comment_doc=0x404000 +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc,bold +comment_doc_keyword_error=comment_doc,italic + +number=0x400080 +number_1=number +number_2=number_1 + +type=0x2E8B57;;true +class=type +function=0x000080 +parameter=function + +keyword=0x003030;;true +keyword_1=keyword +keyword_2=0x9f0200;;true +keyword_3=keyword_1 +keyword_4=keyword_1 + +identifier=default +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 + +string=0x008000 +string_1=string +string_2=string_1 +string_3=default +string_4=default +string_eol=0x000000;0xe0c0e0 +character=string_1 +backticks=string_2 +here_doc=string_2 + +label=default,bold +preprocessor=0x808000 +regex=number_1 +operator=0x300080 +decorator=string_1,bold +other=0x404080 + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=type +tag_unknown=tag,bold +tag_end=tag,bold +attribute=keyword_1 +attribute_unknown=attribute,bold +value=string_1 +entity=default + +# Diff +#------------------------------------------------------------------------------- + +line_added=0x008B8B +line_removed=0x6A5ACD +line_changed=preprocessor Modified: screenshots/alt.png 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ffc8f6: filetypes.verilog: add Verilog-2005 keywords
by Javier Mora 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Javier Mora <cousteaulecommandant(a)gmail.com> Committer: Javier Mora <cousteaulecommandant(a)gmail.com> Date: Sat, 16 Nov 2024 21:11:43 UTC Commit: ffc8f62b5d94625e614c53784bc1f3a7b00140d7 https://github.com/geany/geany/commit/ffc8f62b5d94625e614c53784bc1f3a7b0014… Log Message: ----------- filetypes.verilog: add Verilog-2005 keywords - Add Verilog-2001 and Verilog-2005 keywords to filetypes.verilog (right now only Verilog-1995 keywords are highlighted). These keywords were already included in ctags. - Add all System tasks and functions as of Verilog-2005 to `word2` list (right now only a handful appear; perhaps from an older standard). Details on added/removed keywords: Add new keywords from Verilog-2001 and Verilog-2005 standard (Annex B) (right now only Verilog-1995 keywords are listed): automatic generate endgenerate genvar localparam uwire config endconfig cell design instance liblist use library incdir include pulsestyle_ondetect pulsestyle_onevent showcancelled noshowcancelled Remove invalid Verilog keywords: attribute endattribute strength @ Put all "keywords used to declare nets/variables/constants/events" in `word3` list; leave rest in `word`. Add all functions/tasks listed under "System tasks and functions" in the Verilog-2005 standard (chapter 17). Modified Paths: -------------- data/filedefs/filetypes.verilog Modified: data/filedefs/filetypes.verilog 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -23,9 +23,9 @@ port_connect=keyword_4 [keywords] # all items must be in one line -word=always and assign attribute begin buf bufif0 bufif1 case casex casez cmos deassign default defparam disable edge else end endattribute endcase endfunction endmodule endprimitive endspecify endtable endtask event for force forever fork function highz0 highz1 if ifnone initial join medium module large macromodule nand negedge nmos nor not notif0 notif1 or parameter pmos posedge primitive pull0 pull1 pulldown pullup rcmos realtime release repeat rnmos rpmos rtran rtranif0 rtranif1 scalared signed small specify specparam strength strong0 strong1 supply0 supply1 table task tran tranif0 tranif1 tri tri0 tri1 triand trior trireg unsigned vectored wait wand weak0 weak1 while wor xnor xor @ -word2=$display $write $fdisplay $fwrite $strobe $fstrobe $monitor $fmonitor $time $realtime $finish $stop $setup $hold $width $setuphold $readmemb $readmemh $sreadmemb $sreadmemh $getpattern $history $save $restart $incsave $shm_open $shm_probe $shm_close $scale $showscopes $showvars -word3=real integer time reg wire input output inout +word=always and assign automatic begin buf bufif0 bufif1 case casex casez cell cmos config deassign default defparam design disable edge else end endcase endconfig endfunction endgenerate endmodule endprimitive endspecify endtable endtask for force forever fork function generate if ifnone incdir include initial instance join liblist library macromodule module nand negedge nmos nor noshowcancelled not notif0 notif1 or pmos posedge primitive pulldown pullup pulsestyle_ondetect pulsestyle_onevent rcmos release repeat rnmos rpmos rtran rtranif0 rtranif1 showcancelled specify table task tran tranif0 tranif1 use wait while xnor xor +word2=$acos $acosh $asin $asinh $async$and$array $async$and$plane $async$nand$array $async$nand$plane $async$nor$array $async$nor$plane $async$or$array $async$or$plane $atan $atan2 $atanh $bitstoreal $ceil $clog2 $cos $cosh $display $displayb $displayh $displayo $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $exp $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $feof $ferror $fflush $fgetc $fgets $finish $floor $fmonitor $fmonitorb $fmonitorh $fmonitoro $fopen $fread $fscanf $fseek $fstrobe $fstrobeb $fstrobeh $fstrobeo $ftell $fwrite $fwriteb $fwriteh $fwriteo $hypot $itor $ln $log10 $monitor $monitorb $monitorh $monitoro $monitoroff $monitoron $pow $printtimescale $q_add $q_exam $q_full $q_initialize $q_remove $random $readmemb $readmemh $realtime $realtobits $rewind $rtoi $sdf_annotate $sformat $signed $sin $sinh $sqrt $sscanf $stime $stop $strobe $strobeb $strobeh $strobeo $swrite $swriteb $swriteh $swriteo $sync$and$array $syn c$and$plane $sync$nand$array $sync$nand$plane $sync$nor$array $sync$nor$plane $sync$or$array $sync$or$plane $tan $tanh $test$plusargs $time $timeformat $ungetc $unsigned $value$plusargs $write $writeb $writeh $writeo +word3=event genvar highz0 highz1 inout input integer large localparam medium output parameter pull0 pull1 real realtime reg scalared signed small specparam strong0 strong1 supply0 supply1 time tri tri0 tri1 triand trior trireg unsigned uwire vectored wand weak0 weak1 wire wor docComment= [settings] @@ -37,7 +37,7 @@ mime_type=text/x-verilog # these characters define word boundaries when making selections and searching # using word matching options -#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_$abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # single comments, like # in this file comment_single=// -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 382776: Merge pull request #4037 from cousteaulecommandant/verilog_keywords
by Jiří Techet 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 20 Nov 2024 13:50:04 UTC Commit: 382776fd3e5c09cc9c005798d2d1e6a2d7a666f8 https://github.com/geany/geany/commit/382776fd3e5c09cc9c005798d2d1e6a2d7a66… Log Message: ----------- Merge pull request #4037 from cousteaulecommandant/verilog_keywords filetypes.verilog: add Verilog-2005 keywords Modified Paths: -------------- data/filedefs/filetypes.verilog Modified: data/filedefs/filetypes.verilog 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -23,9 +23,9 @@ port_connect=keyword_4 [keywords] # all items must be in one line -word=always and assign attribute begin buf bufif0 bufif1 case casex casez cmos deassign default defparam disable edge else end endattribute endcase endfunction endmodule endprimitive endspecify endtable endtask event for force forever fork function highz0 highz1 if ifnone initial join medium module large macromodule nand negedge nmos nor not notif0 notif1 or parameter pmos posedge primitive pull0 pull1 pulldown pullup rcmos realtime release repeat rnmos rpmos rtran rtranif0 rtranif1 scalared signed small specify specparam strength strong0 strong1 supply0 supply1 table task tran tranif0 tranif1 tri tri0 tri1 triand trior trireg unsigned vectored wait wand weak0 weak1 while wor xnor xor @ -word2=$display $write $fdisplay $fwrite $strobe $fstrobe $monitor $fmonitor $time $realtime $finish $stop $setup $hold $width $setuphold $readmemb $readmemh $sreadmemb $sreadmemh $getpattern $history $save $restart $incsave $shm_open $shm_probe $shm_close $scale $showscopes $showvars -word3=real integer time reg wire input output inout +word=always and assign automatic begin buf bufif0 bufif1 case casex casez cell cmos config deassign default defparam design disable edge else end endcase endconfig endfunction endgenerate endmodule endprimitive endspecify endtable endtask for force forever fork function generate if ifnone incdir include initial instance join liblist library macromodule module nand negedge nmos nor noshowcancelled not notif0 notif1 or pmos posedge primitive pulldown pullup pulsestyle_ondetect pulsestyle_onevent rcmos release repeat rnmos rpmos rtran rtranif0 rtranif1 showcancelled specify table task tran tranif0 tranif1 use wait while xnor xor +word2=$acos $acosh $asin $asinh $async$and$array $async$and$plane $async$nand$array $async$nand$plane $async$nor$array $async$nor$plane $async$or$array $async$or$plane $atan $atan2 $atanh $bitstoreal $ceil $clog2 $cos $cosh $display $displayb $displayh $displayo $dist_chi_square $dist_erlang $dist_exponential $dist_normal $dist_poisson $dist_t $dist_uniform $exp $fclose $fdisplay $fdisplayb $fdisplayh $fdisplayo $feof $ferror $fflush $fgetc $fgets $finish $floor $fmonitor $fmonitorb $fmonitorh $fmonitoro $fopen $fread $fscanf $fseek $fstrobe $fstrobeb $fstrobeh $fstrobeo $ftell $fwrite $fwriteb $fwriteh $fwriteo $hypot $itor $ln $log10 $monitor $monitorb $monitorh $monitoro $monitoroff $monitoron $pow $printtimescale $q_add $q_exam $q_full $q_initialize $q_remove $random $readmemb $readmemh $realtime $realtobits $rewind $rtoi $sdf_annotate $sformat $signed $sin $sinh $sqrt $sscanf $stime $stop $strobe $strobeb $strobeh $strobeo $swrite $swriteb $swriteh $swriteo $sync$and$array $syn c$and$plane $sync$nand$array $sync$nand$plane $sync$nor$array $sync$nor$plane $sync$or$array $sync$or$plane $tan $tanh $test$plusargs $time $timeformat $ungetc $unsigned $value$plusargs $write $writeb $writeh $writeo +word3=event genvar highz0 highz1 inout input integer large localparam medium output parameter pull0 pull1 real realtime reg scalared signed small specparam strong0 strong1 supply0 supply1 time tri tri0 tri1 triand trior trireg unsigned uwire vectored wand weak0 weak1 wire wor docComment= [settings] @@ -37,7 +37,7 @@ mime_type=text/x-verilog # these characters define word boundaries when making selections and searching # using word matching options -#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 +#wordchars=_$abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # single comments, like # in this file comment_single=// -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4b7c56: Add SystemVerilog ctags unit tests
by Javier Mora 20 Nov '24

20 Nov '24

Branch: refs/heads/master Author: Javier Mora <cousteaulecommandant(a)gmail.com> Committer: Javier Mora <cousteaulecommandant(a)gmail.com> Date: Mon, 18 Nov 2024 23:33:09 UTC Commit: 4b7c56e5f482d2fb562fe81bd45b8641c5642828 https://github.com/geany/geany/commit/4b7c56e5f482d2fb562fe81bd45b8641c5642… Log Message: ----------- Add SystemVerilog ctags unit tests Added two ctags unit tests for SystemVerilog: one with a "normal" design (an executable testbench) to exercise logic and simulation constructs, and one with a package and several OOP-related constructs. It should be noted that some incorrect behavior has been found in ctags when writing the tests; these were written down as comments in the test files, and should be fixed in upstream ctags. Modified Paths: -------------- tests/ctags/Makefile.am tests/ctags/oop.sv tests/ctags/oop.sv.tags tests/ctags/sysverilog.sv tests/ctags/sysverilog.sv.tags tests/meson.build Modified: tests/ctags/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -263,6 +263,7 @@ test_sources = \ objectivec_interface.mm \ objectivec_property.mm \ objectivec_protocol.mm \ + oop.sv \ Package.pm \ php5_5_class_kw.php \ parenthesis-rvalue.js \ @@ -341,6 +342,7 @@ test_sources = \ strings.php \ strings.rb \ structure.f \ + sysverilog.sv \ tabindent.py \ test.erl \ test.go \ Modified: tests/ctags/oop.sv 145 lines changed, 145 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,145 @@ +/* Tests the following SystemVerilog ctags: + * - [x] constant + * - [x] define + * - [ ] event + * - [x] function + * - [ ] module + * - [ ] net + * - [ ] port + * - [x] register + * - [x] task + * - [ ] block + * - [ ] instance + * - [x] class + * - [x] enum + * - [x] interface + * - [x] modport + * - [x] package + * - [ ] program + * - [x] prototype + * - [x] struct + * - [x] typedef + * - [z] member + * - [x] ifclass + * - [x] nettype + */ + +package oop; + +`define MACRO 1234 // NB: Shouldn't the ctag for this be outside of the package? (ctags bug?) + +/* Constants */ + +const int ANSWER_TO_LIFE = 42; +localparam real APPROX_PI = 3.14; + +/* Methods */ + +task display_int(int x); + $display("%0d", x); +endtask + +function automatic resolve_nettype(real driver[]); + resolve_nettype = 0.0; + foreach (driver[i]) + resolve_nettype += driver[i]; +endfunction + +/* Typedefs */ + +nettype real net_t with resolve_nettype; + +typedef struct packed { + logic [7:0] data; + logic parity; +} struct_t; + +typedef union packed { + logic [7:0] data; + logic [3:0] control; +} union_t; + +typedef enum { + red, + yellow, + green +} enum_t; + +/* Classes */ + +interface class ifclass #( + type T = logic +); + pure virtual function T get_value(); + pure virtual function void set_value(T x); +endclass : ifclass + +class a_class implements ifclass #(int); + + int value; + + virtual function int get_value(); + get_value = value; + endfunction + + virtual function void put_value(int x); + value = x; + endfunction + + task print_value(); + $display("value = %0d", value); + endtask + + function value_plus(int x); + value_plus = value + x; + endfunction + +endclass : a_class + +class other_class; + + struct packed { + byte s_a, s_b, s_c; + string s_str; + } s_member; + + union packed { + byte u_a; + int u_b; + } u_member; + + enum { ready, steady, go } e_member; + + struct_t st_member; + union_t ut_member; + enum_t et_member; + +endclass : other_class + +/*virtual*/ class vclass; // NB: ctags bug!! Declaring class as virtual inhibits detection of next element. + pure virtual function void do_something(); +endclass : vclass + +/* Interface (not related to "interface class") */ + +interface spi; + + logic sclk; + logic cs_n; + logic mosi; + logic miso; + + modport master (output sclk, cs_n, mosi, input miso); + modport slave (input sclk, cs_n, mosi, output miso); + + task enable_cs(); + cs_n <= 1'b0; + endtask + + task disable_cs(); + cs_n <= 1'b1; + endtask + +endinterface : spi + +endpackage : oop Modified: tests/ctags/oop.sv.tags 118 lines changed, 118 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,118 @@ +ANSWER_TO_LIFE�16384�oop�0 +variable: oop :: ANSWER_TO_LIFE +APPROX_PI�8�oop�0 +field: oop :: APPROX_PI +MACRO�65536�oop�0 +macro: oop :: MACRO +T�8�oop.ifclass�0 +field: oop.ifclass :: T +a_class�1�oop�0 +class: oop :: a_class +control�64�oop.union_t�0 +member: oop.union_t :: control +cs_n�16384�oop.spi�0 +variable: oop.spi :: cs_n +data�64�oop.struct_t�0 +member: oop.struct_t :: data +data�64�oop.union_t�0 +member: oop.union_t :: data +disable_cs�16�oop.spi�0 +function: oop.spi :: disable_cs +display_int�16�oop�0 +function: oop :: display_int +do_something�16�oop.vclass�0 +function: oop.vclass :: do_something +driver�32768�oop.resolve_nettype�0 +externvar: oop.resolve_nettype :: driver +e_member�2�oop.other_class�0 +enum: oop.other_class :: e_member +enable_cs�16�oop.spi�0 +function: oop.spi :: enable_cs +enum_t�4096�oop�0 +typedef: oop :: enum_t +et_member�16384�oop.other_class�0 +variable: oop.other_class :: et_member +get_value�16�oop.a_class�0 +function: oop.a_class :: get_value +get_value�16�oop.ifclass�0 +function: oop.ifclass :: get_value +go�8�oop.other_class.e_member�0 +field: oop.other_class.e_member :: go +green�8�oop.enum_t�0 +field: oop.enum_t :: green +ifclass�1�oop�0 +class: oop :: ifclass +master�8192�oop.spi�0 +union: oop.spi :: master +miso�16384�oop.spi�0 +variable: oop.spi :: miso +mosi�16384�oop.spi�0 +variable: oop.spi :: mosi +net_t�4096�oop�0 +typedef: oop :: net_t +oop�512�0 +package: oop +other_class�1�oop�0 +class: oop :: other_class +parity�64�oop.struct_t�0 +member: oop.struct_t :: parity +print_value�16�oop.a_class�0 +function: oop.a_class :: print_value +put_value�16�oop.a_class�0 +function: oop.a_class :: put_value +ready�8�oop.other_class.e_member�0 +field: oop.other_class.e_member :: ready +red�8�oop.enum_t�0 +field: oop.enum_t :: red +resolve_nettype�16�oop�0 +function: oop :: resolve_nettype +s_a�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_a +s_b�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_b +s_c�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_c +s_member�2048�oop.other_class�0 +struct: oop.other_class :: s_member +s_str�64�oop.other_class.s_member�0 +member: oop.other_class.s_member :: s_str +sclk�16384�oop.spi�0 +variable: oop.spi :: sclk +set_value�16�oop.ifclass�0 +function: oop.ifclass :: set_value +slave�8192�oop.spi�0 +union: oop.spi :: slave +spi�32�oop�0 +interface: oop :: spi +st_member�16384�oop.other_class�0 +variable: oop.other_class :: st_member +steady�8�oop.other_class.e_member�0 +field: oop.other_class.e_member :: steady +struct_t�4096�oop�0 +typedef: oop :: struct_t +u_a�64�oop.other_class.u_member�0 +member: oop.other_class.u_member :: u_a +u_b�64�oop.other_class.u_member�0 +member: oop.other_class.u_member :: u_b +u_member�2048�oop.other_class�0 +struct: oop.other_class :: u_member +union_t�4096�oop�0 +typedef: oop :: union_t +ut_member�16384�oop.other_class�0 +variable: oop.other_class :: ut_member +value�16384�oop.a_class�0 +variable: oop.a_class :: value +value_plus�16�oop.a_class�0 +function: oop.a_class :: value_plus +vclass�1�oop�0 +class: oop :: vclass +x�32768�oop.a_class.put_value�0 +externvar: oop.a_class.put_value :: x +x�32768�oop.a_class.value_plus�0 +externvar: oop.a_class.value_plus :: x +x�32768�oop.display_int�0 +externvar: oop.display_int :: x +x�32768�oop.ifclass.set_value�0 +externvar: oop.ifclass.set_value :: x +yellow�8�oop.enum_t�0 +field: oop.enum_t :: yellow Modified: tests/ctags/sysverilog.sv 192 lines changed, 192 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,192 @@ +/* Tests the following SystemVerilog ctags: + * - [x] constant + * - [x] define + * - [x] event + * - [x] function + * - [x] module + * - [x] net + * - [x] port + * - [x] register + * - [x] task + * - [x] block + * - [x] instance + * - [ ] class + * - [ ] enum + * - [ ] interface + * - [ ] modport + * - [ ] package + * - [x] program + * - [ ] prototype + * - [ ] struct + * - [ ] typedef + * - [ ] member + * - [ ] ifclass + * - [ ] nettype + */ + +`timescale 1ns/1ps +`default_nettype none + +`define DEFAULT_WIDTH 32 +`define BITS_TO_BYTES(x) ((x)/8) + +module a_module #( + parameter WIDTH = `DEFAULT_WIDTH, + localparam BYTES = `BITS_TO_BYTES(WIDTH) +) ( + input clk, reset, + input logic [WIDTH-1:0] data_in, + input logic valid, + input wire [BYTES-1:0] byte_en, + output wire [WIDTH-1:0] data_out +); + + wire be_filtered [BYTES-1:0]; + + genvar i; + generate + for (i = 0; i < BYTES; i++) begin : be_filtered_gen + logic x; + and and_gate ( // NB: this SHOULD be detected as an instance (ctags bug?) + x, + byte_en[i], + valid + ); + assign be_filtered[i] = x; + end + endgenerate + + wire [BYTES-1:0][7:0] data_in_bytes; + reg [BYTES-1:0][7:0] data_out_bytes; + + assign data_in_bytes = data_in; + assign data_out = data_out_bytes; + + always @(posedge clk, posedge reset) begin : main_block + if (reset) + data_out_bytes <= '0; + else begin + int i; + for (i = 0; i < BYTES; i++) + if (be_filtered[i]) + data_out_bytes[i] <= data_in_bytes[i]; + end + end + +endmodule : a_module + +program generate_signals #( + parameter NUM_UUT = 4, + parameter UUT_WIDTH = 64, + localparam UUT_BYTES = `BITS_TO_BYTES(UUT_WIDTH) +) ( + input logic clk, reset, + output logic [UUT_WIDTH-1:0] data_in, + output logic valid_uut [NUM_UUT-1:0], + output logic [UUT_BYTES-1:0] byte_en, + output event finished // NB: counts as "port", not "event" +); + + task write_byte( + byte byte_data, + int byte_index, + int uut_index + ); + begin + logic [UUT_BYTES-1:0][7:0] data_in_bytes; + data_in_bytes = '0; + data_in_bytes[byte_index] = byte_data; + data_in = data_in_bytes; + byte_en = UUT_BYTES'(1) << byte_index; + + valid_uut[uut_index] <= 1'b1; + @(posedge clk); + valid_uut[uut_index] <= 1'b0; + end + endtask + + initial begin + @(negedge reset); + @(posedge clk); + + write_byte(8'h12, 3, 0); + write_byte(8'h34, 2, 0); + write_byte(8'h56, 1, 0); + write_byte(8'h78, 0, 0); + + @(posedge clk); + + -> finished; + end + +endprogram : generate_signals + +module testbench; + + localparam NUM_UUT = 4; + localparam UUT_WIDTH = 64; + localparam UUT_BYTES = `BITS_TO_BYTES(UUT_WIDTH); + + logic clk = 1'b0, reset = 1'b0; + logic [UUT_WIDTH-1:0] data_in; + logic valid_uut [NUM_UUT-1:0]; + logic [UUT_BYTES-1:0] byte_en; + + generate + for (genvar j = 0; j < NUM_UUT; j++) begin : uut_gen + logic [UUT_WIDTH-1:0] data_out; + a_module #( // NB: this SHOULDN'T be detected as a module declaration (ctags bug) + .WIDTH (UUT_WIDTH) + ) uut ( // but this should be detected as an instance (ctags works) + .valid (valid_uut[j]), + .* + ); + end + endgenerate + + event trigger_success, trigger_failure, finished; + + function logic compare( + logic [UUT_BYTES-1:0][7:0] A, B, + logic [UUT_BYTES-1:0] mask + ); + begin + int i; + for (i = 0; i < UUT_BYTES; i++) + if (mask[i] && (A[i] != B[i])) begin + return 1'b0; + end + compare = 1'b1; // same as return 1'b1 + end + endfunction + + always begin : clk_gen + clk = ~clk; + #0.5; + end + + initial begin : reset_gen + reset = 1'b1; + #3.5; + reset = 1'b0; + end + + generate_signals #( + .NUM_UUT (NUM_UUT), + .UUT_WIDTH (UUT_WIDTH) + ) gen_signals ( + .* + ); + + initial begin + @finished; + + if (compare(uut_gen[0].data_out, 64'h 00000000_12_34_56_78, 8'b 0000_1111)) + $display("Comparison succeeded."); + else + $display("Comparison failed!"); + + $finish; + end + +endmodule : testbench Modified: tests/ctags/sysverilog.sv.tags 118 lines changed, 118 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,118 @@ +A�32768�testbench.compare�0 +externvar: testbench.compare :: A +B�32768�testbench.compare�0 +externvar: testbench.compare :: B +BITS_TO_BYTES�65536�0 +macro: BITS_TO_BYTES +BYTES�8�a_module�0 +field: a_module :: BYTES +DEFAULT_WIDTH�65536�0 +macro: DEFAULT_WIDTH +NUM_UUT�8�generate_signals�0 +field: generate_signals :: NUM_UUT +NUM_UUT�8�testbench�0 +field: testbench :: NUM_UUT +UUT_BYTES�8�generate_signals�0 +field: generate_signals :: UUT_BYTES +UUT_BYTES�8�testbench�0 +field: testbench :: UUT_BYTES +UUT_WIDTH�8�generate_signals�0 +field: generate_signals :: UUT_WIDTH +UUT_WIDTH�8�testbench�0 +field: testbench :: UUT_WIDTH +WIDTH�8�a_module�0 +field: a_module :: WIDTH +a_module�1024�0 +prototype: a_module +a_module�1024�testbench.uut_gen�0 +prototype: testbench.uut_gen :: a_module +be_filtered�16384�a_module�0 +variable: a_module :: be_filtered +be_filtered_gen�256�a_module�0 +namespace: a_module :: be_filtered_gen +byte_data�32768�generate_signals.write_byte�0 +externvar: generate_signals.write_byte :: byte_data +byte_en�16384�testbench�0 +variable: testbench :: byte_en +byte_en�32768�a_module�0 +externvar: a_module :: byte_en +byte_en�32768�generate_signals�0 +externvar: generate_signals :: byte_en +byte_index�32768�generate_signals.write_byte�0 +externvar: generate_signals.write_byte :: byte_index +clk�16384�testbench�0 +variable: testbench :: clk +clk�32768�a_module�0 +externvar: a_module :: clk +clk�32768�generate_signals�0 +externvar: generate_signals :: clk +clk_gen�256�testbench�0 +namespace: testbench :: clk_gen +compare�16�testbench�0 +function: testbench :: compare +data_in�16384�testbench�0 +variable: testbench :: data_in +data_in�32768�a_module�0 +externvar: a_module :: data_in +data_in�32768�generate_signals�0 +externvar: generate_signals :: data_in +data_in_bytes�16384�a_module�0 +variable: a_module :: data_in_bytes +data_in_bytes�16384�generate_signals.write_byte�0 +variable: generate_signals.write_byte :: data_in_bytes +data_out�16384�testbench.uut_gen�0 +variable: testbench.uut_gen :: data_out +data_out�32768�a_module�0 +externvar: a_module :: data_out +data_out_bytes�16384�a_module�0 +variable: a_module :: data_out_bytes +finished�16384�testbench�0 +variable: testbench :: finished +finished�32768�generate_signals�0 +externvar: generate_signals :: finished +gen_signals�4�testbench�0�generate_signals +enumerator: generate_signals testbench :: gen_signals +generate_signals�1024�0 +prototype: generate_signals +generate_signals�1024�testbench�0 +prototype: testbench :: generate_signals +i�16384�a_module�0 +variable: a_module :: i +i�16384�a_module.main_block�0 +variable: a_module.main_block :: i +i�16384�testbench.compare�0 +variable: testbench.compare :: i +main_block�256�a_module�0 +namespace: a_module :: main_block +mask�32768�testbench.compare�0 +externvar: testbench.compare :: mask +reset�16384�testbench�0 +variable: testbench :: reset +reset�32768�a_module�0 +externvar: a_module :: reset +reset�32768�generate_signals�0 +externvar: generate_signals :: reset +reset_gen�256�testbench�0 +namespace: testbench :: reset_gen +testbench�1024�0 +prototype: testbench +trigger_failure�16384�testbench�0 +variable: testbench :: trigger_failure +trigger_success�16384�testbench�0 +variable: testbench :: trigger_success +uut�4�testbench.uut_gen�0�a_module +enumerator: a_module testbench.uut_gen :: uut +uut_gen�256�testbench�0 +namespace: testbench :: uut_gen +uut_index�32768�generate_signals.write_byte�0 +externvar: generate_signals.write_byte :: uut_index +valid�32768�a_module�0 +externvar: a_module :: valid +valid_uut�16384�testbench�0 +variable: testbench :: valid_uut +valid_uut�32768�generate_signals�0 +externvar: generate_signals :: valid_uut +write_byte�16�generate_signals�0 +function: generate_signals :: write_byte +x�16384�a_module.be_filtered_gen�0 +variable: a_module.be_filtered_gen :: x Modified: tests/meson.build 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -260,6 +260,7 @@ ctags_tests = [ 'ctags/objectivec_interface.mm.tags', 'ctags/objectivec_property.mm.tags', 'ctags/objectivec_protocol.mm.tags', + 'ctags/oop.sv.tags', 'ctags/Package.pm.tags', 'ctags/php5_5_class_kw.php.tags', 'ctags/parenthesis-rvalue.js.tags', @@ -338,6 +339,7 @@ ctags_tests = [ 'ctags/strings.php.tags', 'ctags/strings.rb.tags', 'ctags/structure.f.tags', + 'ctags/sysverilog.sv.tags', 'ctags/tabindent.py.tags', 'ctags/test.erl.tags', 'ctags/test.go.tags', -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 85564a: Split SystemVerilog keywords into type / not type
by Javier Mora 20 Nov '24

20 Nov '24

1 0

[geany/geany] b26b7f: Add missing SystemVerilog tasks/functions
by Javier Mora 20 Nov '24

20 Nov '24

1 0

[geany/geany] e7a215: Regenerate Verilog ctags unit tests
by Javier Mora 20 Nov '24

20 Nov '24

1 0

[geany/geany] bee607: tagmanager: SystemVerilog: map ctags
by Javier Mora 20 Nov '24

20 Nov '24

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2024