Mercurial > projects > ddmd
changeset 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 | 3f834bed4f13 |
files | dmd/Parser.d dmd/TemplateAliasParameter.d dmd/TemplateMixin.d |
diffstat | 3 files changed, 2 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/dmd/Parser.d Mon Apr 12 17:00:08 2010 +0100 +++ b/dmd/Parser.d Mon Apr 12 17:02:32 2010 +0100 @@ -1077,17 +1077,6 @@ Lerr: return tpl; } -<<<<<<< local - - /****************************************** - * Parse template mixin. - * mixin Foo; - * mixin Foo!(args); - * mixin a.b.c!(args).Foo!(args); - * mixin Foo!(args) identifier; - * mixin typeof(expr).identifier!(args); - */ -======= /****************************************** * Parse template mixin.
--- a/dmd/TemplateAliasParameter.d Mon Apr 12 17:00:08 2010 +0100 +++ b/dmd/TemplateAliasParameter.d Mon Apr 12 17:02:32 2010 +0100 @@ -4,6 +4,7 @@ import dmd.Loc; import dmd.Identifier; import dmd.Type; +import dmd.TypeIdentifier; import dmd.ArrayTypes; import dmd.Scope; import dmd.Declaration;
--- a/dmd/TemplateMixin.d Mon Apr 12 17:00:08 2010 +0100 +++ b/dmd/TemplateMixin.d Mon Apr 12 17:02:32 2010 +0100 @@ -278,7 +278,7 @@ { Dsymbol s; s = cast(Dsymbol)members.data[i]; - s.addMember(argscope, this, i); + s.addMember(argscope, this, cast(bool)i); //sc.insert(s); //printf("sc.parent = %p, sc.scopesym = %p\n", sc.parent, sc.scopesym); //printf("s.parent = %s\n", s.parent.toChars());