|
@@ -69,7 +69,7 @@ class Template {
|
|
}
|
|
}
|
|
|
|
|
|
public function execute( context : Dynamic, ?macros : Dynamic ) {
|
|
public function execute( context : Dynamic, ?macros : Dynamic ) {
|
|
- this.macros = macros;
|
|
|
|
|
|
+ this.macros = if( macros == null ) Reflect.empty() else macros;
|
|
this.context = context;
|
|
this.context = context;
|
|
stack = new List();
|
|
stack = new List();
|
|
buf = new StringBuf();
|
|
buf = new StringBuf();
|
|
@@ -351,7 +351,7 @@ class Template {
|
|
try {
|
|
try {
|
|
buf.add(Std.string(Reflect.callMethod(macros,v,pl)));
|
|
buf.add(Std.string(Reflect.callMethod(macros,v,pl)));
|
|
} catch( e : Dynamic ) {
|
|
} catch( e : Dynamic ) {
|
|
- var plstr = try pl.toString() catch( e : Dynamic ) "???";
|
|
|
|
|
|
+ var plstr = try pl.join(",") catch( e : Dynamic ) "???";
|
|
var msg = "Macro call "+m+"("+plstr+") failed ("+Std.string(e)+")";
|
|
var msg = "Macro call "+m+"("+plstr+") failed ("+Std.string(e)+")";
|
|
#if neko
|
|
#if neko
|
|
neko.Lib.rethrow(msg);
|
|
neko.Lib.rethrow(msg);
|