2 files changed, 7 insertions, 1 deletions

diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 9e778d7..8ec131f 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -5117,7 +5117,7 @@ private:
                                 newArgs.emplace_back(_parser.toString(argsDef->varArg));
                         }
                 }
-                std::string macroCodes = "_ENV=yue:require('yue'),<index>:_G,<newindex>:(k,v)=>_G[k]=v\n("s + join(newArgs, ","sv) + ")->"s + _parser.toString(macroLit->body);
+                std::string macroCodes = "_ENV=require('yue').macro_env\n("s + join(newArgs, ","sv) + ")->"s + _parser.toString(macroLit->body);
                 auto chunkName = "=(macro "s + macroName + ')';
                 pushCurrentModule(); // cur
                 int top = lua_gettop(L) - 1;
diff --git a/src/yuescript/yuescript.h b/src/yuescript/yuescript.h
index 97ebdef..f6d12dc 100644
--- a/src/yuescript/yuescript.h
+++ b/src/yuescript/yuescript.h
@@ -225,4 +225,10 @@ yue.pcall = yue_call
 yue.require = yue_require
 yue.p = p
 yue.traceback = yue_traceback
+yue.macro_env = setmetatable({yue = yue}, {
+        __index = _G,
+        __newindex = function(_, k, v)
+                _G[k] = v
+        end
+})
 )yuescript_codes";