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

Minor tidying.

Browse Source
This commit is contained in:
Bruce Hill 2018-05-26 13:09:20 -07:00
parent 64294f5cd6
commit 0b4a81191a
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nomsu.lua
View File

@ -193,7 +193,7 @@ do
end) end)
_with_0.dedent = P(function(self, start) _with_0.dedent = P(function(self, start)
local nodent = lpeg.userdata.indent_stack[#lpeg.userdata.indent_stack] local nodent = lpeg.userdata.indent_stack[#lpeg.userdata.indent_stack]
local spaces = self:match("[ ]*", start) local spaces = self:match("^[ ]*", start)
if #spaces <= #nodent - 4 then if #spaces <= #nodent - 4 then
remove(lpeg.userdata.indent_stack) remove(lpeg.userdata.indent_stack)
return start return start

2
nomsu.moon
View File

@ -166,7 +166,7 @@ NOMSU_DEFS = with {}
-- stack minus 4, this pattern matches and pops off the top of the stack exactly once. -- stack minus 4, this pattern matches and pops off the top of the stack exactly once.
.dedent = P (start)=> .dedent = P (start)=>
nodent = lpeg.userdata.indent_stack[#lpeg.userdata.indent_stack] nodent = lpeg.userdata.indent_stack[#lpeg.userdata.indent_stack]
spaces = @match("[ ]*", start) spaces = @match("^[ ]*", start)
if #spaces <= #nodent-4 if #spaces <= #nodent-4
remove(lpeg.userdata.indent_stack) remove(lpeg.userdata.indent_stack)
return start return start

21
nomsu.peg
View File

@ -7,20 +7,13 @@ file:
shebang: "#!" [^%nl]* (!. / %nl) shebang: "#!" [^%nl]* (!. / %nl)
statement: (action / expression) (eol / (({} ([^%nl]* -> "Error while parsing line")) => error))
inline_statement: inline_action / inline_expression
inline_block (Block): inline_block (Block):
inline_statement (%ws* ";" %ws* inline_statement)+ inline_statement (%ws* ";" %ws* inline_statement)+
block (Block): block (Block):
statement (nodent (statement / (({} ([^%nl]* -> "Error while parsing block line")) => error)))+ statement (nodent (statement / (({} ([^%nl]* -> "Error while parsing block line")) => error)))+
inline_nomsu (EscapedNomsu): "\" noindex_inline_expression statement: (action / expression) (eol / (({} ([^%nl]* -> "Error while parsing line")) => error))
indented_nomsu (EscapedNomsu): inline_statement: inline_action / inline_expression
"\" (noindex_inline_expression / (":" %ws* (inline_block / inline_action / inline_expression) eol) / indented_expression)
index_chain (IndexChain):
noindex_inline_expression ("." (text_word / noindex_inline_expression))+
noindex_inline_expression: noindex_inline_expression:
number / variable / inline_text / inline_list / inline_dict / inline_nomsu number / variable / inline_text / inline_list / inline_dict / inline_nomsu
@ -31,7 +24,6 @@ noindex_inline_expression:
/ (({} ([^%nl]* -> 'Error while parsing subexpression')) => error) / (({} ([^%nl]* -> 'Error while parsing subexpression')) => error)
) )
) )
inline_expression: inline_expression:
index_chain / noindex_inline_expression index_chain / noindex_inline_expression
indented_expression: indented_expression:
@ -43,7 +35,14 @@ indented_expression:
expression: expression:
inline_expression / (":" %ws* (inline_block / inline_action / inline_expression) eol) / indented_expression inline_expression / (":" %ws* (inline_block / inline_action / inline_expression) eol) / indented_expression
-- Function calls need at least one word in them inline_nomsu (EscapedNomsu): "\" inline_expression
indented_nomsu (EscapedNomsu):
"\" (noindex_inline_expression / (":" %ws* (inline_block / inline_action / inline_expression) eol) / indented_expression)
index_chain (IndexChain):
noindex_inline_expression ("." (text_word / noindex_inline_expression))+
-- Actions need at least one word in them
inline_action (Action): inline_action (Action):
(inline_expression %ws*)* word (%ws* (inline_expression / word))* (inline_expression %ws*)* word (%ws* (inline_expression / word))*
(%ws* ":" %ws* (inline_block / inline_action / inline_expression))? (%ws* ":" %ws* (inline_block / inline_action / inline_expression))?