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

Simplified parser by removing prev_edge.

Browse Source
This commit is contained in:
Bruce Hill 2017-12-08 15:39:05 -08:00
parent 8da2b1d64c
commit 28b6bc1883
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nomsu.lua
View File

@ -105,13 +105,13 @@ local nomsu = [=[ file <- ({{| shebang?
-- Function calls need at least one word in them -- Function calls need at least one word in them
inline_functioncall <- ({(''=>line_no) {| inline_functioncall <- ({(''=>line_no) {|
(inline_expression tok_gap)* word (tok_gap (inline_expression / word))* (inline_expression %ws?)* word (%ws? (inline_expression / word))*
|} }) -> FunctionCall |} }) -> FunctionCall
noeol_functioncall <- ({(''=>line_no) {| noeol_functioncall <- ({(''=>line_no) {|
(noeol_expression tok_gap)* word (tok_gap (noeol_expression / word))* (noeol_expression %ws?)* word (%ws? (noeol_expression / word))*
|} }) -> FunctionCall |} }) -> FunctionCall
functioncall <- ({(''=>line_no) {| functioncall <- ({(''=>line_no) {|
(expression (dotdot / tok_gap))* word ((dotdot / tok_gap) (expression / word))* (expression (dotdot / %ws?))* word ((dotdot / %ws?) (expression / word))*
|} }) -> FunctionCall |} }) -> FunctionCall
word <- ({ { %operator / (!number %plain_word) } }) -> Word word <- ({ { %operator / (!number %plain_word) } }) -> Word
@ -153,7 +153,6 @@ local nomsu = [=[ file <- ({{| shebang?
indent <- eol (%nl ignored_line)* %nl %indented ((block_comment/line_comment) (%nl ignored_line)* nodent)? indent <- eol (%nl ignored_line)* %nl %indented ((block_comment/line_comment) (%nl ignored_line)* nodent)?
nodent <- eol (%nl ignored_line)* %nl %nodented nodent <- eol (%nl ignored_line)* %nl %nodented
dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented))) dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented)))
tok_gap <- %ws / %prev_edge / &("[" / "\" / [.,:;{("#%] / &%operator)
comma <- %ws? "," %ws? comma <- %ws? "," %ws?
semicolon <- %ws? ";" %ws? semicolon <- %ws? ";" %ws?
dotdot <- nodent ".." %ws? dotdot <- nodent ".." %ws?
@ -173,7 +172,6 @@ local defs = {
indented = Cmt(S(" \t") ^ 0 * (#(P(1) - S(" \t\n") + (-P(1)))), check_indent), indented = Cmt(S(" \t") ^ 0 * (#(P(1) - S(" \t\n") + (-P(1)))), check_indent),
nodented = Cmt(S(" \t") ^ 0 * (#(P(1) - S(" \t\n") + (-P(1)))), check_nodent), nodented = Cmt(S(" \t") ^ 0 * (#(P(1) - S(" \t\n") + (-P(1)))), check_nodent),
dedented = Cmt(S(" \t") ^ 0 * (#(P(1) - S(" \t\n") + (-P(1)))), check_dedent), dedented = Cmt(S(" \t") ^ 0 * (#(P(1) - S(" \t\n") + (-P(1)))), check_dedent),
prev_edge = B(S(" \t\n.,:;}])\"\\'~`!@$^&*-+=|<>?/")),
line_no = function(src, pos) line_no = function(src, pos)
local line_no = 1 local line_no = 1
for _ in src:sub(1, pos):gmatch("\n") do for _ in src:sub(1, pos):gmatch("\n") do

8
nomsu.moon
View File

@ -98,13 +98,13 @@ nomsu = [=[
-- Function calls need at least one word in them -- Function calls need at least one word in them
inline_functioncall <- ({(''=>line_no) {| inline_functioncall <- ({(''=>line_no) {|
(inline_expression tok_gap)* word (tok_gap (inline_expression / word))* (inline_expression %ws?)* word (%ws? (inline_expression / word))*
|} }) -> FunctionCall |} }) -> FunctionCall
noeol_functioncall <- ({(''=>line_no) {| noeol_functioncall <- ({(''=>line_no) {|
(noeol_expression tok_gap)* word (tok_gap (noeol_expression / word))* (noeol_expression %ws?)* word (%ws? (noeol_expression / word))*
|} }) -> FunctionCall |} }) -> FunctionCall
functioncall <- ({(''=>line_no) {| functioncall <- ({(''=>line_no) {|
(expression (dotdot / tok_gap))* word ((dotdot / tok_gap) (expression / word))* (expression (dotdot / %ws?))* word ((dotdot / %ws?) (expression / word))*
|} }) -> FunctionCall |} }) -> FunctionCall
word <- ({ { %operator / (!number %plain_word) } }) -> Word word <- ({ { %operator / (!number %plain_word) } }) -> Word
@ -146,7 +146,6 @@ nomsu = [=[
indent <- eol (%nl ignored_line)* %nl %indented ((block_comment/line_comment) (%nl ignored_line)* nodent)? indent <- eol (%nl ignored_line)* %nl %indented ((block_comment/line_comment) (%nl ignored_line)* nodent)?
nodent <- eol (%nl ignored_line)* %nl %nodented nodent <- eol (%nl ignored_line)* %nl %nodented
dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented))) dedent <- eol (%nl ignored_line)* (((!.) &%dedented) / (&(%nl %dedented)))
tok_gap <- %ws / %prev_edge / &("[" / "\" / [.,:;{("#%] / &%operator)
comma <- %ws? "," %ws? comma <- %ws? "," %ws?
semicolon <- %ws? ";" %ws? semicolon <- %ws? ";" %ws?
dotdot <- nodent ".." %ws? dotdot <- nodent ".." %ws?
@ -166,7 +165,6 @@ defs =
indented: Cmt(S(" \t")^0 * (#(P(1)-S(" \t\n") + (-P(1)))), check_indent) indented: Cmt(S(" \t")^0 * (#(P(1)-S(" \t\n") + (-P(1)))), check_indent)
nodented: Cmt(S(" \t")^0 * (#(P(1)-S(" \t\n") + (-P(1)))), check_nodent) nodented: Cmt(S(" \t")^0 * (#(P(1)-S(" \t\n") + (-P(1)))), check_nodent)
dedented: Cmt(S(" \t")^0 * (#(P(1)-S(" \t\n") + (-P(1)))), check_dedent) dedented: Cmt(S(" \t")^0 * (#(P(1)-S(" \t\n") + (-P(1)))), check_dedent)
prev_edge: B(S(" \t\n.,:;}])\"\\'~`!@$^&*-+=|<>?/")) -- Includes "operator"
line_no: (src, pos)-> line_no: (src, pos)->
line_no = 1 line_no = 1
for _ in src\sub(1,pos)\gmatch("\n") do line_no += 1 for _ in src\sub(1,pos)\gmatch("\n") do line_no += 1