Mercurial > projects > dil

changeset 588:dcfec202718d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved dil.Types to dil.ast.Types.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Sat, 05 Jan 2008 23:18:36 +0100
parents 7d0ba0c93e95
children de365ddcfbd4
files trunk/src/dil/Types.d trunk/src/dil/ast/Declarations.d trunk/src/dil/ast/Expressions.d trunk/src/dil/ast/Statements.d trunk/src/dil/ast/Types.d trunk/src/dil/parser/Parser.d
diffstat 6 files changed, 465 insertions(+), 465 deletions(-) [+]
line wrap: on
line diff
--- a/trunk/src/dil/Types.d	Sat Jan 05 23:14:51 2008 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,459 +0,0 @@
-/++
-  Author: Aziz Köksal
-  License: GPL3
-+/
-module dil.Types;
-
-import dil.ast.Node;
-import dil.Token;
-import dil.ast.Expressions;
-import dil.Enums;
-import dil.Identifier;
-import dil.Scope;
-import dil.semantic.Types;
-
-class Parameter : Node
-{
-  StorageClass stc;
-  TypeNode type;
-  Identifier* ident;
-  Expression defValue;
-
-  this(StorageClass stc, TypeNode type, Identifier* ident, Expression defValue)
-  {
-    super(NodeCategory.Other);
-    mixin(set_kind);
-    // type can be null when param in foreach statement
-    addOptChild(type);
-    addOptChild(defValue);
-
-    this.stc = stc;
-    this.type = type;
-    this.ident = ident;
-    this.defValue = defValue;
-  }
-
-  /// func(...) or func(int[] values ...)
-  bool isVariadic()
-  {
-    return !!(stc & StorageClass.Variadic);
-  }
-
-  /// func(...)
-  bool isOnlyVariadic()
-  {
-    return stc == StorageClass.Variadic &&
-           type is null && ident is null;
-  }
-}
-
-class Parameters : Node
-{
-  this()
-  {
-    super(NodeCategory.Other);
-    mixin(set_kind);
-  }
-
-  bool hasVariadic()
-  {
-    if (children.length != 0)
-      return items[$-1].isVariadic();
-    return false;
-  }
-
-  void opCatAssign(Parameter param)
-  { addChild(param); }
-
-  Parameter[] items()
-  { return cast(Parameter[])children; }
-
-  size_t length()
-  { return children.length; }
-}
-
-class BaseClass : Node
-{
-  Protection prot;
-  TypeNode type;
-  this(Protection prot, TypeNode type)
-  {
-    super(NodeCategory.Other);
-    mixin(set_kind);
-    addChild(type);
-    this.prot = prot;
-    this.type = type;
-  }
-}
-
-abstract class TemplateParameter : Node
-{
-  Identifier* ident;
-  this(Identifier* ident)
-  {
-    super(NodeCategory.Other);
-    this.ident = ident;
-  }
-}
-
-class TemplateAliasParameter : TemplateParameter
-{
-  TypeNode specType, defType;
-  this(Identifier* ident, TypeNode specType, TypeNode defType)
-  {
-    super(ident);
-    mixin(set_kind);
-    addOptChild(specType);
-    addOptChild(defType);
-    this.ident = ident;
-    this.specType = specType;
-    this.defType = defType;
-  }
-}
-
-class TemplateTypeParameter : TemplateParameter
-{
-  TypeNode specType, defType;
-  this(Identifier* ident, TypeNode specType, TypeNode defType)
-  {
-    super(ident);
-    mixin(set_kind);
-    addOptChild(specType);
-    addOptChild(defType);
-    this.ident = ident;
-    this.specType = specType;
-    this.defType = defType;
-  }
-}
-
-version(D2)
-{
-class TemplateThisParameter : TemplateParameter
-{
-  TypeNode specType, defType;
-  this(Identifier* ident, TypeNode specType, TypeNode defType)
-  {
-    super(ident);
-    mixin(set_kind);
-    addOptChild(specType);
-    addOptChild(defType);
-    this.ident = ident;
-    this.specType = specType;
-    this.defType = defType;
-  }
-}
-}
-
-class TemplateValueParameter : TemplateParameter
-{
-  TypeNode valueType;
-  Expression specValue, defValue;
-  this(TypeNode valueType, Identifier* ident, Expression specValue, Expression defValue)
-  {
-    super(ident);
-    mixin(set_kind);
-    addChild(valueType);
-    addOptChild(specValue);
-    addOptChild(defValue);
-    this.valueType = valueType;
-    this.ident = ident;
-    this.specValue = specValue;
-    this.defValue = defValue;
-  }
-}
-
-class TemplateTupleParameter : TemplateParameter
-{
-  this(Identifier* ident)
-  {
-    super(ident);
-    mixin(set_kind);
-    this.ident = ident;
-  }
-}
-
-class TemplateParameters : Node
-{
-  this()
-  {
-    super(NodeCategory.Other);
-    mixin(set_kind);
-  }
-
-  void opCatAssign(TemplateParameter parameter)
-  {
-    addChild(parameter);
-  }
-
-  TemplateParameter[] items()
-  {
-    return cast(TemplateParameter[])children;
-  }
-}
-
-class TemplateArguments : Node
-{
-  this()
-  {
-    super(NodeCategory.Other);
-    mixin(set_kind);
-  }
-
-  void opCatAssign(Node argument)
-  {
-    addChild(argument);
-  }
-}
-
-enum TID
-{
-  Void    = TOK.Void,
-  Char    = TOK.Char,
-  Wchar   = TOK.Wchar,
-  Dchar   = TOK.Dchar,
-  Bool    = TOK.Bool,
-  Byte    = TOK.Byte,
-  Ubyte   = TOK.Ubyte,
-  Short   = TOK.Short,
-  Ushort  = TOK.Ushort,
-  Int     = TOK.Int,
-  Uint    = TOK.Uint,
-  Long    = TOK.Long,
-  Ulong   = TOK.Ulong,
-  Float   = TOK.Float,
-  Double  = TOK.Double,
-  Real    = TOK.Real,
-  Ifloat  = TOK.Ifloat,
-  Idouble = TOK.Idouble,
-  Ireal   = TOK.Ireal,
-  Cfloat  = TOK.Cfloat,
-  Cdouble = TOK.Cdouble,
-  Creal   = TOK.Creal,
-  Cent    = TOK.Cent,
-  Ucent   = TOK.Ucent,
-
-  Undefined,
-  Function,
-  Delegate,
-  Pointer,
-  CFuncPointer,
-  Array,
-  Dot,
-  DotList,
-  Identifier,
-  Typeof,
-  TemplateInstance,
-  Const, // D2
-  Invariant, // D2
-}
-
-abstract class TypeNode : Node
-{
-  TID tid;
-  TypeNode next;
-
-  this(TID tid)
-  {
-    this(tid, null);
-  }
-
-  this(TID tid, TypeNode next)
-  {
-    super(NodeCategory.Type);
-    addOptChild(next);
-    this.tid = tid;
-    this.next = next;
-  }
-
-  Type semantic(Scope scop)
-  {
-    return Types.Error;
-  }
-}
-
-class IntegralType : TypeNode
-{
-  this(TOK tok)
-  {
-    super(cast(TID)tok);
-    mixin(set_kind);
-  }
-}
-
-class UndefinedType : TypeNode
-{
-  this()
-  {
-    super(TID.Undefined);
-    mixin(set_kind);
-  }
-}
-
-class DotListType : TypeNode
-{
-  TypeNode[] dotList;
-  this(TypeNode[] dotList)
-  {
-    super(TID.DotList);
-    mixin(set_kind);
-    addChildren(dotList);
-    this.dotList = dotList;
-  }
-}
-
-class IdentifierType : TypeNode
-{
-  Identifier* ident;
-  this(Identifier* ident)
-  {
-    super(TID.Identifier);
-    mixin(set_kind);
-    this.ident = ident;
-  }
-}
-
-class DotType : TypeNode
-{
-  this()
-  {
-    super(TID.Dot);
-    mixin(set_kind);
-  }
-}
-
-class TypeofType : TypeNode
-{
-  Expression e;
-  this(Expression e)
-  {
-    this();
-    addChild(e);
-    this.e = e;
-  }
-
-  this()
-  {
-    super(TID.Typeof);
-    mixin(set_kind);
-  }
-
-  bool isTypeofReturn()
-  {
-    return e is null;
-  }
-}
-
-class TemplateInstanceType : TypeNode
-{
-  Identifier* ident;
-  TemplateArguments targs;
-  this(Identifier* ident, TemplateArguments targs)
-  {
-    super(TID.TemplateInstance);
-    mixin(set_kind);
-    addOptChild(targs);
-    this.ident = ident;
-    this.targs = targs;
-  }
-}
-
-class PointerType : TypeNode
-{
-  this(TypeNode t)
-  {
-    super(TID.Pointer, t);
-    mixin(set_kind);
-  }
-}
-
-class ArrayType : TypeNode
-{
-  Expression e, e2;
-  TypeNode assocType;
-
-  this(TypeNode t)
-  {
-    super(TID.Array, t);
-    mixin(set_kind);
-  }
-
-  this(TypeNode t, Expression e, Expression e2)
-  {
-    addChild(e);
-    addOptChild(e2);
-    this.e = e;
-    this.e2 = e2;
-    this(t);
-  }
-
-  this(TypeNode t, TypeNode assocType)
-  {
-    addChild(assocType);
-    this.assocType = assocType;
-    this(t);
-  }
-}
-
-class FunctionType : TypeNode
-{
-  TypeNode returnType;
-  Parameters parameters;
-  this(TypeNode returnType, Parameters parameters)
-  {
-    super(TID.Function);
-    mixin(set_kind);
-    addChild(returnType);
-    addChild(parameters);
-    this.returnType = returnType;
-    this.parameters = parameters;
-  }
-}
-
-class DelegateType : TypeNode
-{
-  TypeNode returnType;
-  Parameters parameters;
-  this(TypeNode returnType, Parameters parameters)
-  {
-    super(TID.Delegate);
-    mixin(set_kind);
-    addChild(returnType);
-    addChild(parameters);
-    this.returnType = returnType;
-    this.parameters = parameters;
-  }
-}
-
-class CFuncPointerType : TypeNode
-{
-  Parameters params;
-  this(TypeNode type, Parameters params)
-  {
-    super(TID.CFuncPointer, type);
-    mixin(set_kind);
-    addOptChild(params);
-  }
-}
-
-version(D2)
-{
-class ConstType : TypeNode
-{
-  this(TypeNode t)
-  {
-    // If t is null: cast(const)
-    super(TID.Const, t);
-    mixin(set_kind);
-  }
-}
-
-class InvariantType : TypeNode
-{
-  this(TypeNode t)
-  {
-    // If t is null: cast(invariant)
-    super(TID.Invariant, t);
-    mixin(set_kind);
-  }
-}
-} // version(D2)
--- a/trunk/src/dil/ast/Declarations.d	Sat Jan 05 23:14:51 2008 +0100
+++ b/trunk/src/dil/ast/Declarations.d	Sat Jan 05 23:18:36 2008 +0100
@@ -6,7 +6,7 @@
 
 import dil.ast.Node;
 import dil.ast.Expressions;
-import dil.Types;
+import dil.ast.Types;
 import dil.ast.Statements;
 import dil.Token;
 import dil.Enums;
--- a/trunk/src/dil/ast/Expressions.d	Sat Jan 05 23:14:51 2008 +0100
+++ b/trunk/src/dil/ast/Expressions.d	Sat Jan 05 23:18:36 2008 +0100
@@ -5,10 +5,10 @@
 module dil.ast.Expressions;
 
 import dil.ast.Node;
-import dil.Token;
-import dil.Types;
+import dil.ast.Types;
 import dil.ast.Declarations;
 import dil.ast.Statements;
+import dil.Token;
 import dil.Identifier;
 import dil.Scope;
 import dil.semantic.Types;
--- a/trunk/src/dil/ast/Statements.d	Sat Jan 05 23:14:51 2008 +0100
+++ b/trunk/src/dil/ast/Statements.d	Sat Jan 05 23:18:36 2008 +0100
@@ -7,7 +7,7 @@
 import dil.ast.Node;
 import dil.ast.Expressions;
 import dil.ast.Declarations;
-import dil.Types;
+import dil.ast.Types;
 import dil.Token;
 import dil.IdTable;
 import dil.Scope;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trunk/src/dil/ast/Types.d	Sat Jan 05 23:18:36 2008 +0100
@@ -0,0 +1,459 @@
+/++
+  Author: Aziz Köksal
+  License: GPL3
++/
+module dil.ast.Types;
+
+import dil.ast.Node;
+import dil.Token;
+import dil.ast.Expressions;
+import dil.Enums;
+import dil.Identifier;
+import dil.Scope;
+import dil.semantic.Types;
+
+class Parameter : Node
+{
+  StorageClass stc;
+  TypeNode type;
+  Identifier* ident;
+  Expression defValue;
+
+  this(StorageClass stc, TypeNode type, Identifier* ident, Expression defValue)
+  {
+    super(NodeCategory.Other);
+    mixin(set_kind);
+    // type can be null when param in foreach statement
+    addOptChild(type);
+    addOptChild(defValue);
+
+    this.stc = stc;
+    this.type = type;
+    this.ident = ident;
+    this.defValue = defValue;
+  }
+
+  /// func(...) or func(int[] values ...)
+  bool isVariadic()
+  {
+    return !!(stc & StorageClass.Variadic);
+  }
+
+  /// func(...)
+  bool isOnlyVariadic()
+  {
+    return stc == StorageClass.Variadic &&
+           type is null && ident is null;
+  }
+}
+
+class Parameters : Node
+{
+  this()
+  {
+    super(NodeCategory.Other);
+    mixin(set_kind);
+  }
+
+  bool hasVariadic()
+  {
+    if (children.length != 0)
+      return items[$-1].isVariadic();
+    return false;
+  }
+
+  void opCatAssign(Parameter param)
+  { addChild(param); }
+
+  Parameter[] items()
+  { return cast(Parameter[])children; }
+
+  size_t length()
+  { return children.length; }
+}
+
+class BaseClass : Node
+{
+  Protection prot;
+  TypeNode type;
+  this(Protection prot, TypeNode type)
+  {
+    super(NodeCategory.Other);
+    mixin(set_kind);
+    addChild(type);
+    this.prot = prot;
+    this.type = type;
+  }
+}
+
+abstract class TemplateParameter : Node
+{
+  Identifier* ident;
+  this(Identifier* ident)
+  {
+    super(NodeCategory.Other);
+    this.ident = ident;
+  }
+}
+
+class TemplateAliasParameter : TemplateParameter
+{
+  TypeNode specType, defType;
+  this(Identifier* ident, TypeNode specType, TypeNode defType)
+  {
+    super(ident);
+    mixin(set_kind);
+    addOptChild(specType);
+    addOptChild(defType);
+    this.ident = ident;
+    this.specType = specType;
+    this.defType = defType;
+  }
+}
+
+class TemplateTypeParameter : TemplateParameter
+{
+  TypeNode specType, defType;
+  this(Identifier* ident, TypeNode specType, TypeNode defType)
+  {
+    super(ident);
+    mixin(set_kind);
+    addOptChild(specType);
+    addOptChild(defType);
+    this.ident = ident;
+    this.specType = specType;
+    this.defType = defType;
+  }
+}
+
+version(D2)
+{
+class TemplateThisParameter : TemplateParameter
+{
+  TypeNode specType, defType;
+  this(Identifier* ident, TypeNode specType, TypeNode defType)
+  {
+    super(ident);
+    mixin(set_kind);
+    addOptChild(specType);
+    addOptChild(defType);
+    this.ident = ident;
+    this.specType = specType;
+    this.defType = defType;
+  }
+}
+}
+
+class TemplateValueParameter : TemplateParameter
+{
+  TypeNode valueType;
+  Expression specValue, defValue;
+  this(TypeNode valueType, Identifier* ident, Expression specValue, Expression defValue)
+  {
+    super(ident);
+    mixin(set_kind);
+    addChild(valueType);
+    addOptChild(specValue);
+    addOptChild(defValue);
+    this.valueType = valueType;
+    this.ident = ident;
+    this.specValue = specValue;
+    this.defValue = defValue;
+  }
+}
+
+class TemplateTupleParameter : TemplateParameter
+{
+  this(Identifier* ident)
+  {
+    super(ident);
+    mixin(set_kind);
+    this.ident = ident;
+  }
+}
+
+class TemplateParameters : Node
+{
+  this()
+  {
+    super(NodeCategory.Other);
+    mixin(set_kind);
+  }
+
+  void opCatAssign(TemplateParameter parameter)
+  {
+    addChild(parameter);
+  }
+
+  TemplateParameter[] items()
+  {
+    return cast(TemplateParameter[])children;
+  }
+}
+
+class TemplateArguments : Node
+{
+  this()
+  {
+    super(NodeCategory.Other);
+    mixin(set_kind);
+  }
+
+  void opCatAssign(Node argument)
+  {
+    addChild(argument);
+  }
+}
+
+enum TID
+{
+  Void    = TOK.Void,
+  Char    = TOK.Char,
+  Wchar   = TOK.Wchar,
+  Dchar   = TOK.Dchar,
+  Bool    = TOK.Bool,
+  Byte    = TOK.Byte,
+  Ubyte   = TOK.Ubyte,
+  Short   = TOK.Short,
+  Ushort  = TOK.Ushort,
+  Int     = TOK.Int,
+  Uint    = TOK.Uint,
+  Long    = TOK.Long,
+  Ulong   = TOK.Ulong,
+  Float   = TOK.Float,
+  Double  = TOK.Double,
+  Real    = TOK.Real,
+  Ifloat  = TOK.Ifloat,
+  Idouble = TOK.Idouble,
+  Ireal   = TOK.Ireal,
+  Cfloat  = TOK.Cfloat,
+  Cdouble = TOK.Cdouble,
+  Creal   = TOK.Creal,
+  Cent    = TOK.Cent,
+  Ucent   = TOK.Ucent,
+
+  Undefined,
+  Function,
+  Delegate,
+  Pointer,
+  CFuncPointer,
+  Array,
+  Dot,
+  DotList,
+  Identifier,
+  Typeof,
+  TemplateInstance,
+  Const, // D2
+  Invariant, // D2
+}
+
+abstract class TypeNode : Node
+{
+  TID tid;
+  TypeNode next;
+
+  this(TID tid)
+  {
+    this(tid, null);
+  }
+
+  this(TID tid, TypeNode next)
+  {
+    super(NodeCategory.Type);
+    addOptChild(next);
+    this.tid = tid;
+    this.next = next;
+  }
+
+  Type semantic(Scope scop)
+  {
+    return Types.Error;
+  }
+}
+
+class IntegralType : TypeNode
+{
+  this(TOK tok)
+  {
+    super(cast(TID)tok);
+    mixin(set_kind);
+  }
+}
+
+class UndefinedType : TypeNode
+{
+  this()
+  {
+    super(TID.Undefined);
+    mixin(set_kind);
+  }
+}
+
+class DotListType : TypeNode
+{
+  TypeNode[] dotList;
+  this(TypeNode[] dotList)
+  {
+    super(TID.DotList);
+    mixin(set_kind);
+    addChildren(dotList);
+    this.dotList = dotList;
+  }
+}
+
+class IdentifierType : TypeNode
+{
+  Identifier* ident;
+  this(Identifier* ident)
+  {
+    super(TID.Identifier);
+    mixin(set_kind);
+    this.ident = ident;
+  }
+}
+
+class DotType : TypeNode
+{
+  this()
+  {
+    super(TID.Dot);
+    mixin(set_kind);
+  }
+}
+
+class TypeofType : TypeNode
+{
+  Expression e;
+  this(Expression e)
+  {
+    this();
+    addChild(e);
+    this.e = e;
+  }
+
+  this()
+  {
+    super(TID.Typeof);
+    mixin(set_kind);
+  }
+
+  bool isTypeofReturn()
+  {
+    return e is null;
+  }
+}
+
+class TemplateInstanceType : TypeNode
+{
+  Identifier* ident;
+  TemplateArguments targs;
+  this(Identifier* ident, TemplateArguments targs)
+  {
+    super(TID.TemplateInstance);
+    mixin(set_kind);
+    addOptChild(targs);
+    this.ident = ident;
+    this.targs = targs;
+  }
+}
+
+class PointerType : TypeNode
+{
+  this(TypeNode t)
+  {
+    super(TID.Pointer, t);
+    mixin(set_kind);
+  }
+}
+
+class ArrayType : TypeNode
+{
+  Expression e, e2;
+  TypeNode assocType;
+
+  this(TypeNode t)
+  {
+    super(TID.Array, t);
+    mixin(set_kind);
+  }
+
+  this(TypeNode t, Expression e, Expression e2)
+  {
+    addChild(e);
+    addOptChild(e2);
+    this.e = e;
+    this.e2 = e2;
+    this(t);
+  }
+
+  this(TypeNode t, TypeNode assocType)
+  {
+    addChild(assocType);
+    this.assocType = assocType;
+    this(t);
+  }
+}
+
+class FunctionType : TypeNode
+{
+  TypeNode returnType;
+  Parameters parameters;
+  this(TypeNode returnType, Parameters parameters)
+  {
+    super(TID.Function);
+    mixin(set_kind);
+    addChild(returnType);
+    addChild(parameters);
+    this.returnType = returnType;
+    this.parameters = parameters;
+  }
+}
+
+class DelegateType : TypeNode
+{
+  TypeNode returnType;
+  Parameters parameters;
+  this(TypeNode returnType, Parameters parameters)
+  {
+    super(TID.Delegate);
+    mixin(set_kind);
+    addChild(returnType);
+    addChild(parameters);
+    this.returnType = returnType;
+    this.parameters = parameters;
+  }
+}
+
+class CFuncPointerType : TypeNode
+{
+  Parameters params;
+  this(TypeNode type, Parameters params)
+  {
+    super(TID.CFuncPointer, type);
+    mixin(set_kind);
+    addOptChild(params);
+  }
+}
+
+version(D2)
+{
+class ConstType : TypeNode
+{
+  this(TypeNode t)
+  {
+    // If t is null: cast(const)
+    super(TID.Const, t);
+    mixin(set_kind);
+  }
+}
+
+class InvariantType : TypeNode
+{
+  this(TypeNode t)
+  {
+    // If t is null: cast(invariant)
+    super(TID.Invariant, t);
+    mixin(set_kind);
+  }
+}
+} // version(D2)
--- a/trunk/src/dil/parser/Parser.d	Sat Jan 05 23:14:51 2008 +0100
+++ b/trunk/src/dil/parser/Parser.d	Sat Jan 05 23:18:36 2008 +0100
@@ -5,14 +5,14 @@
 module dil.parser.Parser;
 
 import dil.lexer.Lexer;
-import dil.ast.Node;
 import dil.Token;
 import dil.Messages;
 import dil.Information;
+import dil.ast.Node;
 import dil.ast.Declarations;
 import dil.ast.Statements;
 import dil.ast.Expressions;
-import dil.Types;
+import dil.ast.Types;
 import dil.Enums;
 import dil.CompilerInfo;
 import dil.IdTable;