Merge branch 'develop'

ialex32x · Aug 2, 2019 · 2d401fb · 2d401fb
2 parents bd6a850 + 2f19509
commit 2d401fb
Show file tree

Hide file tree

Showing 15 changed files with 9,544 additions and 12 deletions.
diff --git a/res/stacktrace_sourcemap.png b/res/stacktrace_sourcemap.png
diff --git a/unity/Assets/Duktape/Source/DuktapeAux.cs b/unity/Assets/Duktape/Source/DuktapeAux.cs
@@ -3,10 +3,13 @@
 
 namespace Duktape
 {
+    public delegate string duk_source_position_cb(IntPtr ctx, string funcName, string fileName, int lineNumber);
+
     // 基础环境
     public static partial class DuktapeAux
     {
         public static bool printStacktrace = false;
+        public static duk_source_position_cb duk_source_position = default_duk_source_position;
 
         public static Type GetType(string name)
         {
@@ -112,18 +115,7 @@ public static int duk_print(IntPtr ctx)
                         DuktapeDLL.duk_get_prop_string(ctx, -2, "fileName");
                         var fileName = DuktapeDLL.duk_safe_to_string(ctx, -1);
                         DuktapeDLL.duk_pop_n(ctx, 4);
-                        if (lineNumber != 0)
-                        {
-                            if (string.IsNullOrEmpty(funcName))
-                            {
-                                funcName = "[anonymous]";
-                            }
-                            stacktrace += $"{funcName} ({fileName}:{lineNumber})\n";
-                        }
-                        else
-                        {
-                            stacktrace += $"{funcName} (<native code>)\n";
-                        }
+                        stacktrace += (duk_source_position ?? default_duk_source_position)(ctx, funcName, fileName, lineNumber);
                     }
                     else
                     {
@@ -137,6 +129,19 @@ public static int duk_print(IntPtr ctx)
             return 0;
         }
 
+        public static string default_duk_source_position(IntPtr ctx, string funcName, string fileName, int lineNumber)
+        {
+            if (lineNumber != 0)
+            {
+                if (string.IsNullOrEmpty(funcName))
+                {
+                    funcName = "[anonymous]";
+                }
+                return $"{funcName} ({fileName}:{lineNumber})\n";
+            }
+            return $"{funcName} (<native code>)\n";
+        }
+
         [AOT.MonoPInvokeCallback(typeof(DuktapeDLL.duk_c_function))]
         public static int duk_dofile(IntPtr ctx)
         {

diff --git a/unity/Assets/DuktapeExtra.meta b/unity/Assets/DuktapeExtra.meta
diff --git a/unity/Assets/DuktapeExtra/Plugins.meta b/unity/Assets/DuktapeExtra/Plugins.meta
diff --git a/unity/Assets/DuktapeExtra/Plugins/Newtonsoft.Json.dll b/unity/Assets/DuktapeExtra/Plugins/Newtonsoft.Json.dll
diff --git a/unity/Assets/DuktapeExtra/Plugins/Newtonsoft.Json.dll.meta b/unity/Assets/DuktapeExtra/Plugins/Newtonsoft.Json.dll.meta