Optional fix, the solution was to make optional non-optional

This commit is contained in:
Maximilien Rigaut 2022-03-24 11:45:30 +01:00
parent 45439b55b9
commit c8c863d892
2 changed files with 30 additions and 19 deletions

View File

@ -248,19 +248,14 @@ var = pps('[') + pp.delimitedList(
# Specific elements
image_element = ('@{' + pp.common.identifier('image_name') + '}')("image_element")
alias_element = ('@[' + pp.common.identifier('alias_name') + ']')("alias_element")
expression = pp.Word(pp.alphanums + r'=+-_\'",;:!\/\\ ')
expression = pp.Word(pp.alphanums + r'=+-_\'",;:!\/\\. ')
html_insert = pps('{') + expression('html_insert') + pps('}')
class_insert = pps('{{') + expression('class_insert') + pps('}}')
# Optional elements
# optional = (
# pp.Opt(class_insert)("class_insert").add_parse_action(of_type(OptionalClassToken)) &
# pp.Opt(html_insert)("html_insert").add_parse_action(of_type(OptionalInsertToken)) &
# pp.Opt(var)("var").add_parse_action(of_type(OptionalVarToken))
# )("optional").add_parse_action(of_type(OptionalToken)) # Macro OptionalToken
optional = pp.ZeroOrMore(
class_insert("class_insert").add_parse_action(of_type(OptionalClassToken)) |
html_insert("html_insert").add_parse_action(of_type(OptionalInsertToken)) |
optional = pp.OneOrMore(
class_insert("class_insert").add_parse_action(of_type(OptionalClassToken)) ^
html_insert("html_insert").add_parse_action(of_type(OptionalInsertToken)) ^
var("var").add_parse_action(of_type(OptionalVarToken))
)("optional").add_parse_action(of_type(OptionalToken)) # Macro OptionalToken
@ -296,7 +291,7 @@ enhanced_text = pp.ZeroOrMore(
# Multiline elements
se_start = (pps('<<') + structural_elements).add_parse_action(of_type(StructuralElementStartToken))
se_end = (structural_elements + pps('>>')).add_parse_action(of_type(StructuralElementEndToken)) + optional
se_end = (structural_elements + pps('>>')).add_parse_action(of_type(StructuralElementEndToken)) + pp.Opt(optional)
se = se_end | se_start # Structural element
table_row = pp.OneOrMore(
# pp.Regex(r'\|(\d)?')('table_colspan') +
@ -314,24 +309,30 @@ multi_line = se | table
# Oneline elements
one_header = (
header_element + pp.SkipTo(pp.match_previous_literal(header_element))
header_element +
pp.SkipTo(pp.match_previous_literal(header_element)) +
pps(pp.match_previous_literal(header_element)) +
pp.Opt(optional)
).add_parse_action(of_type(HeaderToken))
one_display = (
display_element + pp.SkipTo(pp.match_previous_literal(display_element))
display_element +
pp.SkipTo(pp.match_previous_literal(display_element)) +
pps(pp.match_previous_literal(display_element)) +
pp.Opt(optional)
).add_parse_action(of_type(DisplayToken))
one_olist = pp.line_start + (
pps(pp.Literal('#.')) + (
(pp.SkipTo(optional)('text').add_parse_action(of_type(TextToken)) + optional) ^ # TODO: add reparse
(pp.SkipTo(optional)('text').add_parse_action(of_type(TextToken)) + optional) | # TODO: add reparse
enhanced_text)
).add_parse_action(of_type(EtOlistToken))
one_ulist = pp.line_start + (
pps(pp.Literal('-')) + (
(pp.SkipTo(optional)('text').add_parse_action(of_type(TextToken)) + optional) ^ # TODO: add reparse
(pp.SkipTo(optional)('text').add_parse_action(of_type(TextToken)) + optional) | # TODO: add reparse
enhanced_text)
).add_parse_action(of_type(EtUlistToken))
# one_line sums up all one-line elements
one_line = (one_header | one_display | one_olist | one_ulist) + pp.Opt(optional)
one_line = (one_header | one_display | one_olist | one_ulist)
# Final elements
line = one_line | multi_line | enhanced_text
@ -342,8 +343,8 @@ line = one_line | multi_line | enhanced_text
##############################################################################
# Composite elements
image = image_element + optional
alias = alias_element + optional
image = image_element + pp.Opt(optional)
alias = alias_element + pp.Opt(optional)
# Syntax elements
line_to_replace = pp.OneOrMore(
@ -363,4 +364,4 @@ if __name__ == '__main__': # pragma: no cover
line.create_diagram("../../../dev_outputs/diagram_line.html")
multi_line.create_diagram("../../../dev_outputs/diagram_multi_line.html")
one_line.create_diagram("../../../dev_outputs/diagram_one_line.html")
enhanced_text.create_diagram("../../../dev_outputs/diagram_enchanced_text.html")
enhanced_text.create_diagram("../../../dev_outputs/diagram_enhanced_text.html")

View File

@ -53,6 +53,7 @@ list_of_token_types = {
}
# Dictionary of all lexical elements and a list of matching strings for the Pre_parser
# test_expression_matching
expressions_to_match = {
# Base elements
"quotes": ["'hi, there'", "'hi, there'"],
@ -73,7 +74,16 @@ expressions_to_match = {
"html_insert": ['{test=12, 22=3, "=5}', "{testing=12, 22=3, 4=5, 6='7'}"],
# Optional elements
"optional": ["a=1", "a=1.33", "tr2='hu'"],
"optional": ["[a=1]", "[a=1, b=2]",
"{a=1'\";}",
"[a=1, b='2', 43, 'eee']",
"[a=1, b='2', 43, 'eee'] {azer=,;}",
"{{a=1, b='2', 43, 'eee'}}",
"{{a=1, b='2', 43, 'eee'}} {azer=,;}",
"{{a=1, b='2', 43, 'eee'}} {azer=,;} [azer=,;]",
"[a=1, b='2', 43, 'eee'] {azer=,;} {{azer=,;}}",
],
# Pre_parser elements
"image": ["@{image}{test=22}[a=12,22,c,d,ERE,r,3]", "@{image123_456}{a=12,22,c,d,ERE,r,3}",