From ba2b83d5669f9fcf6f49fcd2adac5997eb07f7d8 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 11 Jul 2018 14:13:43 -0700 Subject: Fixed nomsu codegen for indented text and improved text parsing. Also moved some more tests inline. --- nomsu.peg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nomsu.peg') diff --git a/nomsu.peg b/nomsu.peg index 8b4d9ec..4598598 100644 --- a/nomsu.peg +++ b/nomsu.peg @@ -101,11 +101,11 @@ inline_text_interpolation: indented_text (Text): '".."' eol %nl {| {~ (%nl*) (%indent -> "") ~} - (indented_plain_text / text_interpolation / {~ ("\" nodent "..") -> "" ~} / {~ %nl+ (%nodent -> "") ~})* + (indented_plain_text / text_interpolation / {~ %nl+ (%nodent -> "") ~})* |} (((!.) %dedent) / (&(%nl %dedent)) / (({} (non_dedent_error -> "Unexpected character while parsing Text") %userdata) => error)) indented_plain_text (Text): - {| ({~ "\\" -> "\" ~} / {[^%nl\]+} / {!(text_interpolation / "\" nodent "..") "\"})+ - {~ (%nl+ (%nodent -> "")) / (("\" nodent "..") -> "") ~}* |} + {| {~ (("\\" -> "\") / (("\" nodent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+ + (%nl+ (%nodent -> ""))* ~} |} text_interpolation: inline_text_interpolation / ("\" indented_expression nodent "..") -- cgit v1.2.3