annotate trunk/src/Types.d @ 269:a416e09c08ea

- Implemented D 2.0 additions. - Added keyword __traits, TOK.Traits and TraitsExpression. - Added ForeachRangeStatement, ConstType and InvariantType. - Fix: avoid infinite loop by calling nT() to skip storage class. - Fix: don't call nT() in parseVersionDeclaration.parseIdentOrInt().
author aziz
date Sat, 04 Aug 2007 18:59:04 +0000
parents 50cc74026ea8
children e8de572e4d01
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
1 /++
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
2 Author: Aziz Köksal
249
32d354584b28 - Upgraded license notices to GPL3.
aziz
parents: 248
diff changeset
3 License: GPL3
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
4 +/
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
5 module Types;
240
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
6 import SyntaxTree;
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
7 import Token;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
8 import Expressions;
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
9
159
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
10 enum Linkage
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
11 {
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
12 Invalid,
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
13 C,
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
14 Cpp,
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
15 D,
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
16 Windows,
240
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
17 Pascal,
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
18 System
159
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
19 }
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
20
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
21 enum StorageClass
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
22 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
23 None = 0,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
24 Abstract = 1,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
25 Auto = 1<<2,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
26 Const = 1<<3,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
27 Deprecated = 1<<4,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
28 Extern = 1<<5,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
29 Final = 1<<6,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
30 Invariant = 1<<7,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
31 Override = 1<<8,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
32 Scope = 1<<9,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
33 Static = 1<<10,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
34 Synchronized = 1<<11,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
35 In = 1<<12,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
36 Out = 1<<13,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
37 Ref = 1<<14,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
38 Lazy = 1<<15,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
39 Variadic = 1<<16,
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
40 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
41
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
42 class Parameter : Node
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
43 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
44 StorageClass stc;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
45 Token* stcTok;
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
46 Type type;
253
4279b638c63e - Changed some string types to Token*. Adapted parser accordingly.
aziz
parents: 249
diff changeset
47 Token* ident;
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
48 Expression assignExpr;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
49
253
4279b638c63e - Changed some string types to Token*. Adapted parser accordingly.
aziz
parents: 249
diff changeset
50 this(Token* stcTok, Type type, Token* ident, Expression assignExpr)
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
51 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
52 super(NodeType.Other);
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
53
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
54 StorageClass stc;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
55 if (stcTok !is null)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
56 {
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
57 // NB: In D 2.0 StorageClass.In means final/scope/const
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
58 switch (stcTok.type)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
59 {
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
60 // TODO: D 2.0 invariant/const/final/scope
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
61 case TOK.In: stc = StorageClass.In; break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
62 case TOK.Out: stc = StorageClass.Out; break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
63 case TOK.Inout:
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
64 case TOK.Ref: stc = StorageClass.Ref; break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
65 case TOK.Lazy: stc = StorageClass.Lazy; break;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
66 case TOK.Ellipses:
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
67 stc = StorageClass.Variadic;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
68 default:
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
69 }
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
70 }
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
71
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
72 this.stc = stc;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
73 this.stcTok = stcTok;
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
74 this.type = type;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
75 this.ident = ident;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
76 this.assignExpr = assignExpr;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
77 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
78
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
79 bool isVariadic()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
80 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
81 return !!(stc & StorageClass.Variadic);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
82 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
83
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
84 bool isOnlyVariadic()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
85 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
86 return stc == StorageClass.Variadic;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
87 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
88 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
89
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
90 class Parameters : Node
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
91 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
92 Parameter[] items;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
93
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
94 this()
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
95 {
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
96 super(NodeType.Other);
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
97 }
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
98
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
99 bool hasVariadic()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
100 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
101 if (items.length != 0)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
102 return items[$-1].isVariadic();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
103 return false;
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
104 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
105
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
106 void opCatAssign(Parameter param)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
107 { items ~= param; }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
108
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
109 size_t length()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
110 { return items.length; }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
111 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 106
diff changeset
112
158
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
113
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
114 enum Protection
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
115 {
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
116 None,
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
117 Private = 1,
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
118 Protected = 1<<1,
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
119 Package = 1<<2,
240
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
120 Public = 1<<3,
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
121 Export = 1<<4
158
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
122 }
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
123
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
124 class BaseClass
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
125 {
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
126 Protection prot;
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
127 Type type;
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
128 this(Protection prot, Type type)
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
129 {
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
130 this.prot = prot;
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
131 this.type = type;
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
132 }
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
133 }
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 154
diff changeset
134
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
135 enum TP
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
136 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
137 Type,
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
138 Value,
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
139 Alias,
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
140 Tuple
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
141 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
142
255
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement.
aziz
parents: 254
diff changeset
143 class TemplateParameter : Node
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
144 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
145 TP tp;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
146 Type valueType;
253
4279b638c63e - Changed some string types to Token*. Adapted parser accordingly.
aziz
parents: 249
diff changeset
147 Token* ident;
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
148 Type specType, defType;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
149 Expression specValue, defValue;
253
4279b638c63e - Changed some string types to Token*. Adapted parser accordingly.
aziz
parents: 249
diff changeset
150 this(TP tp, Type valueType, Token* ident, Type specType, Type defType, Expression specValue, Expression defValue)
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
151 {
255
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement.
aziz
parents: 254
diff changeset
152 super(NodeType.Other);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
153 this.tp = tp;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
154 this.valueType = valueType;
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 137
diff changeset
155 this.ident = ident;
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
156 this.specType = specType;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
157 this.defType = defType;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
158 this.specValue = specValue;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
159 this.defValue = defValue;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
160 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
161 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 135
diff changeset
162
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
163 class TemplateParameters : Node
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
164 {
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
165 TemplateParameter[] params;
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
166
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
167 this()
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
168 {
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
169 super(NodeType.Other);
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
170 }
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
171
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
172 void opCatAssign(TemplateParameter parameter)
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
173 {
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
174 params ~= parameter;
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
175 }
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
176 }
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
177
254
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
178 class TemplateArguments : Node
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
179 {
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
180 Node[] args;
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
181
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
182 this()
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
183 {
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
184 super(NodeType.Other);
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
185 }
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
186
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
187 void opCatAssign(Node argument)
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
188 {
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
189 args ~= argument;
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
190 }
eb6e3f1fbfee - Removed typedef and created a proper TemplateArguments class.
aziz
parents: 253
diff changeset
191 }
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 137
diff changeset
192
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
193 enum TID
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
194 {
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
195 Void = TOK.Void,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
196 Char = TOK.Char,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
197 Wchar = TOK.Wchar,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
198 Dchar = TOK.Dchar,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
199 Bool = TOK.Bool,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
200 Byte = TOK.Byte,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
201 Ubyte = TOK.Ubyte,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
202 Short = TOK.Short,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
203 Ushort = TOK.Ushort,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
204 Int = TOK.Int,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
205 Uint = TOK.Uint,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
206 Long = TOK.Long,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
207 Ulong = TOK.Ulong,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
208 Float = TOK.Float,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
209 Double = TOK.Double,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
210 Real = TOK.Real,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
211 Ifloat = TOK.Ifloat,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
212 Idouble = TOK.Idouble,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
213 Ireal = TOK.Ireal,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
214 Cfloat = TOK.Cfloat,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
215 Cdouble = TOK.Cdouble,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
216 Creal = TOK.Creal,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
217
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
218 Undefined,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
219 Function,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
220 Delegate,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
221 Pointer,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
222 Array,
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
223 DotList,
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
224 Identifier,
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
225 Typeof,
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
226 TemplateInstance,
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
227 Const, // D2
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
228 Invariant, // D2
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
229 }
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
230
240
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
231 class Type : Node
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
232 {
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
233 TID tid;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
234 Type next;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
235
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
236 this(TOK tok)
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
237 {
240
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
238 this(cast(TID)tok);
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
239 }
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
240
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
241 this(TID tid)
240
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
242 {
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
243 this(tid, null);
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
244 }
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
245
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
246 this(TID tid, Type next)
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
247 {
240
deab661906ae - Classes Declaration, Expression, Statement and Type inherit from Node now.
aziz
parents: 196
diff changeset
248 super(NodeType.Type);
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
249 this.tid = tid;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
250 this.next = next;
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
251 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
252 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents:
diff changeset
253
134
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 130
diff changeset
254 class UndefinedType : Type
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 130
diff changeset
255 {
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 130
diff changeset
256 this()
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 130
diff changeset
257 {
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
258 super(TID.Undefined, null);
134
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 130
diff changeset
259 }
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 130
diff changeset
260 }
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 130
diff changeset
261
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
262 class DotListType : Type
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
263 {
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
264 Type[] dotList;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
265 this(Type[] dotList)
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
266 {
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
267 super(TID.DotList, null);
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
268 this.dotList = dotList;
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
269 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
270 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
271
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
272 class IdentifierType : Type
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
273 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 258
diff changeset
274 Token* ident;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 258
diff changeset
275 this(Token* ident)
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
276 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
277 super(TID.Identifier, null);
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
278 this.ident = ident;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
279 }
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
280 }
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
281
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
282 class TypeofType : Type
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
283 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
284 Expression e;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
285 this(Expression e)
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
286 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
287 super(TID.Typeof, null);
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
288 this.e = e;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
289 }
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
290 }
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
291
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
292 class TemplateInstanceType : Type
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
293 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 258
diff changeset
294 Token* ident;
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
295 TemplateArguments targs;
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 258
diff changeset
296 this(Token* ident, TemplateArguments targs)
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
297 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
298 super(TID.TemplateInstance, null);
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
299 this.ident = ident;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
300 this.targs = targs;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
301 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
302 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 150
diff changeset
303
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
304 class PointerType : Type
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
305 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
306 this(Type t)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
307 {
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
308 super(TID.Pointer, t);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
309 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
310 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
311
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
312 class ArrayType : Type
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
313 {
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
314 Expression e, e2;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
315 Type assocType;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
316 this(Type t)
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
317 {
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
318 super(TID.Array, t);
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
319 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
320 this(Type t, Expression e, Expression e2)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
321 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
322 this(t);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
323 this.e = e;
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
324 this.e2 = e2;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
325 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
326 this(Type t, Type assocType)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
327 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
328 this(t);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 100
diff changeset
329 this.assocType = assocType;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
330 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
331 }
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 95
diff changeset
332
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
333 class FunctionType : Type
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
334 {
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
335 Type returnType;
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
336 Parameters parameters;
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
337 TemplateParameters tparams;
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 255
diff changeset
338 this(Type returnType, Parameters parameters, TemplateParameters tparams = null)
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
339 {
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
340 super(TID.Function, null);
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
341 this.returnType = returnType;
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
342 this.parameters = parameters;
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 159
diff changeset
343 this.tparams = tparams;
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
344 }
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 117
diff changeset
345 }
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
346
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
347 class DelegateType : Type
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
348 {
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
349 this(Type func)
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
350 {
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
351 super(TID.Delegate, func);
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
352 }
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
353 }
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
354
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
355 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
356 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
357 class ConstType : Type
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
358 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
359 this(Type t)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
360 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
361 // If t is null: cast(const)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
362 super(TID.Const, t);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
363 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
364 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
365
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
366 class InvariantType : Type
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
367 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
368 this(Type t)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
369 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
370 // If t is null: cast(invariant)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
371 super(TID.Invariant, t);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
372 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
373 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 264
diff changeset
374 } // version(D2)