aboutsummaryrefslogtreecommitdiff
path: root/nomsu.6.peg
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2019-01-01 17:15:51 -0800
committerBruce Hill <bruce@bruce-hill.com>2019-01-01 17:17:23 -0800
commit3e89092833a6d407e711fe4ae5f44474ff34cf64 (patch)
tree5ffe2df86f648b604347b59999992d74f71a796c /nomsu.6.peg
parente68eb04d690454428216a0f0f1b11399feeb7dc1 (diff)
Some changes to the error API, a fix for statement block parsing, and
replacing ((foo 1 baz)'s meaning) with $(foo 1 baz).
Diffstat (limited to 'nomsu.6.peg')
-rw-r--r--nomsu.6.peg6
1 files changed, 3 insertions, 3 deletions
diff --git a/nomsu.6.peg b/nomsu.6.peg
index 344f679..9a9393f 100644
--- a/nomsu.6.peg
+++ b/nomsu.6.peg
@@ -99,14 +99,14 @@ indented_index_chain <-
-- Actions need 1 argument and either another argument or a word.
inline_action (Action) <-
!section_division
- ( word (ws* arg)*
- / inline_expression ((ws* arg)+ / "(" ws* ")"))
+ ( word (ws* inline_arg)*
+ / inline_expression ((ws* inline_arg)+ / "(" ws* ")"))
inline_arg <- inline_expression / word
action (Action) <-
!section_division
( word ((linesplit / ws*) arg)*
- / arg (((linesplit / ws*) arg)+ / "(" ws* ")"))
+ / !statement_block arg (((linesplit / ws*) arg)+ / "(" ws* ")"))
arg <- expression / indented_naked_expression / word
linesplit <- eol nl_nodent ".." ws*