Mercurial > projects > ddmd
comparison dmd/Parser.d @ 24:1b81e14880ef
Fixed a few merge issues.
author | Robert Clipsham <robert@octarineparrot.com> |
---|---|
date | Mon, 12 Apr 2010 17:02:32 +0100 |
parents | 460959608115 |
children | 544b922227c7 |
comparison
equal
deleted
inserted
replaced
23:460959608115 | 24:1b81e14880ef |
---|---|
1075 check(TOKrparen); | 1075 check(TOKrparen); |
1076 | 1076 |
1077 Lerr: | 1077 Lerr: |
1078 return tpl; | 1078 return tpl; |
1079 } | 1079 } |
1080 <<<<<<< local | |
1081 | |
1082 /****************************************** | |
1083 * Parse template mixin. | |
1084 * mixin Foo; | |
1085 * mixin Foo!(args); | |
1086 * mixin a.b.c!(args).Foo!(args); | |
1087 * mixin Foo!(args) identifier; | |
1088 * mixin typeof(expr).identifier!(args); | |
1089 */ | |
1090 ======= | |
1091 | 1080 |
1092 /****************************************** | 1081 /****************************************** |
1093 * Parse template mixin. | 1082 * Parse template mixin. |
1094 * mixin Foo; | 1083 * mixin Foo; |
1095 * mixin Foo!(args); | 1084 * mixin Foo!(args); |