From a193fb96aa44c2ba32b18557fabd7d7694ee41eb Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Wed, 11 Apr 2018 22:36:39 +0800
Subject: improve interpreter tips

---
 xmake/core/base/interpreter.lua | 4 ++--
 xmake/core/base/option.lua      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'xmake/core/base')

diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index ea5dfcd96..60e6f9cc7 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -497,7 +497,7 @@ function interpreter:_make(scope_kind, remove_repeat, enable_filter)
 
     -- empty scope?
     if not scopes or not scopes._ROOT then
-        return nil, string.format("the scope %s() is empty!", scope_kind)
+        os.raise("the scope %s() is empty!", scope_kind)
     end
 
     -- make results
@@ -682,7 +682,7 @@ function interpreter:load(file, scope_kind, remove_repeat, enable_filter)
     -- bind public scope
     setfenv(script, self._PUBLIC)
 
-    -- done interpreter
+    -- do interpreter
     local ok, errors = xpcall(script, interpreter._traceback)
     if not ok then
         return nil, errors
diff --git a/xmake/core/base/option.lua b/xmake/core/base/option.lua
index a6a87ad7c..520a5f516 100644
--- a/xmake/core/base/option.lua
+++ b/xmake/core/base/option.lua
@@ -41,13 +41,13 @@ function option._translate(menu)
     local submenus_all = {}
     for k, submenu in pairs(menu) do
         if type(submenu) == "function" then
-            local _submenus, errors = submenu()
-            if _submenus then
-                for k, m in pairs(_submenus) do
+            local ok, _submenus_or_errors = pcall(submenu)
+            if ok and _submenus_or_errors then
+                for k, m in pairs(_submenus_or_errors) do
                     submenus_all[k] = m
                 end
             else 
-                return false, errors
+                return false, (_submenus_or_errors or "translate option menu failed!")
             end
         else
             submenus_all[k] = submenu
-- 
cgit v1.3.1