Fixed issue #246.v0.33.5

8 files changed, 45 insertions, 15 deletions

diff --git a/README.md b/README.md
index caff885..7718b58 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,30 @@
 # YueScript
 
-<img src="doc/docs/.vitepress/public/image/yuescript.png" width="300" height="300" alt="YueScript logo"/>
+<table align="center">
+  <tr>
+    <td align="center" valign="middle" width="150" height="150">
+      <img src="doc/docs/.vitepress/public/image/yuescript.png" alt="YueScript logo"/><br/>
+    </td>
+    <td valign="middle">
+      <strong>A Language Compiles to Lua</strong><br/>
+      <sub>Dynamic, expressive, and concise syntax for Lua development.</sub><br/>
+      <sub>
+        <a href="https://yuescript.org/doc">Docs</a> ·
+        <a href="https://yuescript.org/try">Try Online</a> ·
+        <a href="https://discord.gg/cRJ2VAm2NV">Discord</a>
+      </sub>
+    </td>
+  </tr>
+</table>
+
+<p align="center">
+  <img src="doc/docs/.vitepress/public/image/mascot/electrichearts_20260211A_yuescript_xiaoyu.png" width="360" alt="Xiaoyu, the YueScript mascot"/>
+</p>
+
+
+<p align="center">
+  <sub><b>Xiaoyu (小玉)</b> · Official YueScript Mascot</sub>
+</p>
 
 [![IppClub](https://img.shields.io/badge/IppClub-Certified-11A7E2?logo=data%3Aimage%2Fsvg%2Bxml%3Bcharset%3Dutf-8%3Bbase64%2CPHN2ZyB2aWV3Qm94PSIwIDAgMjg4IDI3NCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWw6c3BhY2U9InByZXNlcnZlIiBzdHlsZT0iZmlsbC1ydWxlOmV2ZW5vZGQ7Y2xpcC1ydWxlOmV2ZW5vZGQ7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO3N0cm9rZS1taXRlcmxpbWl0OjIiPjxwYXRoIGQ9Im0xNDYgMzEgNzIgNTVWMzFoLTcyWiIgc3R5bGU9ImZpbGw6I2Y2YTgwNjtmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Im0xNjkgODYtMjMtNTUgNzIgNTVoLTQ5WiIgc3R5bGU9ImZpbGw6I2VmN2EwMDtmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Ik0yNiAzMXY1NWg4MEw4MSAzMUgyNloiIHN0eWxlPSJmaWxsOiMwN2ExN2M7ZmlsbC1ydWxlOm5vbnplcm8iLz48cGF0aCBkPSJNMTA4IDkydjExMmwzMS00OC0zMS02NFoiIHN0eWxlPSJmaWxsOiNkZTAwNWQ7ZmlsbC1ydWxlOm5vbnplcm8iLz48cGF0aCBkPSJNMCAyNzR2LTUyaDk3bC0zMyA1MkgwWiIgc3R5bGU9ImZpbGw6I2Y2YTgwNjtmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Im03NyAyNzQgNjctMTA3djEwN0g3N1oiIHN0eWxlPSJmaWxsOiNkZjI0MzM7ZmlsbC1ydWxlOm5vbnplcm8iLz48cGF0aCBkPSJNMTUyIDI3NGgyOWwtMjktNTN2NTNaIiBzdHlsZT0iZmlsbDojMzM0ODVkO2ZpbGwtcnVsZTpub256ZXJvIi8%2BPHBhdGggZD0iTTE5MSAyNzRoNzl2LTUySDE2N2wyNCA1MloiIHN0eWxlPSJmaWxsOiM0ZTI3NWE7ZmlsbC1ydWxlOm5vbnplcm8iLz48cGF0aCBkPSJNMjg4IDEwMGgtMTdWODVoLTEzdjE1aC0xN3YxM2gxN3YxNmgxM3YtMTZoMTd2LTEzWiIgc3R5bGU9ImZpbGw6I2M1MTgxZjtmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Im0yNiA4NiA1Ni01NUgyNnY1NVoiIHN0eWxlPSJmaWxsOiMzMzQ4NWQ7ZmlsbC1ydWxlOm5vbnplcm8iLz48cGF0aCBkPSJNOTMgMzFoNDJsLTMwIDI5LTEyLTI5WiIgc3R5bGU9ImZpbGw6IzExYTdlMjtmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Ik0xNTggMTc2Vjg2bC0zNCAxNCAzNCA3NloiIHN0eWxlPSJmaWxsOiMwMDU5OGU7ZmlsbC1ydWxlOm5vbnplcm8iLz48cGF0aCBkPSJtMTA2IDU5IDQxLTEtMTItMjgtMjkgMjlaIiBzdHlsZT0iZmlsbDojMDU3Y2I3O2ZpbGwtcnVsZTpub256ZXJvIi8%2BPHBhdGggZD0ibTEyNCAxMDAgMjItNDEgMTIgMjctMzQgMTRaIiBzdHlsZT0iZmlsbDojNGUyNzVhO2ZpbGwtcnVsZTpub256ZXJvIi8%2BPHBhdGggZD0ibTEwNiA2MCA0MS0xLTIzIDQxLTE4LTQwWiIgc3R5bGU9ImZpbGw6IzdiMTI4NTtmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Im0xMDggMjA0IDMxLTQ4aC0zMXY0OFoiIHN0eWxlPSJmaWxsOiNiYTAwNzc7ZmlsbC1ydWxlOm5vbnplcm8iLz48cGF0aCBkPSJtNjUgMjc0IDMzLTUySDBsNjUgNTJaIiBzdHlsZT0iZmlsbDojZWY3YTAwO2ZpbGwtcnVsZTpub256ZXJvIi8%2BPHBhdGggZD0iTTc3IDI3NGg2N2wtNDAtNDUtMjcgNDVaIiBzdHlsZT0iZmlsbDojYTgxZTI0O2ZpbGwtcnVsZTpub256ZXJvIi8%2BPHBhdGggZD0iTTE2NyAyMjJoNThsLTM0IDUyLTI0LTUyWiIgc3R5bGU9ImZpbGw6IzExYTdlMjtmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Im0yNzAgMjc0LTQ0LTUyLTM1IDUyaDc5WiIgc3R5bGU9ImZpbGw6IzA1N2NiNztmaWxsLXJ1bGU6bm9uemVybyIvPjxwYXRoIGQ9Ik0yNzUgNTVoLTU3VjBoMjV2MzFoMzJ2MjRaIiBzdHlsZT0iZmlsbDojZGUwMDVkO2ZpbGwtcnVsZTpub256ZXJvIi8%2BPHBhdGggZD0iTTE4NSAzMWg1N3Y1NWgtMjVWNTVoLTMyVjMxWiIgc3R5bGU9ImZpbGw6I2M1MTgxZjtmaWxsLXJ1bGU6bm9uemVybyIvPjwvc3ZnPg%3D%3D&labelColor=fff)](https://ippclub.org) [![Ubuntu](https://github.com/pigpigyyy/Yuescript/actions/workflows/ubuntu.yml/badge.svg)](https://github.com/pigpigyyy/Yuescript/actions/workflows/ubuntu.yml) [![Windows](https://github.com/pigpigyyy/Yuescript/actions/workflows/windows.yml/badge.svg)](https://github.com/pigpigyyy/Yuescript/actions/workflows/windows.yml) [![macOS](https://github.com/pigpigyyy/Yuescript/actions/workflows/macos.yml/badge.svg)](https://github.com/pigpigyyy/Yuescript/actions/workflows/macos.yml) [![Discord Badge](https://img.shields.io/discord/844031511208001577?color=5865F2&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/cRJ2VAm2NV)
 
@@ -146,8 +170,6 @@ Options:
 
 ## Mascot (Xiaoyu / 小玉)
 
-<img src="doc/docs/.vitepress/public/image/mascot/electrichearts_20260211A_yuescript_xiaoyu.png" width="420" alt="Xiaoyu, the YueScript mascot"/>
-
 Xiaoyu (小玉) is YueScript's official mascot, a cyber rabbit often seen perched on a crescent moon and coding on a laptop.
 
 - English page: [here](https://yuescript.org/doc/extras/mascot.html)
diff --git a/doc/docs/doc/advanced/do.md b/doc/docs/doc/advanced/do.md
index 40fd9fe..4bfcc17 100644
--- a/doc/docs/doc/advanced/do.md
+++ b/doc/docs/doc/advanced/do.md
@@ -20,7 +20,7 @@ print var -- nil here
 
 </YueDisplay>
 
-YueScript's **do** can also be used an expression . Allowing you to combine multiple lines into one. The result of the do expression is the last statement in its body.
+YueScript's **do** can also be used an expression. Allowing you to combine multiple lines into one. The result of the do expression is the last statement in its body.
 
 ```yuescript
 counter = do
diff --git a/doc/yue-de.md b/doc/yue-de.md
index 0db2bfe..aeaabf1 100644
--- a/doc/yue-de.md
+++ b/doc/yue-de.md
@@ -15,6 +15,8 @@ do
 print var -- nil hier
 ```
 
+YueScripts **do** kann auch als Ausdruck verwendet werden. So kannst du mehrere Zeilen in einem Ausdruck kombinieren. Das Ergebnis des `do`-Ausdrucks ist die letzte Anweisung im Block.
+
 ```yuescript
 counter = do
   i = 0
@@ -34,7 +36,7 @@ tbl = {
 }
 ```
 
-YueScripts **do** kann auch als Ausdruck verwendet werden. So kannst du mehrere Zeilen in einem Ausdruck kombinieren. Das Ergebnis des `do`-Ausdrucks ist die letzte Anweisung im Block. `do`-Ausdrücke unterstützen die Verwendung von `break`, um den Kontrollfluss zu unterbrechen und mehrere Rückgabewerte vorzeitig zurückzugeben.
+`do`-Ausdrücke unterstützen die Verwendung von `break`, um den Kontrollfluss zu unterbrechen und mehrere Rückgabewerte vorzeitig zurückzugeben.
 
 ```yuescript
 status, value = do
diff --git a/doc/yue-en.md b/doc/yue-en.md
index a82ae9a..2cac78a 100644
--- a/doc/yue-en.md
+++ b/doc/yue-en.md
@@ -15,6 +15,8 @@ do
 print var -- nil here
 ```
 
+YueScript's **do** can also be used an expression. Allowing you to combine multiple lines into one. The result of the do expression is the last statement in its body.
+
 ```yuescript
 counter = do
   i = 0
@@ -34,8 +36,6 @@ tbl = {
 }
 ```
 
-YueScript's **do** can also be used an expression . Allowing you to combine multiple lines into one. The result of the do expression is the last statement in its body.
-
 `do` expressions also support using `break` to interrupt control flow and return multiple values early:
 
 ```yuescript
diff --git a/doc/yue-id-id.md b/doc/yue-id-id.md
index d753e20..73bf1bb 100644
--- a/doc/yue-id-id.md
+++ b/doc/yue-id-id.md
@@ -15,6 +15,8 @@ do
 print var -- nil di sini
 ```
 
+`do` di YueScript juga bisa digunakan sebagai ekspresi, memungkinkan Anda menggabungkan beberapa baris menjadi satu. Hasil ekspresi `do` adalah pernyataan terakhir di badannya.
+
 ```yuescript
 counter = do
   i = 0
@@ -34,7 +36,7 @@ tbl = {
 }
 ```
 
-`do` di YueScript juga bisa digunakan sebagai ekspresi, memungkinkan Anda menggabungkan beberapa baris menjadi satu. Hasil ekspresi `do` adalah pernyataan terakhir di badannya. Ekspresi `do` mendukung penggunaan `break` untuk memutus alur eksekusi dan mengembalikan banyak nilai lebih awal.
+Ekspresi `do` mendukung penggunaan `break` untuk memutus alur eksekusi dan mengembalikan banyak nilai lebih awal.
 
 ```yuescript
 status, value = do
diff --git a/doc/yue-pt-br.md b/doc/yue-pt-br.md
index 334e5fc..d48c19b 100644
--- a/doc/yue-pt-br.md
+++ b/doc/yue-pt-br.md
@@ -15,6 +15,8 @@ do
 print var -- nil aqui
 ```
 
+O **do** do YueScript também pode ser usado como expressão. Permitindo combinar múltiplas linhas em uma. O resultado da expressão do é a última instrução em seu corpo.
+
 ```yuescript
 counter = do
   i = 0
@@ -34,7 +36,7 @@ tbl = {
 }
 ```
 
-O **do** do YueScript também pode ser usado como expressão. Permitindo combinar múltiplas linhas em uma. O resultado da expressão do é a última instrução em seu corpo. Expressões `do` suportam usar `break` para interromper o fluxo de execução e retornar múltiplos valores antecipadamente.
+Expressões `do` suportam usar `break` para interromper o fluxo de execução e retornar múltiplos valores antecipadamente.
 
 ```yuescript
 status, value = do
diff --git a/doc/yue-zh.md b/doc/yue-zh.md
index 4585f53..dfc5996 100644
--- a/doc/yue-zh.md
+++ b/doc/yue-zh.md
@@ -15,6 +15,8 @@ do
 print var -- 这里是nil
 ```
 
+&emsp;&emsp;月之脚本的 **do** 也可以用作表达式。允许你将多行代码的处理合并为一个表达式，并将 do 语句代码块的最后一个语句作为表达式返回的结果。
+
 ```yuescript
 counter = do
   i = 0
@@ -34,7 +36,7 @@ tbl = {
 }
 ```
 
-&emsp;&emsp;月之脚本的 **do** 也可以用作表达式。允许你将多行代码的处理合并为一个表达式，并将 do 语句代码块的最后一个语句作为表达式返回的结果。`do` 表达式支持通过 `break` 打断执行流并提前返回多个值。
+&emsp;&emsp;`do` 表达式支持通过 `break` 打断执行流并提前返回多个值。
 
 ```yuescript
 status, value = do
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 9f13098..5b8ca0d 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -78,7 +78,7 @@ static std::unordered_set<std::string> Metamethods = {
         "close"s // Lua 5.4
 };
 
-const std::string_view version = "0.33.4"sv;
+const std::string_view version = "0.33.5"sv;
 const std::string_view extension = "yue"sv;
 
 class CompileError : public std::logic_error {
@@ -10125,7 +10125,7 @@ private:
                         transformAssignment(assignment, tmp);
                 }
                 if (extend) {
-                        _buf << indent() << "setmetatable("sv << baseVar << ", "sv << parentVar << ".__base)"sv << nl(classDecl);
+                        _buf << indent() << globalVar("setmetatable"sv, classDecl, AccessType::Read) << '(' << baseVar << ", "sv << parentVar << ".__base)"sv << nl(classDecl);
                 }
                 _buf << indent() << classVar << " = "sv << globalVar("setmetatable"sv, classDecl, AccessType::Read) << "({"sv << nl(classDecl);
                 if (!builtinFields.empty()) {
@@ -10162,9 +10162,9 @@ private:
                 _buf << indent() << "}, {"sv << nl(classDecl);
                 if (extend) {
                         _buf << indent(1) << "__index = function(cls, name)"sv << nl(classDecl);
-                        _buf << indent(2) << "local val = rawget("sv << baseVar << ", name)"sv << nl(classDecl);
+                        _buf << indent(2) << "local val = "sv << globalVar("rawget", classDecl, AccessType::Read) << '(' << baseVar << ", name)"sv << nl(classDecl);
                         _buf << indent(2) << "if val == nil then"sv << nl(classDecl);
-                        _buf << indent(3) << "local parent = rawget(cls, \"__parent\")"sv << nl(classDecl);
+                        _buf << indent(3) << "local parent = "sv << globalVar("rawget", classDecl, AccessType::Read) << "(cls, \"__parent\")"sv << nl(classDecl);
                         _buf << indent(3) << "if parent then"sv << nl(classDecl);
                         _buf << indent(4) << "return parent[name]"sv << nl(classDecl);
                         _buf << indent(3) << "end"sv << nl(classDecl);
@@ -10179,7 +10179,7 @@ private:
                 pushScope();
                 auto selfVar = getUnusedName("_self_"sv);
                 addToScope(selfVar);
-                _buf << indent(1) << "local "sv << selfVar << " = setmetatable({ }, "sv << baseVar << ")"sv << nl(classDecl);
+                _buf << indent(1) << "local "sv << selfVar << " = "sv << globalVar("setmetatable", classDecl, AccessType::Read) << "({ }, "sv << baseVar << ")"sv << nl(classDecl);
                 _buf << indent(1) << "cls.__init("sv << selfVar << ", ...)"sv << nl(classDecl);
                 _buf << indent(1) << "return "sv << selfVar << nl(classDecl);
                 popScope();