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

Fix for parsing empty files, adding hex number literals (0xdeadbeef),

Browse Source 
and fix for long strings ending with an indented interpolation.
This commit is contained in:
Bruce Hill 2018-07-30 13:47:40 -07:00
parent f6e9bdc1c0
commit aafce3a765
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nomsu.2.peg
View File

@ -2,7 +2,7 @@
file: file:
{:curr_indent: ' '* :} {:curr_indent: ' '* :}
(((action / expression / inline_block / indented_block) eol !.) (((action / expression / inline_block / indented_block) eol !.)
/ file_chunks / blank_lines / '') / file_chunks / empty_block)
%ws* (!! .+ -> "Parse error" !!)? %ws* (!! .+ -> "Parse error" !!)?
shebang: "#!" (!"nomsu" [^%nl])* "nomsu" %ws+ "-V" %ws* {:version: [0-9.]+ :} [^%nl]* shebang: "#!" (!"nomsu" [^%nl])* "nomsu" %ws+ "-V" %ws* {:version: [0-9.]+ :} [^%nl]*
@ -17,6 +17,10 @@ top_block (Block):
{:curr_indent: ' '* :} {:curr_indent: ' '* :}
comment? blank_lines? statement (nl_nodent statement)* comment? blank_lines? statement (nl_nodent statement)*
empty_block (Block):
{:curr_indent: ' '* :}
comment? blank_lines?
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)*
@ -117,9 +121,9 @@ indented_plain_text (Text):
{~ (("\\" -> "\") / (("\" blank_lines =curr_indent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+ {~ (("\\" -> "\") / (("\" blank_lines =curr_indent "..") -> "") / (!text_interpolation "\") / [^%nl\]+)+
(%nl+ (=curr_indent -> ""))* ~} (%nl+ (=curr_indent -> ""))* ~}
text_interpolation: text_interpolation:
inline_text_interpolation / ("\" indented_expression blank_lines =curr_indent "..") inline_text_interpolation / ("\" indented_expression (blank_lines =curr_indent "..")?)
number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / ([0-9]+)))-> tonumber) number (Number): (("-"? (([0-9]+ "." [0-9]+) / ("." [0-9]+) / "0x" [0-9a-fA-F]+ / ([0-9]+)))-> tonumber)
-- Variables can be nameless (i.e. just %) and can only contain identifier chars. -- Variables can be nameless (i.e. just %) and can only contain identifier chars.
-- This ensures you don't get weird parsings of `%x+%y` or `%'s thing`. -- This ensures you don't get weird parsings of `%x+%y` or `%'s thing`.