Skip to content

Commit fdfccf8

Browse files
committed
buildConsts : add support for more types (File, Tiles, ...)
1 parent 93577c2 commit fdfccf8

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

cdb/Macros.hx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ class Macros {
133133
case TBool: macro :Bool;
134134
case TString: macro :String;
135135
case TCurve: macro :cdb.Types.Curve;
136+
case TGradient: macro :cdb.Types.Gradient;
137+
case TImage: macro :String;
138+
case TFile: macro :String;
139+
case TTilePos: macro :cdb.Types.TilePos;
140+
case TTileLayer: macro :cdb.Types.TileLayer;
141+
case TDynamic: macro :Dynamic;
136142
default: null;
137143
};
138144

@@ -154,6 +160,7 @@ class Macros {
154160
function buildField(col:cdb.Data.Column, colVal:Dynamic, sheet:Sheet, rowExpr:Expr, prefix:String):FieldBuild {
155161
if (colVal == null)
156162
return null;
163+
rowExpr = macro ($rowExpr : Dynamic);
157164
var colName = col.name;
158165
switch (col.type) {
159166
case TInt | TColor | TFloat | TBool:
@@ -163,7 +170,7 @@ class Macros {
163170
load: macro $rowExpr.$colName,
164171
init: macro $v{colVal}
165172
};
166-
case TCurve:
173+
case TCurve | TGradient | TImage | TFile | TTilePos | TTileLayer | TDynamic:
167174
return {
168175
type: simpleType(col.type),
169176
vars: [],
@@ -223,7 +230,7 @@ class Macros {
223230
var vars = [];
224231

225232
var arrVar = prefix + "_" + colName;
226-
vars.push(makeVar(arrVar, debugPos(macro ($rowExpr : Dynamic).$colName, 'field: $arrVar')));
233+
vars.push(makeVar(arrVar, debugPos(macro $rowExpr.$colName, 'field: $arrVar')));
227234

228235
for (i => row in val) {
229236
var sid:String = Reflect.field(row, idCol.name);

0 commit comments

Comments
 (0)