[geany/geany] 282ed7: Define ARRAY_SIZE() and use it instead of KIND_COUNT()

Jiří Techet git-noreply at xxxxx
Sat Sep 10 07:25:59 UTC 2016


Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Thu, 28 Jul 2016 21:56:05 UTC
Commit:      282ed7def72c8e736eb45a88d07b705a2667f3dc
             https://github.com/geany/geany/commit/282ed7def72c8e736eb45a88d07b705a2667f3dc

Log Message:
-----------
Define ARRAY_SIZE() and use it instead of KIND_COUNT()


Modified Paths:
--------------
    ctags/main/parse.h
    ctags/main/routines.h
    ctags/parsers/abaqus.c
    ctags/parsers/abc.c
    ctags/parsers/asciidoc.c
    ctags/parsers/asm.c
    ctags/parsers/basic.c
    ctags/parsers/c.c
    ctags/parsers/conf.c
    ctags/parsers/css.c
    ctags/parsers/diff.c
    ctags/parsers/docbook.c
    ctags/parsers/erlang.c
    ctags/parsers/fortran.c
    ctags/parsers/go.c
    ctags/parsers/haskell.c
    ctags/parsers/haxe.c
    ctags/parsers/jscript.c
    ctags/parsers/json.c
    ctags/parsers/latex.c
    ctags/parsers/lua.c
    ctags/parsers/make.c
    ctags/parsers/markdown.c
    ctags/parsers/matlab.c
    ctags/parsers/nsis.c
    ctags/parsers/objc.c
    ctags/parsers/pascal.c
    ctags/parsers/perl.c
    ctags/parsers/php.c
    ctags/parsers/powershell.c
    ctags/parsers/python.c
    ctags/parsers/r.c
    ctags/parsers/rest.c
    ctags/parsers/ruby.c
    ctags/parsers/rust.c
    ctags/parsers/sh.c
    ctags/parsers/sql.c
    ctags/parsers/tcl.c
    ctags/parsers/txt2tags.c
    ctags/parsers/verilog.c
    ctags/parsers/vhdl.c

Modified: ctags/main/parse.h
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -22,8 +22,6 @@
 /*
 *   MACROS
 */
-#define KIND_COUNT(kindTable) (sizeof(kindTable)/sizeof(kindOption))
-
 #define LANG_AUTO   (-1)
 #define LANG_IGNORE (-2)
 


Modified: ctags/main/routines.h
28 lines changed, 28 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,28 @@
+/*
+*   Copyright (c) 2002, Darren Hiebert
+*
+*   This source code is released for free distribution under the terms of the
+*   GNU General Public License version 2 or (at your option) any later version.
+*
+*   External interface to routines.c
+*/
+#ifndef CTAGS_MAIN_ROUTINES_H
+#define CTAGS_MAIN_ROUTINES_H
+
+/*
+*   INCLUDE FILES
+*/
+#include "general.h"  /* must always come first */
+
+#include <stdio.h>
+
+#include "mio.h"
+
+/*
+*   MACROS
+*/
+#define ARRAY_SIZE(X)      (sizeof (X) / sizeof (X[0]))
+
+#endif  /* CTAGS_MAIN_ROUTINES_H */
+
+/* vi:set tabstop=4 shiftwidth=4: */


Modified: ctags/parsers/abaqus.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -17,6 +17,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -119,7 +120,7 @@ extern parserDefinition* AbaqusParser (void)
 	static const char *const extensions [] = { "inp", NULL };
 	parserDefinition * def = parserNew ("Abaqus");
 	def->kinds      = AbaqusKinds;
-	def->kindCount  = KIND_COUNT (AbaqusKinds);
+	def->kindCount  = ARRAY_SIZE (AbaqusKinds);
 	def->extensions = extensions;
 	def->parser     = findAbaqusTags;
 	return def;


Modified: ctags/parsers/abc.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -20,6 +20,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -118,7 +119,7 @@ extern parserDefinition* AbcParser (void)
 	parserDefinition* const def = parserNew ("Abc");
 
 	def->kinds = AbcKinds;
-	def->kindCount = KIND_COUNT (AbcKinds);
+	def->kindCount = ARRAY_SIZE (AbcKinds);
 	def->patterns = patterns;
 	def->extensions = extensions;
 	def->parser = findAbcTags;


Modified: ctags/parsers/asciidoc.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -21,6 +21,7 @@
 #include "read.h"
 #include "vstring.h"
 #include "nestlevel.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -224,7 +225,7 @@ extern parserDefinition* AsciidocParser (void)
 	parserDefinition* const def = parserNew ("Asciidoc");
 
 	def->kinds = AsciidocKinds;
-	def->kindCount = KIND_COUNT (AsciidocKinds);
+	def->kindCount = ARRAY_SIZE (AsciidocKinds);
 	def->patterns = patterns;
 	def->extensions = extensions;
 	def->parser = findAsciidocTags;


Modified: ctags/parsers/asm.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -370,7 +370,7 @@ extern parserDefinition* AsmParser (void)
 	};
 	parserDefinition* def = parserNew ("Asm");
 	def->kinds      = AsmKinds;
-	def->kindCount  = KIND_COUNT (AsmKinds);
+	def->kindCount  = ARRAY_SIZE (AsmKinds);
 	def->extensions = extensions;
 	def->patterns   = patterns;
 	def->parser     = findAsmTags;


Modified: ctags/parsers/basic.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -249,7 +249,7 @@ parserDefinition *FreeBasicParser (void)
 	static char const *extensions[] = { "bas", "bi", "bb", "pb", NULL };
 	parserDefinition *def = parserNew ("FreeBasic");
 	def->kinds = BasicKinds;
-	def->kindCount = KIND_COUNT (BasicKinds);
+	def->kindCount = ARRAY_SIZE (BasicKinds);
 	def->extensions = extensions;
 	def->parser = findBasicTags;
 	return def;


Modified: ctags/parsers/c.c
16 lines changed, 8 insertions(+), 8 deletions(-)
===================================================================
@@ -3282,7 +3282,7 @@ extern parserDefinition* CParser (void)
 	static const char *const extensions [] = { "c", "pc", "sc", NULL };
 	parserDefinition* def = parserNew ("C");
 	def->kinds      = CKinds;
-	def->kindCount  = KIND_COUNT (CKinds);
+	def->kindCount  = ARRAY_SIZE (CKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeCParser;
@@ -3301,7 +3301,7 @@ extern parserDefinition* CppParser (void)
 	};
 	parserDefinition* def = parserNew ("C++");
 	def->kinds      = CKinds;
-	def->kindCount  = KIND_COUNT (CKinds);
+	def->kindCount  = ARRAY_SIZE (CKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeCppParser;
@@ -3313,7 +3313,7 @@ extern parserDefinition* JavaParser (void)
 	static const char *const extensions [] = { "java", NULL };
 	parserDefinition* def = parserNew ("Java");
 	def->kinds      = JavaKinds;
-	def->kindCount  = KIND_COUNT (JavaKinds);
+	def->kindCount  = ARRAY_SIZE (JavaKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeJavaParser;
@@ -3325,7 +3325,7 @@ extern parserDefinition* DParser (void)
 	static const char *const extensions [] = { "d", "di", NULL };
 	parserDefinition* def = parserNew ("D");
 	def->kinds      = DKinds;
-	def->kindCount  = KIND_COUNT (DKinds);
+	def->kindCount  = ARRAY_SIZE (DKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeDParser;
@@ -3337,7 +3337,7 @@ extern parserDefinition* GLSLParser (void)
 	static const char *const extensions [] = { "glsl", "frag", "vert", NULL };
 	parserDefinition* def = parserNew ("GLSL");
 	def->kinds      = CKinds;
-	def->kindCount  = KIND_COUNT (CKinds);
+	def->kindCount  = ARRAY_SIZE (CKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeGLSLParser;
@@ -3349,7 +3349,7 @@ extern parserDefinition* FeriteParser (void)
 	static const char *const extensions [] = { "fe", NULL };
 	parserDefinition* def = parserNew ("Ferite");
 	def->kinds      = CKinds;
-	def->kindCount  = KIND_COUNT (CKinds);
+	def->kindCount  = ARRAY_SIZE (CKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeFeriteParser;
@@ -3361,7 +3361,7 @@ extern parserDefinition* CsharpParser (void)
 	static const char *const extensions [] = { "cs", NULL };
 	parserDefinition* def = parserNew ("C#");
 	def->kinds      = CsharpKinds;
-	def->kindCount  = KIND_COUNT (CsharpKinds);
+	def->kindCount  = ARRAY_SIZE (CsharpKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeCsharpParser;
@@ -3373,7 +3373,7 @@ extern parserDefinition* ValaParser (void)
 	static const char *const extensions [] = { "vala", NULL };
 	parserDefinition* def = parserNew ("Vala");
 	def->kinds      = ValaKinds;
-	def->kindCount  = KIND_COUNT (ValaKinds);
+	def->kindCount  = ARRAY_SIZE (ValaKinds);
 	def->extensions = extensions;
 	def->parser2    = findCTags;
 	def->initialize = initializeValaParser;


Modified: ctags/parsers/conf.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -18,6 +18,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -117,7 +118,7 @@ extern parserDefinition* ConfParser (void)
     static const char *const extensions [] = { "conf", NULL };
     parserDefinition* const def = parserNew ("Conf");
     def->kinds      = ConfKinds;
-    def->kindCount  = KIND_COUNT (ConfKinds);
+    def->kindCount  = ARRAY_SIZE (ConfKinds);
     def->patterns   = patterns;
     def->extensions = extensions;
     def->parser     = findConfTags;


Modified: ctags/parsers/css.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -263,7 +263,7 @@ extern parserDefinition* CssParser (void)
     static const char *const extensions [] = { "css", NULL };
     parserDefinition* def = parserNew ("CSS");
     def->kinds      = CssKinds;
-    def->kindCount  = KIND_COUNT (CssKinds);
+    def->kindCount  = ARRAY_SIZE (CssKinds);
     def->extensions = extensions;
     def->parser     = findCssTags;
     return def;


Modified: ctags/parsers/diff.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -127,7 +127,7 @@ extern parserDefinition* DiffParser (void)
 	static const char *const extensions [] = { "diff", NULL };
 	parserDefinition* const def = parserNew ("Diff");
 	def->kinds      = DiffKinds;
-	def->kindCount  = KIND_COUNT (DiffKinds);
+	def->kindCount  = ARRAY_SIZE (DiffKinds);
 	def->patterns   = patterns;
 	def->extensions = extensions;
 	def->parser     = findDiffTags;


Modified: ctags/parsers/docbook.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -20,6 +20,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -144,7 +145,7 @@ extern parserDefinition* DocBookParser (void)
 	parserDefinition* def = parserNew ("Docbook");
 	def->extensions = extensions;
 	def->kinds      = DocBookKinds;
-	def->kindCount  = KIND_COUNT (DocBookKinds);
+	def->kindCount  = ARRAY_SIZE (DocBookKinds);
 	def->parser     = findDocBookTags;
 	return def;
 }


Modified: ctags/parsers/erlang.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -185,7 +185,7 @@ extern parserDefinition *ErlangParser (void)
 	static const char *const extensions[] = { "erl", "ERL", "hrl", "HRL", NULL };
 	parserDefinition *def = parserNew ("Erlang");
 	def->kinds = ErlangKinds;
-	def->kindCount = KIND_COUNT (ErlangKinds);
+	def->kindCount = ARRAY_SIZE (ErlangKinds);
 	def->extensions = extensions;
 	def->parser = findErlangTags;
 	return def;


Modified: ctags/parsers/fortran.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -2351,7 +2351,7 @@ extern parserDefinition* FortranParser (void)
     };
     parserDefinition* def = parserNew ("Fortran");
     def->kinds      = FortranKinds;
-    def->kindCount  = KIND_COUNT (FortranKinds);
+    def->kindCount  = ARRAY_SIZE (FortranKinds);
     def->extensions = extensions;
     def->parser2    = findFortranTags;
     def->initialize = initializeFortran;
@@ -2369,7 +2369,7 @@ extern parserDefinition* F77Parser (void)
     };
     parserDefinition* def = parserNew ("F77");
     def->kinds      = FortranKinds;
-    def->kindCount  = KIND_COUNT (FortranKinds);
+    def->kindCount  = ARRAY_SIZE (FortranKinds);
     def->extensions = extensions;
     def->parser2    = findFortranTags;
     def->initialize = initializeF77;


Modified: ctags/parsers/go.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -833,7 +833,7 @@ extern parserDefinition *GoParser (void)
 	static const char *const extensions[] = { "go", NULL };
 	parserDefinition *def = parserNew ("Go");
 	def->kinds = GoKinds;
-	def->kindCount = KIND_COUNT (GoKinds);
+	def->kindCount = ARRAY_SIZE (GoKinds);
 	def->extensions = extensions;
 	def->parser = findGoTags;
 	def->initialize = initialize;


Modified: ctags/parsers/haskell.c
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -27,6 +27,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 
 /*
@@ -337,7 +338,7 @@ extern parserDefinition* HaskellParser (void)
     parserDefinition* def  = parserNew ("Haskell");
 
     def->kinds      = HaskellKinds;
-    def->kindCount  = KIND_COUNT(HaskellKinds);
+    def->kindCount  = ARRAY_SIZE(HaskellKinds);
     def->extensions = extensions;
     def->parser     = findNormalHaskellTags;
     return def;
@@ -348,7 +349,7 @@ extern parserDefinition* LiterateHaskellParser (void)
     static const char *const extensions [] = { "lhs", NULL };
     parserDefinition* def = parserNew ("Literate Haskell");
     def->kinds      = HaskellKinds;
-    def->kindCount  = KIND_COUNT(HaskellKinds);
+    def->kindCount  = ARRAY_SIZE(HaskellKinds);
     def->extensions = extensions;
     def->parser     = findLiterateHaskellTags;
     return def;


Modified: ctags/parsers/haxe.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -23,6 +23,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
  *	 MACROS
@@ -223,7 +224,7 @@ extern parserDefinition* HaxeParser (void)
 	 * New definitions for parsing instead of regex
 	 */
 	def->kinds		= HxKinds;
-	def->kindCount	= KIND_COUNT (HxKinds);
+	def->kindCount	= ARRAY_SIZE (HxKinds);
 	def->parser		= findHxTags;
 	/*def->initialize = initialize;*/
 	return def;


Modified: ctags/parsers/jscript.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1920,7 +1920,7 @@ extern parserDefinition* JavaScriptParser (void)
 	 * New definitions for parsing instead of regex
 	 */
 	def->kinds		= JsKinds;
-	def->kindCount	= KIND_COUNT (JsKinds);
+	def->kindCount	= ARRAY_SIZE (JsKinds);
 	def->parser		= findJsTags;
 	def->initialize = initialize;
 


Modified: ctags/parsers/json.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -386,7 +386,7 @@ extern parserDefinition* JsonParser (void)
 	parserDefinition *const def = parserNew ("JSON");
 	def->extensions = extensions;
 	def->kinds		= JsonKinds;
-	def->kindCount	= KIND_COUNT (JsonKinds);
+	def->kindCount	= ARRAY_SIZE (JsonKinds);
 	def->parser		= findJsonTags;
 	def->initialize = initialize;
 


Modified: ctags/parsers/latex.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -20,6 +20,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -237,7 +238,7 @@ extern parserDefinition* LaTeXParser (void)
 	static const char *const extensions [] = { "tex", "sty", "idx", NULL };
 	parserDefinition * def = parserNew ("LaTeX");
 	def->kinds      = TeXKinds;
-	def->kindCount  = KIND_COUNT (TeXKinds);
+	def->kindCount  = ARRAY_SIZE (TeXKinds);
 	def->extensions = extensions;
 	def->parser     = findTeXTags;
 	return def;


Modified: ctags/parsers/lua.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -122,7 +122,7 @@ extern parserDefinition* LuaParser (void)
 	static const char* const extensions [] = { "lua", NULL };
 	parserDefinition* def = parserNew ("Lua");
 	def->kinds      = LuaKinds;
-	def->kindCount  = KIND_COUNT (LuaKinds);
+	def->kindCount  = ARRAY_SIZE (LuaKinds);
 	def->extensions = extensions;
 	def->parser     = findLuaTags;
 	return def;


Modified: ctags/parsers/make.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -228,7 +228,7 @@ extern parserDefinition* MakefileParser (void)
 	static const char *const extensions [] = { "mak", "mk", NULL };
 	parserDefinition* const def = parserNew ("Make");
 	def->kinds      = MakeKinds;
-	def->kindCount  = KIND_COUNT (MakeKinds);
+	def->kindCount  = ARRAY_SIZE (MakeKinds);
 	def->patterns   = patterns;
 	def->extensions = extensions;
 	def->parser     = findMakeTags;


Modified: ctags/parsers/markdown.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -19,6 +19,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -96,7 +97,7 @@ extern parserDefinition* MarkdownParser (void)
 	parserDefinition* const def = parserNew ("Markdown");
 
 	def->kinds = MarkdownKinds;
-	def->kindCount = KIND_COUNT (MarkdownKinds);
+	def->kindCount = ARRAY_SIZE (MarkdownKinds);
 	def->patterns = patterns;
 	def->extensions = extensions;
 	def->parser = findMarkdownTags;


Modified: ctags/parsers/matlab.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -20,6 +20,7 @@
 #include "parse.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -141,7 +142,7 @@ extern parserDefinition* MatlabParser (void)
     static const char *const extensions [] = { "m", NULL };
     parserDefinition* def = parserNew ("Matlab");
     def->kinds      = MatlabKinds;
-    def->kindCount  = KIND_COUNT (MatlabKinds);
+    def->kindCount  = ARRAY_SIZE (MatlabKinds);
     def->extensions = extensions;
     def->parser     = findMatlabTags;
     return def;


Modified: ctags/parsers/nsis.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -19,6 +19,7 @@
 #include "read.h"
 #include "main.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -138,7 +139,7 @@ extern parserDefinition* NsisParser (void)
 	};
 	parserDefinition* def = parserNew ("NSIS");
 	def->kinds      = NsisKinds;
-	def->kindCount  = KIND_COUNT (NsisKinds);
+	def->kindCount  = ARRAY_SIZE (NsisKinds);
 	def->extensions = extensions;
 	def->parser     = findNsisTags;
 	return def;


Modified: ctags/parsers/objc.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1142,7 +1142,7 @@ extern parserDefinition *ObjcParser (void)
 	static const char *const extensions[] = { "m", "h", NULL };
 	parserDefinition *def = parserNew ("ObjectiveC");
 	def->kinds = ObjcKinds;
-	def->kindCount = KIND_COUNT (ObjcKinds);
+	def->kindCount = ARRAY_SIZE (ObjcKinds);
 	def->extensions = extensions;
 	def->parser = findObjcTags;
 	def->initialize = objcInitialize;


Modified: ctags/parsers/pascal.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -350,7 +350,7 @@ extern parserDefinition* PascalParser (void)
     parserDefinition* def = parserNew ("Pascal");
     def->extensions = extensions;
     def->kinds      = PascalKinds;
-    def->kindCount  = KIND_COUNT (PascalKinds);
+    def->kindCount  = ARRAY_SIZE (PascalKinds);
     def->parser     = findPascalTags;
     return def;
 }


Modified: ctags/parsers/perl.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -374,7 +374,7 @@ extern parserDefinition* PerlParser (void)
 	static const char *const extensions [] = { "pl", "pm", "plx", "perl", NULL };
 	parserDefinition* def = parserNew ("Perl");
 	def->kinds      = PerlKinds;
-	def->kindCount  = KIND_COUNT (PerlKinds);
+	def->kindCount  = ARRAY_SIZE (PerlKinds);
 	def->extensions = extensions;
 	def->parser     = findPerlTags;
 	return def;


Modified: ctags/parsers/php.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1491,7 +1491,7 @@ extern parserDefinition* PhpParser (void)
 	static const char *const extensions [] = { "php", "php3", "php4", "php5", "phtml", NULL };
 	parserDefinition* def = parserNew ("PHP");
 	def->kinds      = PhpKinds;
-	def->kindCount  = KIND_COUNT (PhpKinds);
+	def->kindCount  = ARRAY_SIZE (PhpKinds);
 	def->extensions = extensions;
 	def->parser     = findPhpTags;
 	def->initialize = initializePhpParser;
@@ -1503,7 +1503,7 @@ extern parserDefinition* ZephirParser (void)
 	static const char *const extensions [] = { "zep", NULL };
 	parserDefinition* def = parserNew ("Zephir");
 	def->kinds      = PhpKinds;
-	def->kindCount  = KIND_COUNT (PhpKinds);
+	def->kindCount  = ARRAY_SIZE (PhpKinds);
 	def->extensions = extensions;
 	def->parser     = findZephirTags;
 	def->initialize = initializeZephirParser;


Modified: ctags/parsers/powershell.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -20,6 +20,7 @@
 #include "vstring.h"
 #include "keyword.h"
 #include "entry.h"
+#include "routines.h"
 #include <string.h>
 
 #define SCOPE_SEPARATOR "::"
@@ -619,7 +620,7 @@ extern parserDefinition* PowerShellParser (void)
 	static const char *const extensions [] = { "ps1", "psm1", NULL };
 	parserDefinition* def = parserNew ("PowerShell");
 	def->kinds      = PowerShellKinds;
-	def->kindCount  = KIND_COUNT (PowerShellKinds);
+	def->kindCount  = ARRAY_SIZE (PowerShellKinds);
 	def->extensions = extensions;
 	def->parser     = findPowerShellTags;
 	return def;


Modified: ctags/parsers/python.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -833,7 +833,7 @@ extern parserDefinition *PythonParser (void)
     static const char *const extensions[] = { "py", "pyx", "pxd", "pxi" ,"scons", NULL };
 	parserDefinition *def = parserNew ("Python");
 	def->kinds = PythonKinds;
-	def->kindCount = KIND_COUNT (PythonKinds);
+	def->kindCount = ARRAY_SIZE (PythonKinds);
 	def->extensions = extensions;
 	def->parser = findPythonTags;
 	return def;


Modified: ctags/parsers/r.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -21,6 +21,7 @@
 #include "entry.h"
 #include "read.h"
 #include "vstring.h"
+#include "routines.h"
 
 /*#define R_REGEX*/
 
@@ -191,7 +192,7 @@ extern parserDefinition* RParser (void)
   parserDefinition* const def = parserNew ("R");
 #ifndef R_REGEX
   def->kinds      = RKinds;
-  def->kindCount  = KIND_COUNT (RKinds);
+  def->kindCount  = ARRAY_SIZE (RKinds);
 #endif
   def->extensions = extensions;
 #ifndef R_REGEX


Modified: ctags/parsers/rest.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -20,6 +20,7 @@
 #include "read.h"
 #include "vstring.h"
 #include "nestlevel.h"
+#include "routines.h"
 
 /*
 *   DATA DEFINITIONS
@@ -200,7 +201,7 @@ extern parserDefinition* RestParser (void)
 	parserDefinition* const def = parserNew ("reStructuredText");
 
 	def->kinds = RestKinds;
-	def->kindCount = KIND_COUNT (RestKinds);
+	def->kindCount = ARRAY_SIZE (RestKinds);
 	def->patterns = patterns;
 	def->extensions = extensions;
 	def->parser = findRestTags;


Modified: ctags/parsers/ruby.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -549,7 +549,7 @@ extern parserDefinition* RubyParser (void)
 	static const char *const extensions [] = { "rb", "ruby", NULL };
 	parserDefinition* def = parserNew ("Ruby");
 	def->kinds      = RubyKinds;
-	def->kindCount  = KIND_COUNT (RubyKinds);
+	def->kindCount  = ARRAY_SIZE (RubyKinds);
 	def->extensions = extensions;
 	def->parser     = findRubyTags;
 	return def;


Modified: ctags/parsers/rust.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -978,7 +978,7 @@ extern parserDefinition *RustParser (void)
 	static const char *const extensions[] = { "rs", NULL };
 	parserDefinition *def = parserNew ("Rust");
 	def->kinds = rustKinds;
-	def->kindCount = KIND_COUNT (rustKinds);
+	def->kindCount = ARRAY_SIZE (rustKinds);
 	def->extensions = extensions;
 	def->parser = findRustTags;
 


Modified: ctags/parsers/sh.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -105,7 +105,7 @@ extern parserDefinition* ShParser (void)
     };
     parserDefinition* def = parserNew ("Sh");
     def->kinds      = ShKinds;
-    def->kindCount  = KIND_COUNT (ShKinds);
+    def->kindCount  = ARRAY_SIZE (ShKinds);
     def->extensions = extensions;
     def->parser     = findShTags;
     return def;


Modified: ctags/parsers/sql.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2356,7 +2356,7 @@ extern parserDefinition* SqlParser (void)
 	static const char *const extensions [] = { "sql", NULL };
 	parserDefinition* def = parserNew ("SQL");
 	def->kinds		= SqlKinds;
-	def->kindCount	= KIND_COUNT (SqlKinds);
+	def->kindCount	= ARRAY_SIZE (SqlKinds);
 	def->extensions = extensions;
 	def->parser		= findSqlTags;
 	def->initialize = initialize;


Modified: ctags/parsers/tcl.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -139,7 +139,7 @@ extern parserDefinition* TclParser (void)
 	static const char *const extensions [] = { "tcl", "tk", "wish", "itcl", NULL };
 	parserDefinition* def = parserNew ("Tcl");
 	def->kinds      = TclKinds;
-	def->kindCount  = KIND_COUNT (TclKinds);
+	def->kindCount  = ARRAY_SIZE (TclKinds);
 	def->extensions = extensions;
 	def->parser     = findTclTags;
 	return def;


Modified: ctags/parsers/txt2tags.c
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -22,6 +22,7 @@
 #include "read.h"
 #include "nestlevel.h"
 #include "vstring.h"
+#include "routines.h"
 
 
 /* as any character may happen in an input, use something highly unlikely */
@@ -188,7 +189,7 @@ extern parserDefinition* Txt2tagsParser (void)
 	parserDefinition* const def = parserNew ("Txt2tags");
 
 	def->kinds = Txt2tagsKinds;
-	def->kindCount = KIND_COUNT (Txt2tagsKinds);
+	def->kindCount = ARRAY_SIZE (Txt2tagsKinds);
 	def->patterns = patterns;
 	def->extensions = extensions;
 	def->parser = findTxt2tagsTags;


Modified: ctags/parsers/verilog.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -326,7 +326,7 @@ extern parserDefinition* VerilogParser (void)
 	static const char *const extensions [] = { "v", NULL };
 	parserDefinition* def = parserNew ("Verilog");
 	def->kinds      = VerilogKinds;
-	def->kindCount  = KIND_COUNT (VerilogKinds);
+	def->kindCount  = ARRAY_SIZE (VerilogKinds);
 	def->extensions = extensions;
 	def->parser     = findVerilogTags;
 	def->initialize = initialize;


Modified: ctags/parsers/vhdl.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -288,7 +288,7 @@ extern parserDefinition* VhdlParser (void)
     static const char *const extensions [] = { "vhdl", "vhd", NULL };
     parserDefinition* def = parserNew ("Vhdl");
     def->kinds      = VhdlKinds;
-    def->kindCount  = KIND_COUNT (VhdlKinds);
+    def->kindCount  = ARRAY_SIZE (VhdlKinds);
     def->extensions = extensions;
     def->parser     = findVhdlTags;
     def->initialize = initialize;



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list