Validator: renamed html definition for tags

In preparation for also adding attributes this way.

sefht.geany

@@ -28,7 +28,7 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=53
+current_page=31
 FILE_NAME_0=139;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2FREADME;0;8
 FILE_NAME_1=134;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2F.gitignore;0;8
 FILE_NAME_2=1737;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fconfigure.ac;0;8
@@ -60,8 +60,8 @@ FILE_NAME_27=900;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fpr
 FILE_NAME_28=1867;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext_mark_static.c;0;8
 FILE_NAME_29=3036;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.c;0;8
 FILE_NAME_30=1159;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.h;0;8
-FILE_NAME_31=1111;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_html.h;0;8
-FILE_NAME_32=11962;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.c;0;8
+FILE_NAME_31=1100;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_html.h;0;8
+FILE_NAME_32=4198;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.c;0;8
 FILE_NAME_33=1068;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.h;0;8
 FILE_NAME_34=1287;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag_data.h;0;8
 FILE_NAME_35=16395;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_attr.c;0;8
@@ -82,7 +82,7 @@ FILE_NAME_49=24;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprg
 FILE_NAME_50=4221;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text.c;0;8
 FILE_NAME_51=994;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_text_mark.c;0;8
 FILE_NAME_52=2447;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator.c;0;8
-FILE_NAME_53=7456;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator_tag.c;0;8
+FILE_NAME_53=4963;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator_tag.c;0;8
 FILE_NAME_54=28881;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_validator_attr.c;0;8
 FILE_NAME_55=548;None;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftodo.txt;0;8
 FILE_NAME_56=201;YAML;0;EUTF-8;0;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2F.gitlab-ci.yml;0;4

src/lib/sefht/validator_html.h

@@ -34,7 +34,8 @@ struct HTML_TAG_DEFINITION
 	/*@observer@*/ const char * tag;
 };
 
-const struct HTML_TAG_DEFINITION HTML5[] = {
+
+const struct HTML_TAG_DEFINITION HTML5_TAGS[] = {
 };
 
 #endif /* SEFHT_VALIDATOR_HTML_H */

src/lib/sefht/validator_tag.c

@@ -152,8 +152,8 @@ init_tags_spec_html5 (/*@special@*/ struct SH_Validator * validator,
 	/*@modifies status@*/
 {
 	size_t size;
-	size = sizeof (HTML5) / sizeof (HTML5[0]);
-	return init_tags_from_spec (validator, HTML5, size, status);
+	size = sizeof (HTML5_TAGS) / sizeof (HTML5_TAGS[0]);
+	return init_tags_from_spec (validator, HTML5_TAGS, size, status);
 }
 
 static inline

tests/test_validator_tag.c

@@ -39,13 +39,13 @@
 
 /* override HTML spec */
 #include "validator_html.h"
-const struct HTML_TAG_DEFINITION HTML_[] = {
+const struct HTML_TAG_DEFINITION HTML_TAGS[] = {
 	{"html"},
 	{"aside"},
 	{"html"},
 	{"body"}
 };
-#define HTML5 HTML_
+#define HTML5_TAGS HTML_TAGS
 
 /* C file is needed, because we want to override SIZE_MAX */
 #include "validator.c"
@@ -158,14 +158,14 @@ START_TEST(test_validator_spec_no_status)
 	ck_assert_ptr_ne (NULL, validator->tags);
 	ck_assert_int_eq (3, validator->tag_n);
 
-	ck_assert_ptr_ne (HTML_[1].tag, validator->tags[0].name);
-	ck_assert_str_eq (HTML_[1].tag, validator->tags[0].name);
+	ck_assert_ptr_ne (HTML_TAGS[1].tag, validator->tags[0].name);
+	ck_assert_str_eq (HTML_TAGS[1].tag, validator->tags[0].name);
 
-	ck_assert_ptr_ne (HTML_[3].tag, validator->tags[1].name);
-	ck_assert_str_eq (HTML_[3].tag, validator->tags[1].name);
+	ck_assert_ptr_ne (HTML_TAGS[3].tag, validator->tags[1].name);
+	ck_assert_str_eq (HTML_TAGS[3].tag, validator->tags[1].name);
 
-	ck_assert_ptr_ne (HTML_[0].tag, validator->tags[2].name);
-	ck_assert_str_eq (HTML_[0].tag, validator->tags[2].name);
+	ck_assert_ptr_ne (HTML_TAGS[0].tag, validator->tags[2].name);
+	ck_assert_str_eq (HTML_TAGS[0].tag, validator->tags[2].name);
 
 	/* cleanup */
 	SH_Validator_free (validator);
@@ -186,14 +186,14 @@ START_TEST(test_validator_spec_with_status)
 	ck_assert_ptr_ne (NULL, validator->tags);
 	ck_assert_int_eq (3, validator->tag_n);
 
-	ck_assert_ptr_ne (HTML_[1].tag, validator->tags[0].name);
-	ck_assert_str_eq (HTML_[1].tag, validator->tags[0].name);
+	ck_assert_ptr_ne (HTML_TAGS[1].tag, validator->tags[0].name);
+	ck_assert_str_eq (HTML_TAGS[1].tag, validator->tags[0].name);
 
-	ck_assert_ptr_ne (HTML_[3].tag, validator->tags[1].name);
-	ck_assert_str_eq (HTML_[3].tag, validator->tags[1].name);
+	ck_assert_ptr_ne (HTML_TAGS[3].tag, validator->tags[1].name);
+	ck_assert_str_eq (HTML_TAGS[3].tag, validator->tags[1].name);
 
-	ck_assert_ptr_ne (HTML_[0].tag, validator->tags[2].name);
-	ck_assert_str_eq (HTML_[0].tag, validator->tags[2].name);
+	ck_assert_ptr_ne (HTML_TAGS[0].tag, validator->tags[2].name);
+	ck_assert_str_eq (HTML_TAGS[0].tag, validator->tags[2].name);
 
 	/* cleanup */
 	SH_Validator_free (validator);