diff options
| author | Adrian Thurston <thurston@complang.org> | 2015-01-02 19:47:48 -0500 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2015-01-02 19:47:48 -0500 |
| commit | fa8f8d2c9a4f9977c61b6437b364108b404e254d (patch) | |
| tree | 0bcfab454b03b5d9678edf4801a39a8778a13d49 /src/colm.lm | |
| parent | c30c290fbf88866871e157e835a5d73d06aee56b (diff) | |
| download | colm-fa8f8d2c9a4f9977c61b6437b364108b404e254d.tar.gz | |
removed the multi-embeddable list code (aapl style)
Left this work on branch embedded-list-el.
Diffstat (limited to 'src/colm.lm')
| -rw-r--r-- | src/colm.lm | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/colm.lm b/src/colm.lm index 461e61c3..8527cf25 100644 --- a/src/colm.lm +++ b/src/colm.lm @@ -28,12 +28,8 @@ lex token IN / 'in' / token PARSER / 'parser' | 'accum' / token LIST / 'list' / - token LIST2 / 'list2' / - token LIST2EL / 'list2el' / token LIST_EL / 'list_el' / token MAP / 'map' / - token MAP2 / 'map2' / - token MAP2EL / 'map2el' / token MAP_EL / 'map_el' / token PTR / 'ptr' / token ITER / 'iter' / @@ -249,12 +245,6 @@ def pre_eof_def def alias_def [ALIAS id type_ref] -def list_el_def - [LIST_EL id] - -def map_el_def - [MAP_EL id] - def context_item [context_var_def] :ContextVar commit | [literal_def] :Literal commit @@ -270,8 +260,6 @@ def context_item | [export_def] :Export commit | [pre_eof_def] :PreEof commit | [precedence_def] :Precedence commit -| [list_el_def] :ListEl commit -| [map_el_def] :MapEl commit def export_def [EXPORT var_def opt_def_init] @@ -568,12 +556,10 @@ def type_ref [region_qual id opt_repeat] :Id | [PTR LT region_qual id opt_repeat GT] :Ptr | [LIST LT type_ref GT] :List +| [LIST_EL LT type_ref GT] :ListEl | [MAP LT MapKeyType: type_ref MapValueType: type_ref GT] :Map +| [MAP_EL LT type_ref GT] :MapEl | [PARSER LT type_ref GT] :Parser -| [LIST2EL LT type_ref GT] :List2El -| [LIST2 LT type_ref GT] :List2 -| [MAP2EL LT type_ref GT] :Map2El -| [MAP2 LT type_ref GT] :Map2 def region_qual [region_qual id DOUBLE_COLON] :Qual |