Deal with ENew and EConst(CIdent)). Updated tests & doc.
This commit is contained in:
@@ -129,6 +129,7 @@ Traverse an expression and replace any *type* that looks like a type parameter f
|
||||
```
|
||||
|
||||
A `StringMap` is a natural fit here, but you can do whatever you want.
|
||||
Note that if the type for a given name is a `TPath`, it will also be substituted for class names in `new` statements and for identifiers of that name.
|
||||
- `function typedMap(source:Expr, f:Expr->Array<Var>->Expr, ?ctx:Array<Var>, ?pos:Position):Expr`
|
||||
Similar to transform, but handles expressions in top-down order and keeps track of variable declarations, function arguments etc. Only expressions that are not changed by the transformer function `f` are traversed further. The second argument to `f` is the current context that you can use in `typeof` to determine the type of a subexpression.
|
||||
- `function bounce(f:Void->Expr, ?pos:Position):Expr`
|
||||
|
@@ -113,7 +113,22 @@ class Exprs {
|
||||
static public function substParams(source:Expr, subst:ParamSubst, ?pos):Expr
|
||||
return crawl(
|
||||
source,
|
||||
function (e) return e,
|
||||
function (e)
|
||||
return switch e.expr {
|
||||
case ENew({ pack: [], name: name }, args) if (subst.exists(name)):
|
||||
switch subst.get(name) {
|
||||
case TPath(p):
|
||||
ENew(p, args).at(e.pos);
|
||||
default: e;//TODO: report an error?
|
||||
}
|
||||
case EConst(CIdent(name)) if (subst.exists(name)):
|
||||
switch subst.get(name) {
|
||||
case TPath({ pack: pack, name: name }):
|
||||
pack.concat([name]).drill(e.pos);
|
||||
default: e;//TODO: report an error?
|
||||
}
|
||||
default: e;
|
||||
},
|
||||
function (c:ComplexType)
|
||||
return
|
||||
switch (c) {
|
||||
|
@@ -46,7 +46,6 @@ class Exprs extends Base {
|
||||
test(macro @yield while (_) foo, macro while (_) foo, { leaveLoops: true });
|
||||
test(macro @yield [while (_) foo], macro [while (_) foo]);
|
||||
}
|
||||
|
||||
function testSubstitute() {
|
||||
exprEq(
|
||||
macro foo.call(arg1, arg2),
|
||||
@@ -67,5 +66,18 @@ class Exprs extends Base {
|
||||
'C' => macro : Array<Float>
|
||||
])
|
||||
);
|
||||
exprEq(
|
||||
macro {
|
||||
new Foo<Bar>(1, 2, 3);
|
||||
Bar.foo();
|
||||
},
|
||||
(macro {
|
||||
new X(1, 2, 3);
|
||||
Y.foo();
|
||||
}).substParams([
|
||||
'X' => macro : Foo<Bar>,
|
||||
'Y' => macro : Bar
|
||||
])
|
||||
);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user