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 /test | |
| 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 'test')
| -rw-r--r-- | test/exit4.lm | 8 | ||||
| -rw-r--r-- | test/exit5.lm | 8 | ||||
| -rw-r--r-- | test/exit6.lm | 8 | ||||
| -rw-r--r-- | test/ignore3.lm | 6 | ||||
| -rw-r--r-- | test/ignore4.lm | 2 | ||||
| -rw-r--r-- | test/ignore5.lm | 7 | ||||
| -rw-r--r-- | test/inpush1.lm | 2 | ||||
| -rw-r--r-- | test/tcontext1.lm | 2 |
8 files changed, 21 insertions, 22 deletions
diff --git a/test/exit4.lm b/test/exit4.lm index bed57922..37751d66 100644 --- a/test/exit4.lm +++ b/test/exit4.lm @@ -153,9 +153,9 @@ namespace ragel "'" ( [^'\\] | '\\' any )* "'" 'i'? / - token lex_regex_open /'/'/ ni - token lex_sqopen_pos /'['/ ni - token lex_sqopen_neg /'[^'/ ni + token lex_regex_open /'/'/ -ni + token lex_sqopen_pos /'['/ -ni + token lex_sqopen_neg /'[^'/ -ni token word /[a-zA-Z_][a-zA-Z0-9_]*/ token uint / number / @@ -506,7 +506,7 @@ lex / '#ifdef' ' '* INPUT / token ifdef_OUTPUT - / '#ifdef' ' '* OUTPUT ' '* '\n' / ni + / '#ifdef' ' '* OUTPUT ' '* '\n' / -ni token endif / '#endif' / diff --git a/test/exit5.lm b/test/exit5.lm index f80971f6..6986c5bc 100644 --- a/test/exit5.lm +++ b/test/exit5.lm @@ -153,9 +153,9 @@ namespace ragel "'" ( [^'\\] | '\\' any )* "'" 'i'? / - token lex_regex_open /'/'/ ni - token lex_sqopen_pos /'['/ ni - token lex_sqopen_neg /'[^'/ ni + token lex_regex_open /'/'/ -ni + token lex_sqopen_pos /'['/ -ni + token lex_sqopen_neg /'[^'/ -ni token word /[a-zA-Z_][a-zA-Z0-9_]*/ token uint / number / @@ -506,7 +506,7 @@ lex / '#ifdef' ' '* INPUT / token ifdef_OUTPUT - / '#ifdef' ' '* OUTPUT ' '* '\n' / ni + / '#ifdef' ' '* OUTPUT ' '* '\n' / -ni token endif / '#endif' / diff --git a/test/exit6.lm b/test/exit6.lm index 20e26421..3f7fd03f 100644 --- a/test/exit6.lm +++ b/test/exit6.lm @@ -153,9 +153,9 @@ namespace ragel "'" ( [^'\\] | '\\' any )* "'" 'i'? / - token lex_regex_open /'/'/ ni - token lex_sqopen_pos /'['/ ni - token lex_sqopen_neg /'[^'/ ni + token lex_regex_open /'/'/ -ni + token lex_sqopen_pos /'['/ -ni + token lex_sqopen_neg /'[^'/ -ni token word /[a-zA-Z_][a-zA-Z0-9_]*/ token uint / number / @@ -506,7 +506,7 @@ lex / '#ifdef' ' '* INPUT / token ifdef_OUTPUT - / '#ifdef' ' '* OUTPUT ' '* '\n' / ni + / '#ifdef' ' '* OUTPUT ' '* '\n' / -ni token endif / '#endif' / diff --git a/test/ignore3.lm b/test/ignore3.lm index 681e0ed0..d95f030a 100644 --- a/test/ignore3.lm +++ b/test/ignore3.lm @@ -2,15 +2,15 @@ lex ignore /space+/ literal `* - literal `( ni - literal ni `) + literal `( -ni + literal ni- `) literal `! `; token id /[a-zA-Z_0-9]+/ end lex ignore /space+/ - token inner_t /[a-zA-Z_0-9]+/ + token inner_t /[a-zA-Z_0-9]+/ token empty - end diff --git a/test/ignore4.lm b/test/ignore4.lm index 9333bd59..cdd94b34 100644 --- a/test/ignore4.lm +++ b/test/ignore4.lm @@ -3,7 +3,7 @@ namespace hash lex literal `define `include - token NL /'\n'/ ni + token NL /'\n'/ -ni token id /[a-zA-Z_][a-zA-Z_0-9]*/ token number /[0-9]+/ diff --git a/test/ignore5.lm b/test/ignore5.lm index f626c572..28a33927 100644 --- a/test/ignore5.lm +++ b/test/ignore5.lm @@ -2,8 +2,7 @@ lex ignore /space+/ literal `* `! `; - token POPEN /'('/ ni - token PCLOSE ni /')'/ + literal `( -ni ni- `) token id /[a-zA-Z_0-9]+/ end @@ -19,7 +18,7 @@ def inner def item [id] -| [POPEN inner PCLOSE] +| [`( inner `)] def start [item* `;] @@ -33,7 +32,7 @@ if ( ! Start ) { for I: item in Start { print( 'item: .' I '.\n' ) - if match I [ O: POPEN Inner: inner C: PCLOSE ] + if match I [ O: `( Inner: inner C: `) ] print( 'innr: .' O '.' Inner '.' C '.\n' ) } diff --git a/test/inpush1.lm b/test/inpush1.lm index 362cd1a7..9f7be150 100644 --- a/test/inpush1.lm +++ b/test/inpush1.lm @@ -28,7 +28,7 @@ namespace hash lex literal `define `include literal `# - token NL /'\n'/ ni + token NL /'\n'/ -ni token id /[a-zA-Z_][a-zA-Z_0-9]*/ token number /[0-9]+/ diff --git a/test/tcontext1.lm b/test/tcontext1.lm index 4705b9e6..86db7182 100644 --- a/test/tcontext1.lm +++ b/test/tcontext1.lm @@ -1,7 +1,7 @@ ##### LM ##### lex - token tIDENTIFIER /[a-z][a-zA-Z_]*/ ni + token tIDENTIFIER /[a-z][a-zA-Z_]*/ -ni ignore /[ \t\n]+/ ignore comment /'#' [^\n]* '\n'/ end |