Mercurial > projects > dil
diff trunk/src/dil/ast/Declarations.d @ 680:6b3e397229c5
Renamed Statements, Declarations and EnumMember.
Statements -> CompoundStatement.
Declarations -> CompoundDeclaration.
EnumMember -> EnumMemberDeclaration.
author | Aziz K?ksal <aziz.koeksal@gmail.com> |
---|---|
date | Fri, 18 Jan 2008 23:59:41 +0100 |
parents | 64fec49651cf |
children | 7541c64fc423 |
line wrap: on
line diff
--- a/trunk/src/dil/ast/Declarations.d Fri Jan 18 23:40:12 2008 +0100 +++ b/trunk/src/dil/ast/Declarations.d Fri Jan 18 23:59:41 2008 +0100 @@ -15,7 +15,7 @@ import dil.Enums; import common; -class Declarations : Declaration +class CompoundDeclaration : Declaration { this() { @@ -28,7 +28,7 @@ addChild(d); } - void opCatAssign(Declarations ds) + void opCatAssign(CompoundDeclaration ds) { addChildren(ds.children); } @@ -159,8 +159,8 @@ { Identifier* name; TypeNode baseType; - EnumMember[] members; - this(Identifier* name, TypeNode baseType, EnumMember[] members, bool hasBody) + EnumMemberDeclaration[] members; + this(Identifier* name, TypeNode baseType, EnumMemberDeclaration[] members, bool hasBody) { super.hasBody = hasBody; mixin(set_kind); @@ -175,7 +175,7 @@ Enum symbol; } -class EnumMember : Declaration +class EnumMemberDeclaration : Declaration { Identifier* name; Expression value; @@ -193,8 +193,8 @@ { Identifier* name; TemplateParameters tparams; - Declarations decls; - this(Identifier* name, TemplateParameters tparams, Declarations decls) + CompoundDeclaration decls; + this(Identifier* name, TemplateParameters tparams, CompoundDeclaration decls) { super.hasBody = decls !is null; this.name = name; @@ -206,7 +206,7 @@ class ClassDeclaration : AggregateDeclaration { BaseClassType[] bases; - this(Identifier* name, TemplateParameters tparams, BaseClassType[] bases, Declarations decls) + this(Identifier* name, TemplateParameters tparams, BaseClassType[] bases, CompoundDeclaration decls) { super(name, tparams, decls); mixin(set_kind); @@ -223,7 +223,7 @@ class InterfaceDeclaration : AggregateDeclaration { BaseClassType[] bases; - this(Identifier* name, TemplateParameters tparams, BaseClassType[] bases, Declarations decls) + this(Identifier* name, TemplateParameters tparams, BaseClassType[] bases, CompoundDeclaration decls) { super(name, tparams, decls); mixin(set_kind); @@ -242,7 +242,7 @@ class StructDeclaration : AggregateDeclaration { uint alignSize; - this(Identifier* name, TemplateParameters tparams, Declarations decls) + this(Identifier* name, TemplateParameters tparams, CompoundDeclaration decls) { super(name, tparams, decls); mixin(set_kind); @@ -260,7 +260,7 @@ class UnionDeclaration : AggregateDeclaration { - this(Identifier* name, TemplateParameters tparams, Declarations decls) + this(Identifier* name, TemplateParameters tparams, CompoundDeclaration decls) { super(name, tparams, decls); mixin(set_kind); @@ -488,8 +488,8 @@ { Identifier* name; TemplateParameters tparams; - Declarations decls; - this(Identifier* name, TemplateParameters tparams, Declarations decls) + CompoundDeclaration decls; + this(Identifier* name, TemplateParameters tparams, CompoundDeclaration decls) { super.hasBody = true; mixin(set_kind);