Browse Source

[hl] fixed stack format detection for local functions notation

ncannasse 6 years ago
parent
commit
f60693d4fb
1 changed files with 2 additions and 2 deletions
  1. 2 2
      std/haxe/CallStack.hx

+ 2 - 2
std/haxe/CallStack.hx

@@ -370,12 +370,12 @@ class CallStack {
 			return stack;
 		#elseif hl
 			var stack = [];
-			var r = ~/^([A-Za-z0-9.$_]+)\.([A-Za-z0-9_]+)\((.+):([0-9]+)\)$/;
+			var r = ~/^([A-Za-z0-9.$_]+)\.([~A-Za-z0-9_]+(\.[0-9]+)?)\((.+):([0-9]+)\)$/;
 			var r_fun = ~/^fun\$([0-9]+)\((.+):([0-9]+)\)$/;
 			for( i in 0...s.length-1 ) {
 				var str = @:privateAccess String.fromUCS2(s[i]);
 				if( r.match(str) )
-					stack.push(FilePos(Method(r.matched(1), r.matched(2)), r.matched(3), Std.parseInt(r.matched(4))));
+					stack.push(FilePos(Method(r.matched(1), r.matched(2)), r.matched(4), Std.parseInt(r.matched(5))));
 				else if( r_fun.match(str) )
 					stack.push(FilePos(LocalFunction(Std.parseInt(r_fun.matched(1))), r_fun.matched(2), Std.parseInt(r_fun.matched(3))));
 				else