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

Updated so files without multiple chunks parse as

Browse Source 
actions/lists/blocks, etc. Also fixed escaped blocks, which weren't
previously working.
This commit is contained in:
Bruce Hill 2018-07-22 13:26:35 -07:00
parent a07a3ef819
commit 4af50ab2dd
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
nomsu.2.peg
View File

@ -1,12 +1,26 @@
-- Nomsu version 2 -- Nomsu version 2
file (FileChunks): file:
{:curr_indent: ' '* :} {:curr_indent: ' '* :}
("#!" (!"nomsu" [^%nl])* "nomsu" %ws+ "-V" %ws* {:version: [0-9.]+ :} [^%nl]*)? (file_chunks / chunk / (comment? blank_lines? (inline_block / indented_block)))?
comment? blank_lines?
(chunk (nl_nodent section_division nl_nodent chunk)*)?
blank_lines? blank_lines?
%ws* (!! .+ -> "Parse error" !!)? %ws* (!! .+ -> "Parse error" !!)?
shebang: "#!" (!"nomsu" [^%nl])* "nomsu" %ws+ "-V" %ws* {:version: [0-9.]+ :} [^%nl]*
file_chunks (FileChunks):
{:curr_indent: ' '* :}
shebang? comment? blank_lines?
chunk (nl_nodent section_division nl_nodent chunk)+
blank_lines?
chunk:
top_block / (comment? blank_lines? statement)
top_block (Block):
{:curr_indent: ' '* :}
shebang? comment? blank_lines?
statement (nl_nodent statement)+
nodent: =curr_indent !(" ") nodent: =curr_indent !(" ")
indent: =curr_indent " " indent: =curr_indent " "
blank_lines: %nl ((nodent comment / %ws*) %nl)* blank_lines: %nl ((nodent comment / %ws*) %nl)*
@ -25,14 +39,13 @@ section_division: ("~")^+3 eol
inline_block: inline_block:
"(" %ws* inline_block %ws* ")" / raw_inline_block "(" %ws* inline_block %ws* ")" / raw_inline_block
raw_inline_block (Block): raw_inline_block (Block):
"(" %ws* inline_block %ws* ")" ":" %ws* ((inline_statement (%ws* ";" %ws* inline_statement)*) / !(eol nl_indent))
/ ":" %ws* ((inline_statement (%ws* ";" %ws* inline_statement)*) / !(eol nl_indent))
chunk (Block):
statement (nl_nodent statement)*
indented_block (Block): indented_block (Block):
":" eol nl_indent statement (nl_nodent statement)* (%nl (%ws* %nl)* nodent comment)* ":" eol nl_indent statement (nl_nodent statement)* (%nl (%ws* %nl)* nodent comment)*
statement: (action / expression) (eol / (!! [^%nl]+ -> "Unexpected character while parsing line" !!)) statement:
(action / expression) (eol / (!! [^%nl]+ -> "Unexpected code while parsing line" !!))
inline_statement: (inline_action / inline_expression) inline_statement: (inline_action / inline_expression)
noindex_inline_expression: noindex_inline_expression:
@ -42,7 +55,7 @@ noindex_inline_expression:
(%ws* ',' %ws* (inline_action / inline_expression) %ws*)* (%ws* ',' %ws* (inline_action / inline_expression) %ws*)*
(")" (")"
/ (!! eol -> 'Line ended without finding a closing )-parenthesis' !!) / (!! eol -> 'Line ended without finding a closing )-parenthesis' !!)
/ (!! [^%nl]+ -> 'Unexpected character while parsing subexpression' !!) / (!! [^%nl]+ -> 'Unexpected code while parsing subexpression' !!)
) )
) )
inline_expression: index_chain / noindex_inline_expression inline_expression: index_chain / noindex_inline_expression
@ -50,14 +63,15 @@ indented_expression:
indented_text / indented_nomsu / indented_list / indented_dict / ({| indented_text / indented_nomsu / indented_list / indented_dict / ({|
"(..)" nl_indent "(..)" nl_indent
(action / expression) (nl_nodent comment)* (action / expression) (nl_nodent comment)*
(eol / (!! [^%nl]+ -> "Unexpected character while parsing indented expression" !!)) (eol / (!! [^%nl]+ -> "Unexpected code while parsing indented expression" !!))
|} -> unpack) |} -> unpack)
/ (nl_indent (!! [^%nl]* -> "Unexpected indentation. Perhaps you meant to put a ':' or '(..)' on the previous line?" !!) (nl_nodent [^%nl]*)*)
expression: expression:
inline_expression / indented_expression inline_expression / indented_expression
inline_nomsu (EscapedNomsu): "\" inline_expression inline_nomsu (EscapedNomsu): "\" (inline_expression / inline_block)
indented_nomsu (EscapedNomsu): indented_nomsu (EscapedNomsu):
"\" (noindex_inline_expression / indented_expression) "\" (noindex_inline_expression / inline_block / indented_expression / indented_block)
index_chain (IndexChain): index_chain (IndexChain):
noindex_inline_expression ("." (text_word / noindex_inline_expression))+ noindex_inline_expression ("." (text_word / noindex_inline_expression))+
@ -86,7 +100,7 @@ inline_text (Text):
/ inline_text_interpolation)* / inline_text_interpolation)*
('"' ('"'
/ (!! eol -> 'Line ended before finding a closing double quotation mark' !!) / (!! eol -> 'Line ended before finding a closing double quotation mark' !!)
/ (!! [^%nl]+ -> 'Unexpected character while parsing Text' !!)) / (!! [^%nl]+ -> 'Unexpected code while parsing Text' !!))
inline_text_interpolation: inline_text_interpolation:
"\" ( "\" (
variable / inline_list / inline_dict / inline_text variable / inline_list / inline_dict / inline_text
@ -95,13 +109,13 @@ inline_text_interpolation:
(%ws* ',' %ws* (inline_action / inline_expression) %ws*)* (%ws* ',' %ws* (inline_action / inline_expression) %ws*)*
(")" (")"
/ (!! eol -> 'Line ended without finding a closing )-parenthesis' !!) / (!! eol -> 'Line ended without finding a closing )-parenthesis' !!)
/ (!! [^%nl]+ -> 'Unexpected character while parsing Text interpolation' !!))) / (!! [^%nl]+ -> 'Unexpected code while parsing Text interpolation' !!)))
) )
indented_text (Text): indented_text (Text):
'".."' eol %nl {%nl*} {:curr_indent: indent :} '".."' eol %nl {%nl*} {:curr_indent: indent :}
(indented_plain_text / text_interpolation / {~ %nl+ (=curr_indent -> "") ~})* (indented_plain_text / text_interpolation / {~ %nl+ (=curr_indent -> "") ~})*
(!! [^%nl]+ -> "Unexpected character while parsing Text" !!)? (!! [^%nl]+ -> "Unexpected code while parsing Text" !!)?
-- Tracking text-lines-within-indented-text as separate objects allows for better debugging line info -- Tracking text-lines-within-indented-text as separate objects allows for better debugging line info
indented_plain_text (Text): indented_plain_text (Text):
{~ (("\\" -> "\") / (("\" blank_lines =curr_indent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+ {~ (("\\" -> "\") / (("\" blank_lines =curr_indent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+
@ -121,12 +135,12 @@ inline_list (List):
(inline_list_item (%ws* ',' %ws* inline_list_item)* (%ws* ',')?)? %ws* (inline_list_item (%ws* ',' %ws* inline_list_item)* (%ws* ',')?)? %ws*
("]" / (","? ( ("]" / (","? (
(!! eol -> "Line ended before finding a closing ]-bracket" !!) (!! eol -> "Line ended before finding a closing ]-bracket" !!)
/(!! [^%nl]+ -> "Unexpected character while parsing List" !!) /(!! [^%nl]+ -> "Unexpected code while parsing List" !!)
))) )))
indented_list (List): indented_list (List):
"[..]" eol nl_indent "[..]" eol nl_indent
list_line (nl_nodent list_line)* (nl_nodent comment)* list_line (nl_nodent list_line)* (nl_nodent comment)*
(","? (!! [^%nl]+ -> "Unexpected character while parsing List" !!))? (","? (!! [^%nl]+ -> "Unexpected code while parsing List" !!))?
list_line: list_line:
(inline_list_item %ws* "," %ws*)+ eol (inline_list_item %ws* "," %ws*)+ eol
/ (inline_list_item %ws* "," %ws*)* (action / expression) eol / (inline_list_item %ws* "," %ws*)* (action / expression) eol
@ -138,12 +152,12 @@ inline_dict (Dict):
(inline_dict_entry (%ws* ',' %ws* inline_dict_entry)*)? %ws* (inline_dict_entry (%ws* ',' %ws* inline_dict_entry)*)? %ws*
("}" / (","? ( ("}" / (","? (
(!! eol -> "Line ended before finding a closing }-brace" !!) (!! eol -> "Line ended before finding a closing }-brace" !!)
/ (!! [^%nl]* -> "Unexpected character while parsing Dictionary" !!) / (!! [^%nl]* -> "Unexpected code while parsing Dictionary" !!)
))) )))
indented_dict (Dict): indented_dict (Dict):
"{..}" eol nl_indent "{..}" eol nl_indent
dict_line (nl_nodent dict_line)* (nl_nodent comment)* dict_line (nl_nodent dict_line)* (nl_nodent comment)*
(","? (!! [^%nl]+ -> "Unexpected character while parsing Dictionary" !!))? (","? (!! [^%nl]+ -> "Unexpected code while parsing Dictionary" !!))?
dict_line: dict_line:
(inline_dict_entry %ws* "," %ws*)+ eol (inline_dict_entry %ws* "," %ws*)+ eol
/ (inline_dict_entry %ws* "," %ws*)* dict_entry eol / (inline_dict_entry %ws* "," %ws*)* dict_entry eol