From 05586ecd48300bbc4b8fb7f5a8e85a628eefda8e Mon Sep 17 00:00:00 2001
From: sumneko <sumneko@hotmail.com>
Date: Sat, 20 Apr 2019 10:58:47 +0800
Subject: =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BDemmy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/parser/ast.lua | 2 +-
 server/src/vm/vm.lua      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/src/parser/ast.lua b/server/src/parser/ast.lua
index 136d7565..55364ca9 100644
--- a/server/src/parser/ast.lua
+++ b/server/src/parser/ast.lua
@@ -1517,7 +1517,7 @@ return function (self, lua, mode, version)
         Label = {{}},
         Version = version,
     }
-    local suc, res, err = pcall(self.grammar, lua, mode, Defs)
+    local suc, res, err = xpcall(self.grammar, debug.traceback, lua, mode, Defs)
     if not suc then
         return nil, res
     end
diff --git a/server/src/vm/vm.lua b/server/src/vm/vm.lua
index 57301ed5..9ca661bd 100644
--- a/server/src/vm/vm.lua
+++ b/server/src/vm/vm.lua
@@ -58,6 +58,7 @@ function mt:buildTable(source)
                     tbl:setChild(key[1], value, key)
                 end
             end
+        elseif obj.type:sub(1, 4) == 'emmy' then
         else
             local value = self:getExp(obj)
             if value.type == 'multi' then
-- 
cgit v1.2.3