diff options
| author | Adrian Thurston <thurston@colm.net> | 2016-10-01 09:47:16 -0700 |
|---|---|---|
| committer | Adrian Thurston <thurston@colm.net> | 2016-10-01 09:47:16 -0700 |
| commit | d164f9eea27b9a41f155b4324781e5ccb1bf88c3 (patch) | |
| tree | b6e279beb83bad620202b9e200d53ae20f5b0e3d /src/colm.lm | |
| parent | 84f764672525cd475114b76b104fc1bc0e6ce5b2 (diff) | |
| download | colm-d164f9eea27b9a41f155b4324781e5ccb1bf88c3.tar.gz | |
some name improvements in colm grammar
Diffstat (limited to 'src/colm.lm')
| -rw-r--r-- | src/colm.lm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/colm.lm b/src/colm.lm index cc0a6260..7620ccb8 100644 --- a/src/colm.lm +++ b/src/colm.lm @@ -126,12 +126,12 @@ lex end lex - token CONS_DQ / '\"' / - token CONS_DQ_NL / '\n' / - token CONS_SQOPEN / '[' / - token CONS_SQCLOSE / ']' / + token LIT_DQ / '\"' / + token LIT_DQ_NL / '\n' / + token LIT_SQOPEN / '[' / + token LIT_SQCLOSE / ']' / - token dq_cons_data + token lit_dq_data / ( ^( '\n' | '\"' | '[' | ']' | '\\' ) | '\\' . any )+ / end @@ -683,7 +683,7 @@ def opt_label | [] def dq_lit_term - [CONS_DQ] | [CONS_DQ_NL] + [LIT_DQ] | [LIT_DQ_NL] def sq_lit_term [CONS_SQ] | [CONS_SQ_NL] @@ -703,8 +703,8 @@ def pattern_el | [TILDE opt_tilde_data TILDE_NL] :Tilde def litpat_el - [dq_cons_data] :ConsData -| [CONS_SQOPEN PatternElList: pattern_el* CONS_SQCLOSE] :SubList + [lit_dq_data] :ConsData +| [LIT_SQOPEN PatternElList: pattern_el* LIT_SQCLOSE] :SubList def pattern_top_el [DQ LitpatElList: litpat_el* dq_lit_term] :Dq @@ -740,8 +740,8 @@ def cons_el | [E2 opt_no_trim code_expr] :CodeExpr def lit_cons_el - [dq_cons_data] :ConsData -| [CONS_SQOPEN ConsElList: cons_el* CONS_SQCLOSE] :SubList + [lit_dq_data] :ConsData +| [LIT_SQOPEN ConsElList: cons_el* LIT_SQCLOSE] :SubList def cons_top_el [DQ LitConsElList: lit_cons_el* dq_lit_term] :Dq @@ -767,8 +767,8 @@ def accum_el | [E2 opt_no_trim code_expr] :CodeExpr def lit_accum_el - [dq_cons_data] :ConsData -| [CONS_SQOPEN AccumElList: accum_el* CONS_SQCLOSE] :SubList + [lit_dq_data] :ConsData +| [LIT_SQOPEN AccumElList: accum_el* LIT_SQCLOSE] :SubList def accum_top_el [DQ LitAccumElList: lit_accum_el* dq_lit_term] :Dq @@ -794,8 +794,8 @@ def string_el | [E2 opt_no_trim code_expr] :CodeExpr def lit_string_el - [dq_cons_data] :ConsData -| [CONS_SQOPEN StringElList: string_el* CONS_SQCLOSE] :SubList + [lit_dq_data] :ConsData +| [LIT_SQOPEN StringElList: string_el* LIT_SQCLOSE] :SubList def string_top_el [DQ LitStringElList: lit_string_el* dq_lit_term] :Dq |