Support for php7 target

Author: RealyUniqueName

README.md

@@ -1,10 +1,10 @@
 # JStack
 
-This library automatically transforms `haxe.CallStack.callStack()` and `haxe.CallStack.exceptionStack()` results to make them point at Haxe sources instead of generated js file.
-The only supported target is `js`.
+This library automatically transforms `haxe.CallStack.callStack()`, `haxe.CallStack.exceptionStack()` and uncaught exceptions where possible to make them point at Haxe sources instead of generated js or php files.
+The only supported targets are `js` and `php7`.
 
-Works only in debug mode or when `-D JSTACK_FORCE` is enabled on js target.
-Does not affect your app if compiled without `-debug` and `-D JSTACK_FORCE` flags or to some other target.
+Works only in debug mode or when `-D JSTACK_FORCE`.
+Does not affect your app if compiled without `-debug` and `-D JSTACK_FORCE` flags or to unsupported target.
 
 In debug mode Haxe generates a source map, which is utilized by JStack using [source-map library](https://github.com/mozilla/source-map) (bundled with JStack and embded automatically)
 

extraParams.hxml

@@ -1,4 +1,3 @@
--D source-map
 --macro include('jstack.JStack')
 --macro keep('jstack.JStack')
 --macro jstack.Tools.addInjectMetaToMain()

haxelib.json

@@ -3,9 +3,9 @@
   "url"          : "https://github.com/RealyUniqueName/JStack",
   "license"      : "MIT",
   "tags"         : ["js", "stack", "callstack", "stacktrace"],
-  "description"  : "Friendly stack traces for JS target. Makes haxe.CallStack point to haxe sources.",
-  "version"      : "2.0.0",
-  "releasenote"  : "Use `sourcemap` haxe lib instead of js lib.",
+  "description"  : "Friendly stack traces for JS and PHP7 targets. Makes them point to haxe sources.",
+  "version"      : "2.1.0",
+  "releasenote"  : "Support for php7 target",
   "classPath"    : "src",
   "contributors" : ["RealyUniqueName"],
   "dependencies" : {

src/jstack/Tools.hx

@@ -29,6 +29,8 @@ class Tools {
             return;
         #end
         if (!Context.defined('js') && !Context.defined('php7')) return;
+        Compiler.define('js_source_map');
+        Compiler.define('source_map');
 
         var main : String = null;
         var args = Sys.args();

src/jstack/php7/JStack.hx

@@ -5,13 +5,14 @@ import php.Global.*;
 import haxe.CallStack;
 import sourcemap.SourcePos;
 
-using StringTools;
+using Type;
 
 /**
  * Handles source map
  */
 class JStack {
     static var sourceMaps = new Map<String,SourceMap>();
+    static var mapPositionDefined : Bool = false;
 
     /**
      * Invokes initialization.
@@ -30,14 +31,25 @@ class JStack {
     @:access(haxe.CallStack)
     static public dynamic function uncaughtExceptionHandler (e:Throwable) : String {
         var stack = CallStack.makeStack(getNativeStack(e));
-        var error = e.getMessage() + CallStack.toString(stack.map(mapStackItem)) + '\n';
+        if (!mapPositionDefined) {
+            stack = stack.map(mapStackItem);
+        }
+        var error = e.getMessage() + CallStack.toString(stack) + '\n';
         return error;
     }
 
     /**
      * Initialization
      */
     static function init () {
+        //CallStack.exceptionStack() and CallStack.callStack();
+        var phpClassName = Boot.getPhpName(CallStack.getClassName());
+        mapPositionDefined = property_exists(phpClassName, 'mapPosition');
+        if (mapPositionDefined) {
+            Syntax.setStaticField(phpClassName, 'mapPosition', mapPosition);
+        }
+
+        //Uncaught exceptions
         var userDefined = set_exception_handler(_uncaughtExceptionHandler);
         //we have a user-defined handler, don't overwrite it.
         if (userDefined != null) set_exception_handler(userDefined);
@@ -59,18 +71,28 @@ class JStack {
     static inline function mapStackItem (item:StackItem) : StackItem {
         switch (item) {
             case FilePos(symbol, file, line):
-                var map = getSourceMap(file);
-                if (map == null) {
+                var pos = mapPosition(file, line);
+                if (pos == null) {
                     return item;
                 } else {
-                    var pos = map.originalPositionFor(line);
                     return FilePos(symbol, pos.source, pos.originalLine);
                 }
             case _:
                 return item;
         }
     }
 
+    /**
+     * Map position in generated php file to original position in source hx file.
+     * @param file - Generated php file name.
+     * @param line - Line in generated php file name.
+     * @return SourcePos
+     */
+    static inline function mapPosition (file:String, line:Int) : Null<SourcePos> {
+        var map = getSourceMap(file);
+        return (map == null ? null : map.originalPositionFor(line));
+    }
+
     /**
      * Handles source map parsers for each file.
      * @param file - A name of a generated php file.