Added all syntax elements to tests, still to reach 100%
This commit is contained in:
parent
06538d6102
commit
a556466999
|
|
@ -235,7 +235,7 @@ value = (pps(quotes) + pp.Word(pp.alphanums + r'.') + pps(pp.match_previous_lite
|
|||
pp.common.fnumber)("value")
|
||||
assignation = pp.Group(
|
||||
pp.common.identifier('var_name') + pps('=') + value('var_value')
|
||||
)("assignation") # TODO: More extensive testing
|
||||
)("assignation")
|
||||
text = pp.OneOrMore(pp.Word(pp.alphanums))('text').add_parse_action(of_type(TextToken))
|
||||
url_characters = pp.common.url
|
||||
|
||||
|
|
@ -243,20 +243,25 @@ url_characters = pp.common.url
|
|||
var = pps('[') + pp.delimitedList(
|
||||
assignation.add_parse_action(of_type(BeAssignToken)) ^
|
||||
value.add_parse_action(of_type(BeValueToken))
|
||||
)("list_vars").set_name("list_vars") + pps(']') # TODO: More extensive testing
|
||||
)("list_vars").set_name("list_vars") + pps(']')
|
||||
|
||||
# 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'=+-_\'",;:!\/\\ ')
|
||||
html_insert = pps('{') + expression('html_insert') + pps('}') # TODO: More extensive testing
|
||||
class_insert = pps('{{') + expression('class_insert') + pps('}}') # TODO: test dis
|
||||
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)) # noqa TODO: add class_insert to tests
|
||||
# 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)) |
|
||||
var("var").add_parse_action(of_type(OptionalVarToken))
|
||||
)("optional").add_parse_action(of_type(OptionalToken)) # Macro OptionalToken
|
||||
|
||||
# Structural elements
|
||||
|
|
|
|||
|
|
@ -124,8 +124,117 @@ dict_advanced_syntax_input_and_expected_output = {
|
|||
("[text_link]('text://www.website.com/link.html')",
|
||||
[sy.HyperlinkToken(["[text_link]('text://www.website.com/link.html')"])], __GL())
|
||||
],
|
||||
|
||||
# il_link | et_strong | et_em | et_strikethrough | et_underline | et_custom_span
|
||||
"assignation": [
|
||||
# Single assignation element, should only match the first "a=1"
|
||||
("a=1", [sy.BeAssignToken([["a", 1]]), ], __GL()),
|
||||
("a='str'", [sy.BeAssignToken([["a", 'str']]), ], __GL()),
|
||||
],
|
||||
"var": [
|
||||
# List of variables or assignations, should match "[a=12, b=13, 'c']"
|
||||
("[a=12, b=13, 'c']", [
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
sy.BeAssignToken([["b", 13]]),
|
||||
sy.BeValueToken(["c"]),
|
||||
], __GL()),
|
||||
("[a=12, b=13, 'c', d=14]", [
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
sy.BeAssignToken([["b", 13]]),
|
||||
sy.BeValueToken(["c"]),
|
||||
sy.BeAssignToken([["d", 14]]),
|
||||
], __GL()),
|
||||
],
|
||||
"optional": [
|
||||
# Optional element, should match any optional"
|
||||
("[a=12, b=13, 'c']", [
|
||||
sy.OptionalToken([
|
||||
sy.OptionalVarToken([
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
sy.BeAssignToken([["b", 13]]),
|
||||
sy.BeValueToken(["c"]),
|
||||
]),
|
||||
]),
|
||||
], __GL()),
|
||||
("[a=12, b=13, 'c', d=14]", [
|
||||
sy.OptionalToken([
|
||||
sy.OptionalVarToken([
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
sy.BeAssignToken([["b", 13]]),
|
||||
sy.BeValueToken(["c"]),
|
||||
sy.BeAssignToken([["d", 14]]),
|
||||
]),
|
||||
]),
|
||||
], __GL()),
|
||||
("[a=12]{aze,/.}", (
|
||||
sy.OptionalToken([
|
||||
sy.OptionalVarToken([
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
]),
|
||||
sy.OptionalInsertToken([
|
||||
"aze,/.",
|
||||
]),
|
||||
]),
|
||||
), __GL()),
|
||||
("{aze,/.}[a=12]", (
|
||||
sy.OptionalToken([
|
||||
sy.OptionalInsertToken([
|
||||
"aze,/.",
|
||||
]),
|
||||
sy.OptionalVarToken([
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
]),
|
||||
]),
|
||||
), __GL()),
|
||||
("{aze!=}", (
|
||||
sy.OptionalToken([
|
||||
sy.OptionalInsertToken([
|
||||
"aze!=",
|
||||
]),
|
||||
]),
|
||||
), __GL()),
|
||||
("{{aze!=}}", (
|
||||
sy.OptionalToken([
|
||||
sy.OptionalClassToken([
|
||||
"aze!=",
|
||||
]),
|
||||
]),
|
||||
), __GL()),
|
||||
("{{aze!=}}{azett!=}", (
|
||||
sy.OptionalToken([
|
||||
sy.OptionalClassToken([
|
||||
"aze!=",
|
||||
]),
|
||||
sy.OptionalInsertToken([
|
||||
"azett!=",
|
||||
]),
|
||||
]),
|
||||
), __GL()),
|
||||
("{{aze!=}}{azett!=}[a=12]", (
|
||||
sy.OptionalToken([
|
||||
sy.OptionalClassToken([
|
||||
"aze!=",
|
||||
]),
|
||||
sy.OptionalInsertToken([
|
||||
"azett!=",
|
||||
]),
|
||||
sy.OptionalVarToken([
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
]),
|
||||
]),
|
||||
), __GL()),
|
||||
("[a=12]{aze,/.}{{azer!=}}", (
|
||||
sy.OptionalToken([
|
||||
sy.OptionalVarToken([
|
||||
sy.BeAssignToken([["a", 12]]),
|
||||
]),
|
||||
sy.OptionalInsertToken([
|
||||
"aze,/.",
|
||||
]),
|
||||
sy.OptionalClassToken([
|
||||
"azer!=",
|
||||
]),
|
||||
]),
|
||||
), __GL()),
|
||||
],
|
||||
# Enhanced Text
|
||||
"enhanced_text": [
|
||||
# Matches a line of text, with or without inline elements
|
||||
|
|
@ -169,7 +278,18 @@ dict_advanced_syntax_input_and_expected_output = {
|
|||
sy.EtStrikethroughToken(["~~"]), sy.TextToken(["Strikethrough"]),
|
||||
), __GL()),
|
||||
],
|
||||
|
||||
"html_insert": [
|
||||
# Match a HTML insert
|
||||
("{azer='\"}", (
|
||||
"azer='\"",
|
||||
), __GL()),
|
||||
],
|
||||
"class_insert": [
|
||||
# Match a class insert
|
||||
("{{azer='\"}}", (
|
||||
"azer='\"",
|
||||
), __GL()),
|
||||
],
|
||||
# Structural Elements
|
||||
"se_start": [
|
||||
# Matches a start of a structural element
|
||||
|
|
@ -571,7 +691,6 @@ def test_advanced_expression_and_token_creation(markup_element, to_parse, expect
|
|||
print(f"Parsing string: '{to_parse}'")
|
||||
print("Defined at %(filename)s:%(lineno)d" % {'filename': __file__, 'lineno': line_test})
|
||||
print(f"With expression: '{markup_element}'")
|
||||
# print(likely_definition_of_advanced_syntax)
|
||||
print("Defined at %(filename)s:%(lineno)d" % {'filename': __syntax_file,
|
||||
'lineno': __definition_of_syntax_elements[markup_element]})
|
||||
print(f"Found: {result} (len:{len(result)}).")
|
||||
|
|
|
|||
Loading…
Reference in New Issue