Skip to content

Commit 3a2394b

Browse files
committed
fix: Updated report_checks that was incorrectly called twice for textual-bnf syntax and once for graphical-bnf
1 parent 17b2d6e commit 3a2394b

1 file changed

Lines changed: 15 additions & 17 deletions

File tree

tool-support/bnf_grammar_tools/bnf_grammar/bnf_grammar_processor.py

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -679,9 +679,6 @@ def extract_bnf_from_spec(self, input_dir: str, output_dir: str, input_file: str
679679

680680
self.elements.append(Comment(clause_id="", lines=[line_comment("End of BNF")]))
681681

682-
if self.syntax_kind == "textual-bnf":
683-
self.report_checks()
684-
685682
self.input_path_previous = self.input_path
686683

687684
# End def extract_bnf()
@@ -1018,27 +1015,28 @@ def report_checks(self) -> None:
10181015
- Mismatches from the comparison of declared reserved keywords w.r.t. extracted keywords
10191016
- Mismatches from the comparison of extracted keywords w.r.t. declared reserved keywords
10201017
"""
1021-
LOGGER.info("===== Start of Textual Notation Grammar Checks")
1018+
if self.syntax_kind == "textual-bnf":
1019+
LOGGER.info("===== Start of Textual Notation Grammar Checks")
10221020

1023-
# Check declared and extracted keywords
1024-
extracted_keywords_block = self.wrap_sorted(self.extracted_keyword_set)
1025-
LOGGER.info(f"Keywords extracted from textual BNF grammar scan:\n{extracted_keywords_block}")
1021+
# Check declared and extracted keywords
1022+
extracted_keywords_block = self.wrap_sorted(self.extracted_keyword_set)
1023+
LOGGER.info(f"Keywords extracted from textual BNF grammar scan:\n{extracted_keywords_block}")
10261024

1027-
reserved_set_diff_extracted = self.reserved_keyword_set - self.extracted_keyword_set
1025+
reserved_set_diff_extracted = self.reserved_keyword_set - self.extracted_keyword_set
10281026

1029-
extracted_set_diff_reserved = self.extracted_keyword_set - self.reserved_keyword_set
1027+
extracted_set_diff_reserved = self.extracted_keyword_set - self.reserved_keyword_set
10301028

1031-
LOGGER.info("Comparison of declared reserved keywords versus extracted keywords")
1029+
LOGGER.info("Comparison of declared reserved keywords versus extracted keywords")
10321030

1033-
log_level = logging.WARNING if len(reserved_set_diff_extracted) > 0 else logging.INFO
1034-
reserved_set_diff_block = self.wrap_sorted(reserved_set_diff_extracted)
1035-
LOGGER.log(log_level, f"Declared reserved keywords not in extracted keywords:\n{reserved_set_diff_block}")
1031+
log_level = logging.WARNING if len(reserved_set_diff_extracted) > 0 else logging.INFO
1032+
reserved_set_diff_block = self.wrap_sorted(reserved_set_diff_extracted)
1033+
LOGGER.log(log_level, f"Declared reserved keywords not in extracted keywords:\n{reserved_set_diff_block}")
10361034

1037-
log_level = logging.WARNING if len(extracted_set_diff_reserved) > 0 else logging.INFO
1038-
extracted_set_diff_block = self.wrap_sorted(extracted_set_diff_reserved)
1039-
LOGGER.log(log_level, f"Extracted keywords not in declared reserved keywords:\n{extracted_set_diff_block}")
1035+
log_level = logging.WARNING if len(extracted_set_diff_reserved) > 0 else logging.INFO
1036+
extracted_set_diff_block = self.wrap_sorted(extracted_set_diff_reserved)
1037+
LOGGER.log(log_level, f"Extracted keywords not in declared reserved keywords:\n{extracted_set_diff_block}")
10401038

1041-
LOGGER.info("===== End of Textual Notation Grammar Checks")
1039+
LOGGER.info("===== End of Textual Notation Grammar Checks")
10421040

10431041
if self.syntax_kind == "graphical-bnf":
10441042
LOGGER.info("===== Start of Graphical Notation Grammar Checks")

0 commit comments

Comments
 (0)