[geany/geany] 083397: Convert parser map size check to a static assertion

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Fri, 06 May 2016 14:52:54 UTC
Commit:      0833974e1ed460f1c36b3e2408726345f256d6a3
             https://github.com/geany/geany/commit/0833974e1ed460f1c36b3e2408726345f256d6a3

Log Message:
-----------
Convert parser map size check to a static assertion


Modified Paths:
--------------
    tagmanager/src/tm_parser.c

Modified: tagmanager/src/tm_parser.c
9 lines changed, 2 insertions(+), 7 deletions(-)
===================================================================
@@ -539,6 +539,8 @@ static TMParserMap parser_map[] = {
 	MAP_ENTRY(php_map),	/* Zephir - same as PHP */
 	MAP_ENTRY(powershell_map),
 };
+/* make sure the parser map is consistent and complete */
+G_STATIC_ASSERT(G_N_ELEMENTS(parser_map) == TM_PARSER_COUNT);
 
 
 TMTagType tm_parser_get_tag_type(gchar kind, TMParserType lang)
@@ -575,7 +577,6 @@ gchar tm_parser_get_tag_kind(TMTagType type, TMParserType lang)
 
 void tm_parser_verify_type_mappings(void)
 {
-	gsize parser_map_size = sizeof(parser_map) / sizeof(TMParserMap);
 	TMParserType lang;
 
 	if (TM_PARSER_COUNT > tm_ctags_get_lang_count())
@@ -584,12 +585,6 @@ void tm_parser_verify_type_mappings(void)
 		return;
 	}
 
-	if (parser_map_size != TM_PARSER_COUNT)
-	{
-		g_warning("Different number of parsers and tag type mappings");
-		return;
-	}
-
 	for (lang = 0; lang < TM_PARSER_COUNT; lang++)
 	{
 		const gchar *kinds = tm_ctags_get_lang_kinds(lang);



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