diff options
| author | Adrian Thurston <thurston@complang.org> | 2014-01-19 11:53:37 -0500 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2014-01-19 11:53:37 -0500 |
| commit | 2585cf92f657c49451d5005715639341d45ed5f4 (patch) | |
| tree | 494143e9c45d1f67ad1e59ca0e3031399d422e28 /src/colm.lm | |
| parent | 74c213affd86ed2df6f70a37b1b63b09ef94090b (diff) | |
| download | colm-2585cf92f657c49451d5005715639341d45ed5f4.tar.gz | |
updated ni syntax, require - between def and kw
literal `( -ni
token id /'a'/ -ni
This allows ni to appear in literal defs without an ambiguity beween left and
right ignore.
Diffstat (limited to 'src/colm.lm')
| -rw-r--r-- | src/colm.lm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/colm.lm b/src/colm.lm index feeec83c..e5f1d6d1 100644 --- a/src/colm.lm +++ b/src/colm.lm @@ -298,10 +298,14 @@ def literal_list | [literal_item] :Base def literal_item - [NiLeft: opt_no_ignore backtick_lit NiRight: opt_no_ignore] + [no_ignore_left backtick_lit no_ignore_right] -def opt_no_ignore - [NI] :Ni +def no_ignore_left + [NI MINUS] :Ni +| [] + +def no_ignore_right + [MINUS NI] :Ni | [] def namespace_def @@ -349,9 +353,9 @@ def opt_lex_expr def token_def [TOKEN id VarDefList: var_def* - NiLeft: opt_no_ignore + no_ignore_left LEX_FSLASH opt_lex_expr LEX_FSLASH - NiRight: opt_no_ignore + no_ignore_right opt_translate] def ic_def |