|
@@ -57,7 +57,7 @@ class Stack {
|
|
|
#elseif php
|
|
|
return makeStack("%s");
|
|
|
#elseif cpp
|
|
|
- var s:Array<String> = untyped __global__.__hxcpp_get_call_stack(true);
|
|
|
+ var s:Array<String> = untyped __global__.__hxcpp_get_call_stack(true);
|
|
|
return makeStack(s);
|
|
|
#else
|
|
|
return [];
|
|
@@ -69,7 +69,7 @@ class Stack {
|
|
|
the place the last exception was thrown and the place it was
|
|
|
catched.
|
|
|
**/
|
|
|
- #if cpp @:noStack #end /* Do not mess up the exception stack */
|
|
|
+ #if cpp @:noStack #end /* Do not mess up the exception stack */
|
|
|
public static function exceptionStack() : Array<StackItem> {
|
|
|
#if neko
|
|
|
return makeStack(untyped __dollar__excstack());
|
|
@@ -94,7 +94,7 @@ class Stack {
|
|
|
#elseif php
|
|
|
return makeStack("%e");
|
|
|
#elseif cpp
|
|
|
- var s:Array<String> = untyped __global__.__hxcpp_get_exception_stack();
|
|
|
+ var s:Array<String> = untyped __global__.__hxcpp_get_exception_stack();
|
|
|
return makeStack(s);
|
|
|
#else
|
|
|
return [];
|
|
@@ -139,7 +139,7 @@ class Stack {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- #if cpp @:noStack #end /* Do not mess up the exception stack */
|
|
|
+ #if cpp @:noStack #end /* Do not mess up the exception stack */
|
|
|
private static function makeStack(s) {
|
|
|
#if neko
|
|
|
var a = new Array();
|
|
@@ -197,16 +197,16 @@ class Stack {
|
|
|
#elseif cpp
|
|
|
var stack : Array<String> = s;
|
|
|
var m = new Array<StackItem>();
|
|
|
- for(func in stack) {
|
|
|
+ for(func in stack) {
|
|
|
var words = func.split("::");
|
|
|
- if (words.length==0)
|
|
|
+ if (words.length==0)
|
|
|
m.unshift(CFunction)
|
|
|
- else if (words.length==2)
|
|
|
+ else if (words.length==2)
|
|
|
m.unshift(Method(words[0],words[1]));
|
|
|
- else if (words.length==4)
|
|
|
+ else if (words.length==4)
|
|
|
m.unshift(FilePos( Method(words[0],words[1]),words[2],Std.parseInt(words[3])));
|
|
|
}
|
|
|
- return m;
|
|
|
+ return m;
|
|
|
#else
|
|
|
return null;
|
|
|
#end
|