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

Added support for "{:\n...}" style comprehensions

Browse Source
This commit is contained in:
Bruce Hill 2019-03-09 15:55:22 -08:00
parent c7483d92b7
commit 3d2db69148
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nomsu.7.peg
View File

@ -193,6 +193,7 @@ variable (Var) <- "$" ({ident_char+} / "(" ws* (inline_action / variable) ws* ")
inline_list (List) <- inline_list (List) <-
!indented_list
"[" ws* !eol "[" ws* !eol
(inline_list_item (ws* ',' ws* inline_list_item)* (ws* ',')?)? ws* (inline_list_item (ws* ',' ws* inline_list_item)* (ws* ',')?)? ws*
("]" / eof / (","? (missing_bracket_error / unexpected_code))) ("]" / eof / (","? (missing_bracket_error / unexpected_code)))
@ -200,8 +201,9 @@ inline_list_item <- inline_action / inline_expression
indented_list (List) <- indented_list (List) <-
({| ({|
"[" eol nl_indent "[" (
list_line (nl_nodent list_line)* (ws* indented_block)
/ (eol nl_indent list_line (nl_nodent list_line)*))
{:curr_indent: %nil :} {:curr_indent: %nil :}
|} -> unpack) |} -> unpack)
(nl_nodent "]" / eof / missing_bracket_error / unexpected_code) (nl_nodent "]" / eof / missing_bracket_error / unexpected_code)
@ -211,15 +213,17 @@ list_line <-
inline_dict (Dict) <- inline_dict (Dict) <-
!indented_dict
"{" ws* !eol "{" ws* !eol
((inline_action / inline_expression) (ws* ',' ws* (inline_action / inline_expression))*)? ws* ((inline_action / inline_expression) (ws* ',' ws* (inline_action / inline_expression))*)? ws*
("}" / eof / (","? (missing_brace_error / unexpected_code))) ("}" / eof / (","? (missing_brace_error / unexpected_code)))
indented_dict (Dict) <- indented_dict (Dict) <-
({| ({|
"{" eol nl_indent "{" (
dict_line (nl_nodent dict_line)* (ws* indented_block)
(%nl (ws* %nl)* nodent (comment / eol / unexpected_code))* / (eol nl_indent dict_line (nl_nodent dict_line)*
(%nl (ws* %nl)* nodent (comment / eol / unexpected_code))*))
{:curr_indent: %nil :} {:curr_indent: %nil :}
|} -> unpack) |} -> unpack)
(nl_nodent "}" / eof / missing_brace_error / unexpected_code) (nl_nodent "}" / eof / missing_brace_error / unexpected_code)