diff options
| author | Adrian Thurston <thurston@complang.org> | 2013-03-29 22:37:46 -0400 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2013-03-29 22:37:46 -0400 |
| commit | d86ef75da71e07a489a0769e3860359f9a2cd5a1 (patch) | |
| tree | 61734e453d06fe53f287187e8dbb214b19f5e1de | |
| parent | 30057bea6ad2ecd2d005f497831a5fea551c2ac9 (diff) | |
| download | colm-d86ef75da71e07a489a0769e3860359f9a2cd5a1.tar.gz | |
minor ordering cleanup in constructors/patterns
| -rw-r--r-- | colm/colm.lm | 12 | ||||
| -rw-r--r-- | colm/load.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/colm/colm.lm b/colm/colm.lm index 2ec1752d..37fb2531 100644 --- a/colm/colm.lm +++ b/colm/colm.lm @@ -506,7 +506,7 @@ def field_init def litpat_term [CONS_DQ] | [Nl: CONS_NL] -def pattern_el_type_or_lit +def pattern_el_lel [RegionQual: region_qual Id: id OptRepeat: opt_repeat] | [RegionQual: region_qual Lit: lit OptRepeat: opt_repeat] @@ -515,9 +515,9 @@ def opt_label | [] def pattern_el - [DQ LitpatElList: litpat_el* Term: litpat_term] + [OptLabel: opt_label TypeOrLit: pattern_el_lel] +| [DQ LitpatElList: litpat_el* Term: litpat_term] | [TILDE TildeData: tilde_data Nl: TILDE_NL] -| [OptLabel: opt_label TypeOrLit: pattern_el_type_or_lit] def litpat_el [ConsData: cons_data] @@ -544,8 +544,8 @@ def lit_cons_term def cons_el [RegionQual: region_qual Lit: lit] -| [TILDE TildeData: opt_tilde_data Nl: TILDE_NL] | [DQ LitConsElList: lit_cons_el* Term: lit_cons_term] +| [TILDE TildeData: opt_tilde_data Nl: TILDE_NL] | [CodeExpr: code_expr] def lit_cons_el @@ -599,9 +599,9 @@ def cstring # def accum_el - [CodeExpr: code_expr] + [DQ LitAccumElList: lit_accum_el* Term: lit_cons_term] | [TILDE TildeData: opt_tilde_data Nl: TILDE_NL] -| [DQ LitAccumElList: lit_accum_el* Term: lit_cons_term] +| [CodeExpr: code_expr] def lit_accum_el [ConsData: cons_data] diff --git a/colm/load.cc b/colm/load.cc index 720de4ae..f79babb4 100644 --- a/colm/load.cc +++ b/colm/load.cc @@ -400,7 +400,7 @@ struct LoadSource return expr; } - PatternItemList *walkPatternElTypeOrLit( pattern_el_type_or_lit typeOrLit ) + PatternItemList *walkPatternElTypeOrLit( pattern_el_lel typeOrLit ) { NamespaceQual *nspaceQual = walkRegionQual( typeOrLit.RegionQual() ); RepeatType repeatType = walkOptRepeat( typeOrLit.OptRepeat() ); |