diff options
| author | Adrian Thurston <thurston@complang.org> | 2015-05-03 10:57:21 -0400 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2015-05-03 10:57:21 -0400 |
| commit | d3e203a7afc9932547f9f6ed054cbfa077c2348f (patch) | |
| tree | 0f5a103644e031855fee2159a03bb081b5ed54ff /src/colm.lm | |
| parent | 95da2c03497492692f818c1b722712c420c1eee7 (diff) | |
| download | colm-d3e203a7afc9932547f9f6ed054cbfa077c2348f.tar.gz | |
brought back the comma to param/arg lists
Diffstat (limited to 'src/colm.lm')
| -rw-r--r-- | src/colm.lm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/colm.lm b/src/colm.lm index 6e273946..27214c23 100644 --- a/src/colm.lm +++ b/src/colm.lm @@ -288,8 +288,12 @@ def iter_def def reference_type_ref [REF LT type_ref GT] +def param_var_def_seq + [param_var_def COMMA param_var_def_seq] +| [param_var_def] + def param_var_def_list - [param_var_def param_var_def_list] + [param_var_def_seq] | [] def param_var_def @@ -472,8 +476,12 @@ def optional_else [ELSE block_or_single] :Else | [] +def call_arg_seq + [code_expr COMMA call_arg_seq] +| [code_expr] + def call_arg_list - [code_expr call_arg_list] + [call_arg_seq] | [] def iter_call @@ -577,9 +585,9 @@ def type_ref | [BOOL] :Bool | [PARSER LT type_ref GT] :Parser | [LIST LT type_ref GT] :List -| [MAP LT KeyType: type_ref ElType: type_ref GT] :Map +| [MAP LT KeyType: type_ref COMMA ElType: type_ref GT] :Map | [VLIST LT type_ref GT] :ValueList -| [VMAP LT KeyType: type_ref ValType: type_ref GT] :ValueMap +| [VMAP LT KeyType: type_ref COMMA ValType: type_ref GT] :ValueMap def region_qual [region_qual id DOUBLE_COLON] :Qual |