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

Fixed an edge case with indentation

Browse Source
This commit is contained in:
Bruce Hill 2019-01-18 20:40:18 -08:00
parent ab116d4d8f
commit 17822c6366
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nomsu.2.peg
View File

@ -15,7 +15,7 @@ file_chunks (FileChunks) <-
ws* unexpected_chunk? ws* unexpected_chunk?
top_block (Block) <- top_block (Block) <-
(comment nl_nodent)? statement (nl_nodent statement)* ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)*
empty_block (Block) <- empty_block (Block) <-
comment? blank_lines? comment? blank_lines?

2
nomsu.3.peg
View File

@ -15,7 +15,7 @@ file_chunks (FileChunks) <-
ws* unexpected_chunk? ws* unexpected_chunk?
top_block (Block) <- top_block (Block) <-
(comment nl_nodent)? statement (nl_nodent statement)* ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)*
empty_block (Block) <- empty_block (Block) <-
comment? blank_lines? comment? blank_lines?

2
nomsu.4.peg
View File

@ -17,7 +17,7 @@ file_chunks (FileChunks) <-
ws* unexpected_chunk? ws* unexpected_chunk?
top_block (Block) <- top_block (Block) <-
(comment nl_nodent)? statement (nl_nodent statement)* ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)*
empty_block (Block) <- empty_block (Block) <-
comment? blank_lines? comment? blank_lines?

2
nomsu.5.peg
View File

@ -17,7 +17,7 @@ file_chunks (FileChunks) <-
ws* unexpected_chunk? ws* unexpected_chunk?
top_block (Block) <- top_block (Block) <-
(comment nl_nodent)? statement (nl_nodent statement)* ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)*
empty_block (Block) <- empty_block (Block) <-
comment? blank_lines? comment? blank_lines?

9
nomsu.6.peg
View File

@ -2,7 +2,7 @@
file <- file <-
{:curr_indent: ' '* :} {:curr_indent: ' '* :}
(((methodchain / action / expression / inline_block) eol !.) (((methodchain / action / expression / inline_block) eol !.)
/ file_chunks / comment? (blank_lines ws*)?) / file_chunks / comment? blank_lines?)
{:curr_indent: %nil :} {:curr_indent: %nil :}
!. !.
@ -19,7 +19,7 @@ section_division <- ("~")^+3 eol
eof <- !. eof <- !.
eol <- ws* (&%nl / !.) eol <- ws* (&%nl / !.)
nodent <- (unexpected_indent [^%nl]* / =curr_indent) nodent <- (unexpected_indent [^%nl]* / =curr_indent)
indent <- {=curr_indent " "} indent <- { =curr_indent " " }
blank_lines <- %nl ((nodent comment / ws*) %nl)* blank_lines <- %nl ((nodent comment / ws*) %nl)*
nl_nodent <- blank_lines nodent nl_nodent <- blank_lines nodent
nl_indent <- blank_lines tab_error? {:curr_indent: indent :} (comment nl_nodent)* nl_indent <- blank_lines tab_error? {:curr_indent: indent :} (comment nl_nodent)*
@ -30,7 +30,7 @@ comment (Comment) <-
top_block (Block) <- top_block (Block) <-
(comment nl_nodent)? statement (nl_nodent statement)* ((blank_lines nodent) / (comment nl_nodent))? statement (nl_nodent statement)*
inline_block (Block) <- inline_block (Block) <-
":" ws* (inline_statement (ws* ";" ws* inline_statement)*)? ":" ws* (inline_statement (ws* ";" ws* inline_statement)*)?
@ -243,9 +243,6 @@ _unexpected_code (Error) <-
{:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :} {:error: {~ [^%nl]+ -> "Couldn't parse this code" ~} :}
unexpected_chunk (Error) <- unexpected_chunk (Error) <-
{:error: {~ .+ -> "Couldn't parse this code" ~} :} {:error: {~ .+ -> "Couldn't parse this code" ~} :}
unexpected_space (Error) <-
{:error: {~ ws+ -> "Messed up indentation" ~} :}
{:hint: {~ '' -> 'Either make sure this line is aligned with the one above it, or make sure the previous line ends with something that uses indentation, like ":" or "(..)"' ~} :}
unexpected_indent (Error) <- unexpected_indent (Error) <-
{:error: {~ (=curr_indent ws+) -> "Messed up indentation" ~} :} {:error: {~ (=curr_indent ws+) -> "Messed up indentation" ~} :}
{:hint: {~ '' -> 'Either make sure this line is aligned with the one above it, or make sure the previous line ends with something that uses indentation, like ":" or "(..)"' ~} :} {:hint: {~ '' -> 'Either make sure this line is aligned with the one above it, or make sure the previous line ends with something that uses indentation, like ":" or "(..)"' ~} :}