improve print for interpreter

1 files changed, 27 insertions, 2 deletions

diff --git a/xmake/core/sandbox/modules/interpreter/print.lua b/xmake/core/sandbox/modules/interpreter/print.lua
index 50346047a..f33afecea 100644
--- a/xmake/core/sandbox/modules/interpreter/print.lua
+++ b/xmake/core/sandbox/modules/interpreter/print.lua
@@ -22,11 +22,36 @@
 -- @file        print.lua
 --
 
+-- load modules
+local try       = require("sandbox/modules/try")
+local catch     = require("sandbox/modules/catch")
+
 -- print format string 
 function _print(format, ...)
 
-    -- done
-    io.write(string.format(format, ...) .. "\n")
+    -- print format string
+    if type(format) == "string" and format:find("%", 1, true) then
+
+        local args = {...}
+        try
+        {
+            function ()
+                -- attempt to print format string first
+                io.write(string.format(format, unpack(args)) .. "\n")
+            end,
+            catch 
+            {
+                function ()
+                    -- print multi-variables with raw lua action
+                    print(format, unpack(args))
+                end
+            }
+        }
+
+    else
+        -- print multi-variables with raw lua action
+        print(format, ...)
+    end
 end
 
 -- load module