- php : fixed haxe.Stack error (issue #11)

genphp.ml

@@ -1189,13 +1189,13 @@ and gen_expr ctx e =
 					| _ -> 
 						gen_expr ctx e1) in
 				
-				spr ctx "isset(";
+				spr ctx "(isset(";
 				gen_field_access ctx true e1 s;
 				spr ctx ") ? ";
 				gen_field_access ctx true e1 s;
 				spr ctx ": array(";
 				ob e1.eexpr;
-				print ctx ", %s\"%s%s\")" p s p;
+				print ctx ", %s\"%s%s\"))" p s p;
 				
 			end)
 		| TMono _ ->

std/Reflect.hx

@@ -112,14 +112,12 @@ class Reflect {
 		#elseif neko
 			return __dollar__call(func,o,args.__neko());
 		#elseif php
-		/*
-			if(__call__("is_string", o)) {
+			if(__call__("is_string", o) && !__call__("is_array", func)) {
 				if(args.length == 0) return __call__("call_user_func", field(o, func));
 				else if(args.length == 1) return __call__("call_user_func", field(o, func), args[0]);
 				else return __call__("call_user_func", field(o, func), args[0], args[1]);
 			}
-			*/
-			return __php__("(call_user_func_array(is_callable($func) ? $func : array($o, $func) , $args == null ? array() : $args->»a))");
+			return __call__("call_user_func_array", __call__("is_callable", func) ? func : __call__("array", o, func), (null == args ? __call__("array") : __field__(args, "»a")));
 		#elseif cpp
          var s:String = func;
          return untyped o.__Field(s).__Run(args);

std/haxe/Stack.hx

@@ -177,8 +177,10 @@ class Stack {
 			}
 			return m;
 		#elseif php
-			var a : Array<String> = untyped __php__("$GLOBALS[$s]");
-			var m = new Array();
+			if (!untyped __call__("isset", __var__("GLOBALS", s)))
+				return [];
+			var a : Array<String> = untyped __var__("GLOBALS", s);
+			var m = [];
 			for( i in 0...a.length - ((s == "%s") ? 2 : 0)) {
 				var d = a[i].split("::");
 				m.unshift(Method(d[0],d[1]));

std/php/Boot.hx

@@ -715,6 +715,7 @@ class _hx_lambda {
 		}
 		for($»i = 0; $»i < count($this->args); $»i++)
 			${$this->args[$»i]} =& $this->params[$»i];
+		$»this = $this->scope;
 		return eval($this->body);
 	}