Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed indented interpolations for inline strings.

Browse Source
This commit is contained in:
Bruce Hill 2018-01-30 15:13:04 -08:00
parent 0563571625
commit 78c15a5d5e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nomsu.peg
View File

@ -39,7 +39,7 @@ inline_text (Text):
!('".."' eol) !('".."' eol)
'"' {| '"' {|
({~ (('\"' -> '"') / ('\\' -> '\') / %escaped_char / [^%nl\"])+ ~} ({~ (('\"' -> '"') / ('\\' -> '\') / %escaped_char / [^%nl\"])+ ~}
/ text_interpolation)* / inline_text_interpolation)*
|} '"' |} '"'
-- Have to use "%indent" instead of "indent" etc. to avoid messing up text lines that start with "#" -- Have to use "%indent" instead of "indent" etc. to avoid messing up text lines that start with "#"
indented_text (Text): indented_text (Text):
@ -50,14 +50,20 @@ indented_text (Text):
/ (%nl+ {~ %nodent -> "" ~}) / [^%nl\])+ / (%nl+ {~ %nodent -> "" ~}) / [^%nl\])+
~} / text_interpolation)* ~} / text_interpolation)*
|} (((!.) &%dedent) / (&(%nl %dedent)) / (("" -> "Error while parsing Text") => error)) |} (((!.) &%dedent) / (&(%nl %dedent)) / (("" -> "Error while parsing Text") => error))
text_interpolation: inline_text_interpolation:
"\" ( "\" (
variable / inline_list / inline_dict / inline_text variable / inline_list / inline_dict / inline_text
/ ("(" %ws* (inline_functioncall / inline_expression) %ws* ")") / ("(" %ws* (inline_functioncall / inline_expression) %ws* ")")
)
text_interpolation:
inline_text_interpolation /
("\" (
variable / inline_list / inline_dict / inline_text
/ ("(" %ws* (inline_functioncall / inline_expression) %ws* ")")
/ (%ws* (block_comment / line_comment)? nodent "..") / (%ws* (block_comment / line_comment)? nodent "..")
/ (indented_text %nl+ %nodent "..") / (indented_text %nl+ %nodent "..")
/ ((indented_list / indented_block) nodent "..") / ((indented_list / indented_block) nodent "..")
) ))
number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonumber) number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonumber)