Issue #38 fix and add grammar validation check for wildcard

pdf-association · Nov 3, 2022 · 122afda · 122afda
1 parent b73f94e
commit 122afda
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/TestGrammar/src/CheckGrammar.cpp b/TestGrammar/src/CheckGrammar.cpp
@@ -387,11 +387,12 @@ bool check_grammar(CArlingtonTSVGrammarFile& reader, std::string& arl_type, bool
     }
 
     // Check "*" wildcard key - must be last (duplicate keys already checked above)
-    if (std::find(std::begin(keys_list), std::end(keys_list), "*") != std::end(keys_list))
+    if (std::find(std::begin(keys_list), std::end(keys_list), "*") != std::end(keys_list)) {
         if (keys_list[keys_list.size() - 1] != "*") {
             report_stream << COLOR_ERROR << "wildcard key '*' in " << reader.get_tsv_name() << " was not last key" << COLOR_RESET;
             retval = false;
         }
+    }
 
     // Array filenames match "ArrayOf*" or "*Array"
     auto filename = reader.get_tsv_name();

diff --git a/TestGrammar/src/PredicateProcessor.cpp b/TestGrammar/src/PredicateProcessor.cpp
@@ -266,8 +266,12 @@ bool PredicateProcessor::ValidateRequiredSyntax(const int key_idx) {
     assert((key_idx >= 0) && (key_idx < (int)tsv.size()));
     std::string tsv_field = tsv[key_idx][TSV_REQUIRED];
 
-    if ((tsv_field == "TRUE") || (tsv_field == "FALSE"))
+    if ((tsv_field == "TRUE") || (tsv_field == "FALSE")) {
+        // Wildcards must have Required be FALSE
+        if ((tsv[key_idx][TSV_KEYNAME] == "*") && (tsv_field != "FALSE"))
+            return false;
         return true;
+    }
     else if ((tsv_field.find("fn:IsRequired(") == 0) && (tsv_field[tsv_field.size()-1] == ')')) {
         ASTNode *ast = new ASTNode();
         ASTNodeStack stack;

diff --git a/tsv/latest/ArrayOfCIDGlyphMetricsW.tsv b/tsv/latest/ArrayOfCIDGlyphMetricsW.tsv
@@ -1,2 +1,2 @@
 Key	Type	SinceVersion	DeprecatedIn	Required	IndirectReference	Inheritable	DefaultValue	PossibleValues	SpecialCase	Link	Note
-*	array;integer;number	1.2		TRUE	FALSE	FALSE				[ArrayOfNumbersGeneral];[];[]	Clause 9.7.4.3
+*	array;integer;number	1.2		FALSE	FALSE	FALSE				[ArrayOfNumbersGeneral];[];[]	Clause 9.7.4.3
diff --git a/tsv/latest/ArrayOfCIDGlyphMetricsW2.tsv b/tsv/latest/ArrayOfCIDGlyphMetricsW2.tsv
@@ -1,2 +1,2 @@
 Key	Type	SinceVersion	DeprecatedIn	Required	IndirectReference	Inheritable	DefaultValue	PossibleValues	SpecialCase	Link	Note
-*	array;integer;number	1.2		TRUE	FALSE	FALSE			[fn:Eval((fn:ArrayLength(1) mod 3)==0)];[];[]	[ArrayOfNumbersGeneral];[];[]	Clause 9.7.4.3 - C-last
+*	array;integer;number	1.2		FALSE	FALSE	FALSE			[fn:Eval((fn:ArrayLength(1) mod 3)==0)];[];[]	[ArrayOfNumbersGeneral];[];[]	Clause 9.7.4.3 - C-last