Mercurial > projects > dil

diff trunk/src/dil/Types.d @ 489:a7291d3ee9d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactored classes that inherit from Node. Added methods addChild(), addOptChild(), addChildren(), addOptChildren() to class Node. Refactored subclasses to use the new methods instead of appending directly to the array Node.children. Moved enums StorageClass and Protection to new module dil.Enums. Added members stc, prot, isStatic() and isPulic() to Declaration.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Mon, 03 Dec 2007 22:44:27 +0100
parents cfb3805768b6
children 9c208925a3d4
line wrap: on
line diff
--- a/trunk/src/dil/Types.d	Sat Dec 01 21:42:24 2007 +0100
+++ b/trunk/src/dil/Types.d	Mon Dec 03 22:44:27 2007 +0100
@@ -6,6 +6,7 @@
 import dil.SyntaxTree;
 import dil.Token;
 import dil.Expressions;
+import dil.Enums;
 
 class Linkage : Node
 {
@@ -49,27 +50,6 @@
   }
 }
 
-enum StorageClass
-{
-  None         = 0,
-  Abstract     = 1,
-  Auto         = 1<<2,
-  Const        = 1<<3,
-  Deprecated   = 1<<4,
-  Extern       = 1<<5,
-  Final        = 1<<6,
-  Invariant    = 1<<7,
-  Override     = 1<<8,
-  Scope        = 1<<9,
-  Static       = 1<<10,
-  Synchronized = 1<<11,
-  In           = 1<<12,
-  Out          = 1<<13,
-  Ref          = 1<<14,
-  Lazy         = 1<<15,
-  Variadic     = 1<<16,
-}
-
 class Parameter : Node
 {
   StorageClass stc;
@@ -82,10 +62,9 @@
   {
     super(NodeCategory.Other);
     mixin(set_kind);
-    if (type) // type can be null when param in foreach statement
-      this.children = [type];
-    if (assignExpr)
-      this.children ~= assignExpr;
+    // type can be null when param in foreach statement
+    addOptChild(type);
+    addOptChild(assignExpr);
 
     StorageClass stc;
     if (stcTok !is null)
@@ -139,7 +118,7 @@
   }
 
   void opCatAssign(Parameter param)
-  { children ~= param; }
+  { addChild(param); }
 
   Parameter[] items()
   { return cast(Parameter[])children; }
@@ -148,17 +127,6 @@
   { return children.length; }
 }
 
-
-enum Protection
-{
-  None,
-  Private   = 1,
-  Protected = 1<<1,
-  Package   = 1<<2,
-  Public    = 1<<3,
-  Export    = 1<<4
-}
-
 class BaseClass : Node
 {
   Protection prot;
@@ -167,7 +135,7 @@
   {
     super(NodeCategory.Other);
     mixin(set_kind);
-    this.children = [type];
+    addChild(type);
     this.prot = prot;
     this.type = type;
   }
@@ -188,10 +156,8 @@
   this(Token* ident, Type specType, Type defType)
   {
     mixin(set_kind);
-    if (specType)
-      this.children ~= specType;
-    if (defType)
-      this.children ~= defType;
+    addOptChild(specType);
+    addOptChild(defType);
     this.ident = ident;
     this.specType = specType;
     this.defType = defType;
@@ -205,10 +171,8 @@
   this(Token* ident, Type specType, Type defType)
   {
     mixin(set_kind);
-    if (specType)
-      this.children ~= specType;
-    if (defType)
-      this.children ~= defType;
+    addOptChild(specType);
+    addOptChild(defType);
     this.ident = ident;
     this.specType = specType;
     this.defType = defType;
@@ -223,11 +187,9 @@
   this(Type valueType, Token* ident, Expression specValue, Expression defValue)
   {
     mixin(set_kind);
-    this.children ~= valueType;
-    if (specValue)
-      this.children ~= specValue;
-    if (defValue)
-      this.children ~= defValue;
+    addChild(valueType);
+    addOptChild(specValue);
+    addOptChild(defValue);
     this.valueType = valueType;
     this.ident = ident;
     this.specValue = specValue;
@@ -255,7 +217,7 @@
 
   void opCatAssign(TemplateParameter parameter)
   {
-    this.children ~= parameter;
+    addChild(parameter);
   }
 
   TemplateParameter[] items()
@@ -274,7 +236,7 @@
 
   void opCatAssign(Node argument)
   {
-    this.children ~= argument;
+    addChild(argument);
   }
 }
 
@@ -331,8 +293,7 @@
   this(TID tid, Type next)
   {
     super(NodeCategory.Type);
-    if (next)
-      this.children ~= next;
+    addOptChild(next);
     this.tid = tid;
     this.next = next;
   }
@@ -363,7 +324,7 @@
   {
     super(TID.DotList);
     mixin(set_kind);
-    this.children ~= dotList;
+    addChildren(dotList);
     this.dotList = dotList;
   }
 }
@@ -395,7 +356,7 @@
   {
     super(TID.Typeof);
     mixin(set_kind);
-    this.children ~= e;
+    addChild(e);
     this.e = e;
   }
 }
@@ -408,8 +369,7 @@
   {
     super(TID.TemplateInstance);
     mixin(set_kind);
-    if (targs)
-      this.children ~= targs;
+    addOptChild(targs);
     this.ident = ident;
     this.targs = targs;
   }
@@ -428,23 +388,25 @@
 {
   Expression e, e2;
   Type assocType;
+
   this(Type t)
   {
     super(TID.Array, t);
     mixin(set_kind);
   }
+
   this(Type t, Expression e, Expression e2)
   {
-    this.children = [e];
-    if (e2)
-      this.children ~= e2;
+    addChild(e);
+    addOptChild(e2);
     this.e = e;
     this.e2 = e2;
     this(t);
   }
+
   this(Type t, Type assocType)
   {
-    this.children = [assocType];
+    addChild(assocType);
     this.assocType = assocType;
     this(t);
   }
@@ -458,7 +420,8 @@
   {
     super(TID.Function);
     mixin(set_kind);
-    this.children = [cast(Node)returnType, parameters];
+    addChild(returnType);
+    addChild(parameters);
     this.returnType = returnType;
     this.parameters = parameters;
   }
@@ -472,7 +435,8 @@
   {
     super(TID.Delegate);
     mixin(set_kind);
-    this.children = [cast(Node)returnType, parameters];
+    addChild(returnType);
+    addChild(parameters);
     this.returnType = returnType;
     this.parameters = parameters;
   }
@@ -485,8 +449,7 @@
   {
     super(TID.CFuncPointer, type);
     mixin(set_kind);
-    if (params)
-      this.children ~= params;
+    addOptChild(params);
   }
 }