SF.net SVN: geany:[4448] trunk

[ntrel at users.sourceforge.net]

Revision: 4448
          http://geany.svn.sourceforge.net/geany/?rev=4448&view=rev
Author:   ntrel
Date:     2009-11-26 12:33:28 +0000 (Thu, 26 Nov 2009)

Log Message:
-----------
Fix VHDL symbol list to display all tags (patch from Kelvin Gardiner,
thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/THANKS
    trunk/src/about.c
    trunk/src/symbols.c
    trunk/tagmanager/vhdl.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-24 16:47:35 UTC (rev 4447)
+++ trunk/ChangeLog	2009-11-26 12:33:28 UTC (rev 4448)
@@ -1,3 +1,10 @@
+2009-11-26  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/about.c, src/symbols.c, THANKS, tagmanager/vhdl.c:
+   Fix VHDL symbol list to display all tags (patch from Kelvin Gardiner,
+   thanks).
+
+
 2009-11-24  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/highlighting.c:

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2009-11-24 16:47:35 UTC (rev 4447)
+++ trunk/THANKS	2009-11-26 12:33:28 UTC (rev 4448)
@@ -72,6 +72,7 @@
 Ross McKay <rosko<at>zeta<dot>org<dot>au> - ASP preferred language option
 Alexey Antipov <1a_antipov(at)mail(dot)ru> - Apply file open encoding only to non-Unicode files
 Jörn Reder <joern(at)zyn(dot)de> - --socket-file command line option patch
+Kelvin Gardiner <kelvin.mbmn.net> - VHDL symbol list patch
 
 Translators:
 ------------

Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c	2009-11-24 16:47:35 UTC (rev 4447)
+++ trunk/src/about.c	2009-11-26 12:33:28 UTC (rev 4448)
@@ -87,7 +87,7 @@
 "Dirk Weber, Elias Pschernig, Eric Forgeot, Eugene Arshinov, Felipe Pena, François Cami, "
 "Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, "
 "Jean-François Wauthy, Jeff Pohlmeyer, Jesse Mayes, John Gabriele, Jon Strait, Josef Whiter, "
-"Jörn Reder, Kevin Ellwood, Kristoffer A. Tjernås, Lex Trotman, Marko Peric, Matti Mårds, "
+"Jörn Reder, Kelvin Gardiner, Kevin Ellwood, Kristoffer A. Tjernås, Lex Trotman, Marko Peric, Matti Mårds, "
 "Moritz Barsnick, Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, Robert McGinley, "
 "Roland Baudin, Ross McKay, S Jagannathan, Saleem Abdulrasool, "
 "Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Thomas Martitz, Tomás Vírseda, "

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2009-11-24 16:47:35 UTC (rev 4447)
+++ trunk/src/symbols.c	2009-11-26 12:33:28 UTC (rev 4448)
@@ -747,14 +747,13 @@
 		case GEANY_FILETYPES_VHDL:
 		{
 			tag_list_add_groups(tag_store,
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				/*&(tv_iters.tag_class), _("Constants"),*/
-				/*&(tv_iters.tag_member), _("Members"),*/
-				/*&(tv_iters.tag_macro), _("Macros"),*/
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_struct), _("Signals"), NULL,
 				&(tv_iters.tag_namespace), _("Package"), "classviewer-namespace",
-				&(tv_iters.tag_type), _("Types"), NULL,
+				&(tv_iters.tag_class), _("Entities"), "classviewer-class",
+				&(tv_iters.tag_struct), _("Architectures"), "classviewer-struct",
+				&(tv_iters.tag_type), _("Types"), "classviewer-other",
+				&(tv_iters.tag_function), _("Functions / Procedures"), "classviewer-method",
+				&(tv_iters.tag_variable), _("Variables / Signals"), "classviewer-var",
+				&(tv_iters.tag_member), _("Processes / Components"), "classviewer-member",
 				&(tv_iters.tag_other), _("Other"), "classviewer-other",
 				NULL);
 			break;

Modified: trunk/tagmanager/vhdl.c
===================================================================
--- trunk/tagmanager/vhdl.c	2009-11-24 16:47:35 UTC (rev 4447)
+++ trunk/tagmanager/vhdl.c	2009-11-26 12:33:28 UTC (rev 4448)
@@ -43,7 +43,8 @@
     K_PROCESS,
     K_ENTITY,
     K_ARCHITECTURE,
-    K_PORT
+    K_PORT,
+    K_ALIAS
 } vhdlKind;
 
 typedef struct {
@@ -63,20 +64,21 @@
 static vString* TagName=NULL;
 
 static kindOption VhdlKinds [] = {
- { TRUE, 'c', "other",        "constants" },
+ { TRUE, 'c', "variable",     "constants" },
  { TRUE, 't', "typedef",      "types" },
  { TRUE, 'v', "variable",     "variables" },
  { TRUE, 'a', "atribute",     "atributes" },
- { TRUE, 's', "struct",       "signals" },
+ { TRUE, 's', "variable",     "signals" },
  { TRUE, 'f', "function",     "functions" },
- { TRUE, 'p', "prototype",    "procedure" },
- { TRUE, 'k', "component",    "components" },
- { TRUE, 'l', "package",      "packages" },
- { TRUE, 'm', "process",      "process" },
- { TRUE, 'n', "entity",       "entity" },
- { TRUE, 'o', "architecture", "architecture" },
- { TRUE, 'u', "port",         "ports" }
-};
+ { TRUE, 'p', "function",     "procedure" },
+ { TRUE, 'k', "member",       "components" },
+ { TRUE, 'l', "namespace",    "packages" },
+ { TRUE, 'm', "member",       "process" },
+ { TRUE, 'n', "class",        "entity" },
+ { TRUE, 'o', "struct",       "architecture" },
+ { TRUE, 'u', "port",         "ports" },
+ { TRUE, 'v', "typedef",      "alias" }
+ };
 
 static keywordAssoc VhdlKeywordTable [] = {
     { "constant",     K_CONSTANT },
@@ -93,7 +95,8 @@
     { "architecture", K_ARCHITECTURE },
     { "inout",        K_PORT },
     { "in",           K_PORT },
-    { "out",          K_PORT }
+    { "out",          K_PORT },
+    { "alias",        K_ALIAS }
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.