annotate dmd/StructInitializer.d @ 187:b0d41ff5e0df

Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218
author Abscissa
date Tue, 07 Jun 2011 23:37:34 -0400
parents e3afd1303184
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
1 module dmd.StructInitializer;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
2
114
e28b18c23469 added a module dmd.common for commonly used stuff
Trass3r
parents: 84
diff changeset
3 import dmd.common;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
4 import dmd.Initializer;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
5 import dmd.TOK;
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
6 import dmd.TypeSArray;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
7 import dmd.FuncLiteralDeclaration;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
8 import dmd.TypeFunction;
56
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
9 import dmd.StructDeclaration;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
10 import dmd.StructLiteralExp;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
11 import dmd.ArrayTypes;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
12 import dmd.Array;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
13 import dmd.Loc;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
14 import dmd.Type;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
15 import dmd.Scope;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
16 import dmd.Identifier;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
17 import dmd.CompoundStatement;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
18 import dmd.AggregateDeclaration;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
19 import dmd.OutBuffer;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
20 import dmd.HdrGenState;
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
21 import dmd.Expression;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
22 import dmd.TypeStruct;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
23 import dmd.TY;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
24 import dmd.VarDeclaration;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
25 import dmd.Dsymbol;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
26 import dmd.Util;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
27 import dmd.ExpInitializer;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
28 import dmd.FuncExp;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
29 import dmd.LINK;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
30
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
31 import dmd.backend.dt_t;
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
32 import dmd.backend.Util;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
33
187
b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218
Abscissa
parents: 178
diff changeset
34 import dmd.DDMDExtensions;
b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218
Abscissa
parents: 178
diff changeset
35
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
36 class StructInitializer : Initializer
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
37 {
187
b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218
Abscissa
parents: 178
diff changeset
38 mixin insertMemberExtension!(typeof(this));
b0d41ff5e0df Added expandability scheme outlined in http://www.dsource.org/forums/viewtopic.php?t=5659&sid=6f2150ff5b0bffcd47512a6a7608d218
Abscissa
parents: 178
diff changeset
39
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
40 Identifiers field; // of Identifier *'s
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
41 Initializers value; // parallel array of Initializer *'s
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
42
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
43 VarDeclarations vars; // parallel array of VarDeclaration *'s
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
44 AggregateDeclaration ad; // which aggregate this is for
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
45
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
46 this(Loc loc)
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
47 {
178
e3afd1303184 Many small bugs fixed
korDen
parents: 135
diff changeset
48 register();
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
49 super(loc);
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
50 ad = null;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
51
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
52 field = new Identifiers();
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
53 value = new Initializers();
51
b7d29f613539 StaticAssertStatement.syntaxCopy
korDen
parents: 2
diff changeset
54
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
55 vars = new VarDeclarations();
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
56 }
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
57
72
2e2a5c3f943a reduced warnings by adding override to the methods
Trass3r
parents: 67
diff changeset
58 override Initializer syntaxCopy()
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
59 {
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
60 auto ai = new StructInitializer(loc);
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
61
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
62 assert(field.dim == value.dim);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
63 ai.field.setDim(field.dim);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
64 ai.value.setDim(value.dim);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
65 for (int i = 0; i < field.dim; i++)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
66 {
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
67 ai.field[i] = field[i];
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
68
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
69 auto init = value[i];
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
70 init = init.syntaxCopy();
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
71 ai.value[i] = init;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
72 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
73
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
74 return ai;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
75 }
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
76
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
77 void addInit(Identifier field, Initializer value)
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
78 {
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
79 //printf("StructInitializer.addInit(field = %p, value = %p)\n", field, value);
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
80 this.field.push(field);
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
81 this.value.push(value);
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
82 }
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
83
72
2e2a5c3f943a reduced warnings by adding override to the methods
Trass3r
parents: 67
diff changeset
84 override Initializer semantic(Scope sc, Type t)
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
85 {
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
86 int errors = 0;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
87
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
88 //printf("StructInitializer.semantic(t = %s) %s\n", t.toChars(), toChars());
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
89 vars.setDim(field.dim);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
90 t = t.toBasetype();
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
91 if (t.ty == Tstruct)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
92 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
93 uint fieldi = 0;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
94
135
af1bebfd96a4 dmd 2.038
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 130
diff changeset
95 auto ts = cast(TypeStruct)t;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
96 ad = ts.sym;
135
af1bebfd96a4 dmd 2.038
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 130
diff changeset
97 if (ad.ctor)
af1bebfd96a4 dmd 2.038
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 130
diff changeset
98 error("%s %s has constructors, cannot use { initializers }, use %s( initializers ) instead",
af1bebfd96a4 dmd 2.038
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 130
diff changeset
99 ad.kind(), ad.toChars(), ad.toChars());
af1bebfd96a4 dmd 2.038
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 130
diff changeset
100 for (size_t i = 0; i < field.dim; i++)
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
101 {
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
102 Identifier id = field[i];
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
103 Initializer val = value[i];
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
104 Dsymbol s;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
105 VarDeclaration v;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
106
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
107 if (id is null)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
108 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
109 if (fieldi >= ad.fields.dim)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
110 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
111 error(loc, "too many initializers for %s", ad.toChars());
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
112 field.remove(i);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
113 i--;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
114 continue;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
115 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
116 else
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
117 {
79
43073c7c7769 updated to 2.035
Trass3r
parents: 72
diff changeset
118 s = ad.fields[fieldi];
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
119 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
120 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
121 else
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
122 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
123 //s = ad.symtab.lookup(id);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
124 s = ad.search(loc, id, 0);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
125 if (!s)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
126 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
127 error(loc, "'%s' is not a member of '%s'", id.toChars(), t.toChars());
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
128 continue;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
129 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
130
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
131 // Find out which field index it is
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
132 for (fieldi = 0; 1; fieldi++)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
133 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
134 if (fieldi >= ad.fields.dim)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
135 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
136 s.error("is not a per-instance initializable field");
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
137 break;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
138 }
79
43073c7c7769 updated to 2.035
Trass3r
parents: 72
diff changeset
139 if (s == ad.fields[fieldi])
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
140 break;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
141 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
142 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
143 if (s && (v = s.isVarDeclaration()) !is null)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
144 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
145 val = val.semantic(sc, v.type);
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
146 value[i] = val;
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
147 vars[i] = v;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
148 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
149 else
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
150 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
151 error(loc, "%s is not a field of %s", id ? id.toChars() : s.toChars(), ad.toChars());
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
152 errors = 1;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
153 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
154 fieldi++;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
155 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
156 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
157 else if (t.ty == Tdelegate && value.dim == 0)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
158 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
159 /* Rewrite as empty delegate literal { }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
160 */
130
60bb0fe4563e dmdfe 2.037 first main iteration
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 128
diff changeset
161 auto arguments = new Parameters;
2
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
162 Type tf = new TypeFunction(arguments, null, 0, LINK.LINKd);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
163 FuncLiteralDeclaration fd = new FuncLiteralDeclaration(loc, Loc(0), tf, TOK.TOKdelegate, null);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
164 fd.fbody = new CompoundStatement(loc, new Statements());
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
165 fd.endloc = loc;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
166 Expression e = new FuncExp(loc, fd);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
167 ExpInitializer ie = new ExpInitializer(loc, e);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
168 return ie.semantic(sc, t);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
169 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
170 else
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
171 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
172 error(loc, "a struct is not a valid initializer for a %s", t.toChars());
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
173 errors = 1;
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
174 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
175 if (errors)
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
176 {
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
177 field.setDim(0);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
178 value.setDim(0);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
179 vars.setDim(0);
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
180 }
7427ded8caf7 Removed unreferenced modules
korDen
parents: 0
diff changeset
181 return this;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
182 }
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
183
56
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
184 /***************************************
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
185 * This works by transforming a struct initializer into
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
186 * a struct literal. In the future, the two should be the
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
187 * same thing.
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
188 */
72
2e2a5c3f943a reduced warnings by adding override to the methods
Trass3r
parents: 67
diff changeset
189 override Expression toExpression()
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
190 {
56
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
191 Expression e;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
192
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
193 //printf("StructInitializer.toExpression() %s\n", toChars());
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
194 if (!ad) // if fwd referenced
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
195 {
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
196 return null;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
197 }
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
198 StructDeclaration sd = ad.isStructDeclaration();
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
199 if (!sd)
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
200 return null;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
201 Expressions elements = new Expressions();
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
202 for (size_t i = 0; i < value.dim; i++)
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
203 {
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
204 if (field[i])
56
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
205 goto Lno;
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
206 Initializer iz = value[i];
56
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
207 if (!iz)
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
208 goto Lno;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
209 Expression ex = iz.toExpression();
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
210 if (!ex)
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
211 goto Lno;
84
be2ab491772e Expressions -> Vector!Expression
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 79
diff changeset
212 elements.push(ex);
56
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
213 }
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
214 e = new StructLiteralExp(loc, sd, elements);
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
215 e.type = sd.type;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
216 return e;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
217
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
218 Lno:
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
219 delete elements;
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
220 //error(loc, "struct initializers as expressions are not allowed");
51605de93870 TupleExp.optimize
korDen
parents: 51
diff changeset
221 return null;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
222 }
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
223
72
2e2a5c3f943a reduced warnings by adding override to the methods
Trass3r
parents: 67
diff changeset
224 override void toCBuffer(OutBuffer buf, HdrGenState* hgs)
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
225 {
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
226 assert(false);
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
227 }
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
228
72
2e2a5c3f943a reduced warnings by adding override to the methods
Trass3r
parents: 67
diff changeset
229 override dt_t* toDt()
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
230 {
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
231 scope dts = new Vector!(dt_t*);
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
232 uint i;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
233 uint j;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
234 dt_t* dt;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
235 dt_t* d;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
236 dt_t** pdtend;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
237 uint offset;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
238
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
239 //printf("StructInitializer.toDt('%s')\n", toChars());
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
240 dts.setDim(ad.fields.dim);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
241 dts.zero();
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
242
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
243 for (i = 0; i < vars.dim; i++)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
244 {
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
245 VarDeclaration v = vars[i];
127
9ee9b55452cb Identifiers, Initializers -> Vector
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 114
diff changeset
246 Initializer val = value[i];
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
247
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
248 //printf("vars[%d] = %s\n", i, v.toChars());
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
249
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
250 for (j = 0; 1; j++)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
251 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
252 assert(j < dts.dim);
79
43073c7c7769 updated to 2.035
Trass3r
parents: 72
diff changeset
253 //printf(" adfield[%d] = %s\n", j, ((VarDeclaration *)ad.fields[j]).toChars());
43073c7c7769 updated to 2.035
Trass3r
parents: 72
diff changeset
254 if (cast(VarDeclaration)ad.fields[j] == v) // TODO: check if 'is' needs to be used here
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
255 {
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
256 if (dts[j])
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
257 error(loc, "field %s of %s already initialized", v.toChars(), ad.toChars());
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
258 dts[j] = val.toDt();
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
259 break;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
260 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
261 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
262 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
263
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
264 dt = null;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
265 pdtend = &dt;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
266 offset = 0;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
267 for (j = 0; j < dts.dim; j++)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
268 {
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
269 VarDeclaration v = ad.fields[j];
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
270
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
271 d = dts[j];
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
272 if (!d)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
273 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
274 // An instance specific initializer was not provided.
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
275 // Look to see if there's a default initializer from the
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
276 // struct definition
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
277 if (v.init)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
278 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
279 d = v.init.toDt();
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
280 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
281 else if (v.offset >= offset)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
282 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
283 uint k;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
284 uint offset2 = v.offset + cast(uint)v.type.size();
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
285 // Make sure this field does not overlap any explicitly
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
286 // initialized field.
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
287 for (k = j + 1; 1; k++)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
288 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
289 if (k == dts.dim) // didn't find any overlap
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
290 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
291 v.type.toDt(&d);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
292 break;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
293 }
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
294 VarDeclaration v2 = ad.fields[k];
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
295
128
e6e542f37b94 Some more Array -> Vector conversions
Eldar Insafutdinov <e.insafutdinov@gmail.com>
parents: 127
diff changeset
296 if (v2.offset < offset2 && dts[k])
67
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
297 break; // overlap
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
298 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
299 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
300 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
301 if (d)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
302 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
303 if (v.offset < offset)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
304 error(loc, "duplicate union initialization for %s", v.toChars());
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
305 else
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
306 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
307 uint sz = dt_size(d);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
308 uint vsz = cast(uint)v.type.size();
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
309 uint voffset = v.offset;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
310
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
311 uint dim = 1;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
312 for (Type vt = v.type.toBasetype();
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
313 vt.ty == Tsarray;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
314 vt = vt.nextOf().toBasetype())
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
315 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
316 TypeSArray tsa = cast(TypeSArray)vt;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
317 dim *= tsa.dim.toInteger();
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
318 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
319 assert(sz == vsz || sz * dim <= vsz);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
320
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
321 for (size_t k = 0; k < dim; k++)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
322 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
323 if (offset < voffset)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
324 pdtend = dtnzeros(pdtend, voffset - offset);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
325 if (!d)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
326 {
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
327 if (v.init)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
328 d = v.init.toDt();
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
329 else
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
330 v.type.toDt(&d);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
331 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
332 pdtend = dtcat(pdtend, d);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
333 d = null;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
334 offset = voffset + sz;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
335 voffset += vsz / dim;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
336 if (sz == vsz)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
337 break;
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
338 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
339 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
340 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
341 }
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
342
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
343 if (offset < ad.structsize)
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
344 dtnzeros(pdtend, ad.structsize - offset);
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
345
f708f0452e81 some of the backend/codegen stuff implemented
korDen
parents: 56
diff changeset
346 return dt;
0
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
347 }
10317f0c89a5 Initial commit
korDen
parents:
diff changeset
348
72
2e2a5c3f943a reduced warnings by adding override to the methods
Trass3r
parents: 67
diff changeset
349 override StructInitializer isStructInitializer() { return this; }
2e2a5c3f943a reduced warnings by adding override to the methods
Trass3r
parents: 67
diff changeset
350 }