98 files changed, 13505 insertions, 2172 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 6dede90..ddfcd2f 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -22,7 +22,7 @@ jobs:
          sudo luarocks make
          make test
      - name: luarocks upload
-        if: startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip Upload]')
        run: |
          ./yue -e spec/inputs/luarocks_upload.yue ${{ secrets.LUAROCKS_KEY }}
      - name: build for luajit
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2327710..04d08b0 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -24,6 +24,7 @@ jobs:
          bin\windows\Win32\Debug\yue.exe spec\inputs\loops.yue -o spec\generated\5.1\loops.lua --target=5.1
          bin\windows\Win32\Debug\yue.exe spec\inputs\try_catch.yue -o spec\generated\5.1\try_catch.lua --target=5.1
          bin\windows\Win32\Debug\yue.exe spec\inputs\attrib.yue -o spec\generated\5.1\attrib.lua --target=5.1
+          bin\windows\Win32\Debug\yue.exe spec\inputs\import_global.yue -o spec\generated\5.1\import_global.lua --target=5.1
          bin\windows\Win32\Debug\yue.exe spec\inputs\test\loops_spec.yue -o spec\generated\5.1\test\loops_spec.lua --target=5.1
          bin\windows\Win32\Debug\yue.exe -e spec/inputs/compile_doc.yue spec/generated
          bin\windows\Win32\Debug\yue.exe -e "io.popen('git diff --no-index spec\\outputs spec\\generated')\read('*a') |> ((r)-> r ~= '' and (print(r) or os.exit 1))"
@@ -33,6 +34,7 @@ jobs:
          bin\windows\x64\Debug\yue.exe spec\inputs\loops.yue -o spec\generated\5.1\loops.lua --target=5.1
          bin\windows\x64\Debug\yue.exe spec\inputs\try_catch.yue -o spec\generated\5.1\try_catch.lua --target=5.1
          bin\windows\x64\Debug\yue.exe spec\inputs\attrib.yue -o spec\generated\5.1\attrib.lua --target=5.1
+          bin\windows\x64\Debug\yue.exe spec\inputs\import_global.yue -o spec\generated\5.1\import_global.lua --target=5.1
          bin\windows\x64\Debug\yue.exe spec\inputs\test\loops_spec.yue -o spec\generated\5.1\test\loops_spec.lua --target=5.1
          bin\windows\x64\Debug\yue.exe -e spec/inputs/compile_doc.yue spec/generated
          bin\windows\x64\Debug\yue.exe -e "io.popen('git diff --no-index spec\\outputs spec\\generated')\read('*a') |> ((r)-> r ~= '' and (print(r) or os.exit 1))"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 613019e..5c03f23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,19 +44,33 @@ if (LUA_LIBRARIES MATCHES "LUA_LIBRARIES-NOTFOUND")
        endif()
 else ()
        message(STATUS "Lua: using information from luarocks")
-endif() 
+endif()
 message(STATUS "Lua: " ${LUA})
 message(STATUS "Lua include: " ${LUA_INCLUDE_DIR})
 message(STATUS "Lua library: ${LUA_LIBRARIES}")
-enable_language(CXX)
+enable_language(C CXX)
 include_directories(src src/3rdParty ${LUA_INCLUDE_DIR})
-add_definitions(-std=c++17 -O3 -fPIC)
+add_definitions(-std=c++17 -O3 -fPIC -DYUE_UTF8_IMPL)
-if (APPLE)
+# Detect Android Termux environment
-        add_compile_options(-Wno-deprecated-declarations)
+# Termux typically has ANDROID_ROOT environment variable set and PREFIX points to Termux directory
-endif ()
+set(IS_TERMUX FALSE)
+if (DEFINED ENV{ANDROID_ROOT})
+        # Check if PREFIX environment variable points to Termux directory
+        if (DEFINED ENV{PREFIX})
+                if ("$ENV{PREFIX}" MATCHES "com.termux")
+                        set(IS_TERMUX TRUE)
+                        message(STATUS "Detected Android Termux environment (via PREFIX: $ENV{PREFIX})")
+                endif()
+        endif()
+        # Alternative check: verify if Termux installation path exists
+        if (NOT IS_TERMUX AND EXISTS "/data/data/com.termux/files/usr")
+                set(IS_TERMUX TRUE)
+                message(STATUS "Detected Android Termux environment (via filesystem check)")
+        endif()
+endif()
 add_library(libyue MODULE
        src/yuescript/ast.cpp
@@ -70,6 +84,11 @@ set_target_properties(libyue PROPERTIES PREFIX "")
 set_target_properties(libyue PROPERTIES OUTPUT_NAME "yue")
 target_link_libraries(libyue ${LUA_LIBRARIES})
+# Add YUE_NO_WATCHER macro for Termux environment
+if (IS_TERMUX)
+        target_compile_definitions(libyue PRIVATE YUE_NO_WATCHER)
+endif()
 add_executable(yue
        src/yuescript/ast.cpp
        src/yuescript/parser.cpp
@@ -78,80 +97,92 @@ add_executable(yue
        src/yuescript/yue_compiler.cpp
        src/yuescript/yuescript.cpp
        src/yue.cpp
+        src/3rdParty/colib/ljson.c
 )
-target_sources(yue PRIVATE
+# Add efsw sources only if not in Termux environment
-        src/3rdParty/efsw/Debug.cpp
+if (NOT IS_TERMUX)
-        src/3rdParty/efsw/DirectorySnapshot.cpp
-        src/3rdParty/efsw/DirectorySnapshotDiff.cpp
-        src/3rdParty/efsw/DirWatcherGeneric.cpp
-        src/3rdParty/efsw/FileInfo.cpp
-        src/3rdParty/efsw/FileSystem.cpp
-        src/3rdParty/efsw/FileWatcher.cpp
-        src/3rdParty/efsw/FileWatcherCWrapper.cpp
-        src/3rdParty/efsw/FileWatcherGeneric.cpp
-        src/3rdParty/efsw/FileWatcherImpl.cpp
-        src/3rdParty/efsw/Log.cpp
-        src/3rdParty/efsw/Mutex.cpp
-        src/3rdParty/efsw/String.cpp
-        src/3rdParty/efsw/System.cpp
-        src/3rdParty/efsw/Thread.cpp
-        src/3rdParty/efsw/Watcher.cpp
-        src/3rdParty/efsw/WatcherGeneric.cpp
-)
-if (WIN32)
-        target_sources(yue PRIVATE
-                src/3rdParty/efsw/platform/win/FileSystemImpl.cpp
-                src/3rdParty/efsw/platform/win/MutexImpl.cpp
-                src/3rdParty/efsw/platform/win/SystemImpl.cpp
-                src/3rdParty/efsw/platform/win/ThreadImpl.cpp
-        )
-else ()
-        target_sources(yue PRIVATE
-                src/3rdParty/efsw/platform/posix/FileSystemImpl.cpp
-                src/3rdParty/efsw/platform/posix/MutexImpl.cpp
-                src/3rdParty/efsw/platform/posix/SystemImpl.cpp
-                src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
-        )
-endif()
-if (APPLE)
        target_sources(yue PRIVATE
-                src/3rdParty/efsw/FileWatcherFSEvents.cpp
+                src/3rdParty/efsw/Debug.cpp
-                src/3rdParty/efsw/FileWatcherKqueue.cpp
+                src/3rdParty/efsw/DirectorySnapshot.cpp
-                src/3rdParty/efsw/WatcherFSEvents.cpp
+                src/3rdParty/efsw/DirectorySnapshotDiff.cpp
-                src/3rdParty/efsw/WatcherKqueue.cpp
+                src/3rdParty/efsw/DirWatcherGeneric.cpp
+                src/3rdParty/efsw/FileInfo.cpp
+                src/3rdParty/efsw/FileSystem.cpp
+                src/3rdParty/efsw/FileWatcher.cpp
+                src/3rdParty/efsw/FileWatcherCWrapper.cpp
+                src/3rdParty/efsw/FileWatcherGeneric.cpp
+                src/3rdParty/efsw/FileWatcherImpl.cpp
+                src/3rdParty/efsw/Log.cpp
+                src/3rdParty/efsw/Mutex.cpp
+                src/3rdParty/efsw/String.cpp
+                src/3rdParty/efsw/System.cpp
+                src/3rdParty/efsw/Thread.cpp
+                src/3rdParty/efsw/Watcher.cpp
+                src/3rdParty/efsw/WatcherGeneric.cpp
        )
-        if (NOT CMAKE_SYSTEM_VERSION GREATER 9)
+        if (WIN32)
-                target_compile_definitions(yue PRIVATE EFSW_FSEVENTS_NOT_SUPPORTED)
+                target_sources(yue PRIVATE
+                        src/3rdParty/efsw/platform/win/FileSystemImpl.cpp
+                        src/3rdParty/efsw/platform/win/MutexImpl.cpp
+                        src/3rdParty/efsw/platform/win/SystemImpl.cpp
+                        src/3rdParty/efsw/platform/win/ThreadImpl.cpp
+                )
+        else ()
+                target_sources(yue PRIVATE
+                        src/3rdParty/efsw/platform/posix/FileSystemImpl.cpp
+                        src/3rdParty/efsw/platform/posix/MutexImpl.cpp
+                        src/3rdParty/efsw/platform/posix/SystemImpl.cpp
+                        src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
+                )
        endif()
-elseif (WIN32)
-        target_sources(yue PRIVATE
-                src/3rdParty/efsw/FileWatcherWin32.cpp
-                src/3rdParty/efsw/WatcherWin32.cpp
-        )
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-        target_sources(yue PRIVATE
-                src/3rdParty/efsw/FileWatcherInotify.cpp
-                src/3rdParty/efsw/WatcherInotify.cpp
-        )
-        if (NOT EXISTS "/usr/include/sys/inotify.h" AND NOT EXISTS "/usr/local/include/sys/inotify.h")
+        if (APPLE)
-                target_compile_definitions(yue PRIVATE EFSW_INOTIFY_NOSYS)
+                target_sources(yue PRIVATE
+                        src/3rdParty/efsw/FileWatcherFSEvents.cpp
+                        src/3rdParty/efsw/FileWatcherKqueue.cpp
+                        src/3rdParty/efsw/WatcherFSEvents.cpp
+                        src/3rdParty/efsw/WatcherKqueue.cpp
+                )
+                if (NOT CMAKE_SYSTEM_VERSION GREATER 9)
+                        target_compile_definitions(yue PRIVATE EFSW_FSEVENTS_NOT_SUPPORTED)
+                endif()
+        elseif (WIN32)
+                target_sources(yue PRIVATE
+                        src/3rdParty/efsw/FileWatcherWin32.cpp
+                        src/3rdParty/efsw/WatcherWin32.cpp
+                )
+        elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+                target_sources(yue PRIVATE
+                        src/3rdParty/efsw/FileWatcherInotify.cpp
+                        src/3rdParty/efsw/WatcherInotify.cpp
+                )
+                if (NOT EXISTS "/usr/include/sys/inotify.h" AND NOT EXISTS "/usr/local/include/sys/inotify.h")
+                        target_compile_definitions(yue PRIVATE EFSW_INOTIFY_NOSYS)
+                endif()
+        elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+                target_sources(yue PRIVATE
+                        src/3rdParty/efsw/FileWatcherKqueue.cpp
+                        src/3rdParty/efsw/WatcherKqueue.cpp
+                )
        endif()
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+else()
-        target_sources(yue PRIVATE
+        message(STATUS "Termux environment detected: excluding efsw file watcher sources")
-                src/3rdParty/efsw/FileWatcherKqueue.cpp
-                src/3rdParty/efsw/WatcherKqueue.cpp
-        )
 endif()
 if (MSVC)
        target_compile_definitions(yue PRIVATE _SCL_SECURE_NO_WARNINGS)
 else ()
        target_compile_options(yue PRIVATE -Wall -Wno-long-long -fPIC)
+        set_source_files_properties(src/3rdParty/colib/ljson.c PROPERTIES COMPILE_FLAGS "-std=c99")
+endif()
+# Add YUE_NO_WATCHER macro for Termux environment
+if (IS_TERMUX)
+        target_compile_definitions(yue PRIVATE YUE_NO_WATCHER)
 endif()
 if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
@@ -169,10 +200,9 @@ elseif (NOT (${CMAKE_SYSTEM_NAME} MATCHES "Haiku") AND NOT WIN32)
 else ()
        target_link_libraries(yue PRIVATE ${LUA_LIBRARIES})
 endif()
-        
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        target_link_options(yue PRIVATE -lstdc++fs -ldl)
+        target_link_options(yue PRIVATE -ldl)
 endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 install(CODE "")
diff --git a/LICENSE b/LICENSE
index ca28207..aebc6e7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/doc/docs/.vuepress/components/YueCompiler.vue b/doc/docs/.vuepress/components/YueCompiler.vue
index 6b6042c..3a22d1c 100755
--- a/doc/docs/.vuepress/components/YueCompiler.vue
+++ b/doc/docs/.vuepress/components/YueCompiler.vue
@@ -1,21 +1,21 @@
 <template>
                <div style="width: 100%; height: auto;">
                        <div class="parent" style="background-color: #f5f7ff;">
-                                <div class="childL" style="height: 2.5em;">
+                                <div class="editor-section">
                                        <div class="childTitle">YueScript {{ info }}</div>
+                                        <div class="editor-container" ref='yueEditor'>
+                                                <ClientOnly>
+                                                        <prism-editor class="my-editor" v-model="code" :highlight="highlighterYue" @input="codeChanged($event)" line-numbers :readonly="readonly"></prism-editor>
+                                                </ClientOnly>
+                                        </div>
                                </div>
-                                <div class="childR" style="height: 2.5em;">
+                                <div class="editor-section">
                                        <div class="childTitle">Lua</div>
-                                </div>
+                                        <div class="editor-container">
-                                <div class="childL" ref='yueEditor' style="height: 30em;">
+                                                <ClientOnly>
-                                        <ClientOnly>
+                                                        <prism-editor class="my-editor" v-model="compiled" :highlight="highlighterLua" @input="codeChanged($event)" :line-numbers="isMobileLayout" readonly></prism-editor>
-                                                <prism-editor class="my-editor" v-model="code" :highlight="highlighterYue" @input="codeChanged($event)" line-numbers :readonly="readonly"></prism-editor>
+                                                </ClientOnly>
-                                        </ClientOnly>
+                                        </div>
-                                </div>
-                                <div class="childR" style="height: 30em;">
-                                        <ClientOnly>
-                                                <prism-editor class="my-editor" v-model="compiled" :highlight="highlighterLua" @input="codeChanged($event)" readonly></prism-editor>
-                                        </ClientOnly>
                                </div>
                        </div>
                        <div v-if="!compileronly">
@@ -57,9 +57,18 @@
                                code: '',
                                compiled: '',
                                result: '',
+                                windowWidth: 0,
                        };
                },
+                computed: {
+                        isMobileLayout() {
+                                return this.windowWidth <= 768;
+                        },
+                },
                mounted () {
+                        this.windowWidth = window.innerWidth;
+                        window.addEventListener('resize', this.handleResize);
                        if (this.text !== '') {
                                this.$data.code = this.text;
                                this.codeChanged(this.text);
@@ -86,7 +95,13 @@
                        })(this);
                        check();
                },
+                beforeDestroy() {
+                        window.removeEventListener('resize', this.handleResize);
+                },
                methods: {
+                        handleResize() {
+                                this.windowWidth = window.innerWidth;
+                        },
                        runCode() {
                                if (window.yue && this.$data.compiled !== '') {
                                        let res = '';
@@ -136,27 +151,35 @@
                resize: none;
                margin-top: 5px;
        }
-        .childL {
-                float: left;
+        .parent {
-                width: 50%;
+                display: flex;
-                box-sizing: border-box;
+                flex-wrap: wrap;
-                background-clip: content-box;
+                width: 100%;
-                background: #f5f7ff;
        }
-        .childR {
-                float: left;
+        .editor-section {
                width: 50%;
                box-sizing: border-box;
-                background-clip: content-box;
                background: #f5f7ff;
        }
+        .editor-container {
+                height: 55vh;
+        }
        .childTitle {
                width: 100%;
                font-size: 1.2em;
                color: #b7ae8f;
                text-align: center;
                padding: 0.2em;
+                height: 2.5em;
+                display: flex;
+                align-items: center;
+                justify-content: center;
        }
        .button {
                float: right;
                border: none;
@@ -173,9 +196,11 @@
                margin-top: 10px;
                margin-right: 5px;
        }
        .button:hover {
                background-color: #beb69a;
        }
        .button:focus,
        .button:active:focus,
        .button.active:focus,
@@ -207,5 +232,19 @@
        .my-editor >>> .prism-editor__textarea:focus {
                outline: none;
        }
-</style>
+        /* 移动端响应式布局 */
+        @media screen and (max-width: 768px) {
+                .parent {
+                        flex-direction: column;
+                }
+                .editor-section {
+                        width: 100%;
+                }
+                .editor-container {
+                        height: 30vh;
+                }
+        }
+</style>
diff --git a/doc/docs/README.md b/doc/docs/README.md
index 21e47c4..098d7da 100755
--- a/doc/docs/README.md
+++ b/doc/docs/README.md
@@ -3,6 +3,6 @@ home: true
 heroImage: ./image/yuescript.svg
 actionText: Quick Start →
 actionLink: /doc/
-footer: MIT Licensed | Copyright © 2017-2025 Li Jin
+footer: MIT Licensed | Copyright © 2017-2026 Li Jin
 ---
diff --git a/doc/docs/doc/README.md b/doc/docs/doc/README.md
index c4518bf..b5051d4 100755
--- a/doc/docs/doc/README.md
+++ b/doc/docs/doc/README.md
@@ -16,19 +16,29 @@ Yue (月) is the name of moon in Chinese and it's pronounced as [jyɛ].
 ### An Overview of YueScript
 ```moonscript
 -- import syntax
-import "yue" as :p, :to_lua
+import p, to_lua from "yue"
 -- object literals
 inventory =
  equipment:
-    * "sword"
+    - "sword"
-    * "shield"
+    - "shield"
  items:
-    * name: "potion"
+    - name: "potion"
      count: 10
-    * name: "bread"
+    - name: "bread"
      count: 3
+-- list comprehension
+map = (arr, action) ->
+  [action item for item in *arr]
+filter = (arr, cond) ->
+  [item for item in *arr when cond item]
+reduce = (arr, init, action): init ->
+  init = action init, item for item in *arr
 -- pipe operator
 [1, 2, 3]
  |> map (x) -> x * 2
@@ -51,19 +61,29 @@ export 🌛 = "月之脚本"
 <YueDisplay>
 <pre>
 -- import syntax
-import "yue" as :p, :to_lua
+import p, to_lua from "yue"
 -- object literals
 inventory =
  equipment:
-    * "sword"
+    - "sword"
-    * "shield"
+    - "shield"
  items:
-    * name: "potion"
+    - name: "potion"
      count: 10
-    * name: "bread"
+    - name: "bread"
      count: 3
+-- list comprehension
+map = (arr, action) ->
+  [action item for item in *arr]
+filter = (arr, cond) ->
+  [item for item in *arr when cond item]
+reduce = (arr, init, action): init ->
+  init = action init, item for item in *arr
 -- pipe operator
 [1, 2, 3]
  |> map (x) -> x * 2
@@ -132,14 +152,14 @@ export 🌛 = "月之脚本"
 &emsp;Use YueScript module in Lua:
-* **Case 1**  
+* **Case 1**
 Require "your_yuescript_entry.yue" in Lua.
 ```Lua
 require("yue")("your_yuescript_entry")
 ```
 &emsp;And this code still works when you compile "your_yuescript_entry.yue"  to "your_yuescript_entry.lua" in the same path. In the rest YueScript files just use the normal **require** or **import**. The code line numbers in error messages will also be handled correctly.
-* **Case 2**  
+* **Case 2**
 Require YueScript module and rewite message by hand.
 ```lua
 local yue = require("yue")
@@ -151,7 +171,7 @@ end, function(err)
 end)
 ```
-* **Case 3**  
+* **Case 3**
 Use the YueScript compiler function in Lua.
 ```lua
 local yue = require("yue")
@@ -203,12 +223,12 @@ Usage: yue [options|files|directories] ...
   Execute without options to enter REPL, type symbol '$'
   in a single line to start/stop multi-line mode
 ```
-&emsp;&emsp;Use cases:  
+&emsp;&emsp;Use cases:
-&emsp;&emsp;Recursively compile every YueScript file with extension **.yue** under current path:  **yue .**  
+&emsp;&emsp;Recursively compile every YueScript file with extension **.yue** under current path:  **yue .**
-&emsp;&emsp;Compile and save results to a target path:  **yue -t /target/path/ .**  
+&emsp;&emsp;Compile and save results to a target path:  **yue -t /target/path/ .**
-&emsp;&emsp;Compile and reserve debug info:  **yue -l .**  
+&emsp;&emsp;Compile and reserve debug info:  **yue -l .**
-&emsp;&emsp;Compile and generate minified codes:  **yue -m .**  
+&emsp;&emsp;Compile and generate minified codes:  **yue -m .**
-&emsp;&emsp;Execute raw codes:  **yue -e 'print 123'**  
+&emsp;&emsp;Execute raw codes:  **yue -e 'print 123'**
 &emsp;&emsp;Execute a YueScript file:  **yue -e main.yue**
 ## Macro
@@ -388,16 +408,16 @@ In YueScript, macro functions allow you to generate code at compile time. By nes
 ```moonscript
 macro Enum = (...) ->
-        items = {...}
+  items = {...}
-        itemSet = {item, true for item in *items}
+  itemSet = {item, true for item in *items}
-        (item) ->
+  (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+    "\"#{item}\""
 macro BodyType = $Enum(
-        Static
+  Static
-        Dynamic
+  Dynamic
-        Kinematic
+  Kinematic
 )
 print "Valid enum type:", $BodyType Static
@@ -407,16 +427,16 @@ print "Valid enum type:", $BodyType Static
 <YueDisplay>
 <pre>
 macro Enum = (...) ->
-        items = {...}
+  items = {...}
-        itemSet = {item, true for item in *items}
+  itemSet = {item, true for item in *items}
-        (item) ->
+  (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+    "\"#{item}\""
 macro BodyType = $Enum(
-        Static
+  Static
-        Dynamic
+  Dynamic
-        Kinematic
+  Kinematic
 )
 print "Valid enum type:", $BodyType Static
@@ -424,6 +444,54 @@ print "Valid enum type:", $BodyType Static
 </pre>
 </YueDisplay>
+### Argument Validation
+You can declare the expected AST node types in the argument list, and check whether the incoming macro arguments meet the expectations at compile time.
+```moonscript
+macro printNumAndStr = (num `Num, str `String) -> |
+  print(
+    #{num}
+    #{str}
+  )
+$printNumAndStr 123, "hello"
+```
+<YueDisplay>
+<pre>
+macro printNumAndStr = (num `Num, str `String) -> |
+  print(
+    #{num}
+    #{str}
+  )
+$printNumAndStr 123, "hello"
+</pre>
+</YueDisplay>
+If you need more flexible argument checking, you can use the built-in `$is_ast` macro function to manually check at the appropriate place.
+```moonscript
+macro printNumAndStr = (num, str) ->
+  error "expected Num as first argument" unless $is_ast Num, num
+  error "expected String as second argument" unless $is_ast String, str
+  "print(#{num}, #{str})"
+$printNumAndStr 123, "hello"
+```
+<YueDisplay>
+<pre>
+macro printNumAndStr = (num, str) ->
+  error "expected Num as first argument" unless $is_ast Num, num
+  error "expected String as second argument" unless $is_ast String, str
+  "print(#{num}, #{str})"
+$printNumAndStr 123, "hello"
+</pre>
+</YueDisplay>
+For more details about available AST nodes, please refer to the uppercased definitions in [yue_parser.cpp](https://github.com/IppClub/YueScript/blob/main/src/yuescript/yue_parser.cpp).
 ## Operator
 All of Lua's binary and unary operators are available. Additionally **!=** is as an alias for **~=**, and either **\\** or **::** can be used to write a chaining function call like `tb\func!` or `tb::func!`. And Yuescipt offers some other special operators to write more expressive codes.
@@ -466,47 +534,47 @@ Note the evaluation behavior of chained comparisons:
 ```moonscript
 v = (x) ->
-        print x
+  print x
-        x
+  x
 print v(1) < v(2) <= v(3)
 --[[
-        output:
+  output:
-        2
+  2
-        1
+  1
-        3
+  3
-        true
+  true
 ]]
 print v(1) > v(2) <= v(3)
 --[[
-        output:
+  output:
-        2
+  2
-        1
+  1
-        false
+  false
 ]]
 ```
 <YueDisplay>
 <pre>
 v = (x) ->
-        print x
+  print x
-        x
+  x
 print v(1) < v(2) <= v(3)
 --[[
-        output:
+  output:
-        2
+  2
-        1
+  1
-        3
+  3
-        true
+  true
 ]]
 print v(1) > v(2) <= v(3)
 --[[
-        output:
+  output:
-        2
+  2
-        1
+  1
-        false
+  false
 ]]
 </pre>
 </YueDisplay>
@@ -527,19 +595,36 @@ tab[] = "Value"
 </pre>
 </YueDisplay>
+You can also use the spread operator `...` to append all elements from one list to another:
+```moonscript
+tbA = [1, 2, 3]
+tbB = [4, 5, 6]
+tbA[] = ...tbB
+-- tbA is now [1, 2, 3, 4, 5, 6]
+```
+<YueDisplay>
+<pre>
+tbA = [1, 2, 3]
+tbB = [4, 5, 6]
+tbA[] = ...tbB
+-- tbA is now [1, 2, 3, 4, 5, 6]
+</pre>
+</YueDisplay>
 ### Table Spreading
 You can concatenate array tables or hash tables using spread operator `...` before expressions in table literals.
 ```moonscript
 parts =
-        * "shoulders"
+  * "shoulders"
-        * "knees"
+  * "knees"
 lyrics =
-        * "head"
+  * "head"
-        * ...parts
+  * ...parts
-        * "and"
+  * "and"
-        * "toes"
+  * "toes"
 copy = {...other}
@@ -550,13 +635,13 @@ merge = {...a, ...b}
 <YueDisplay>
 <pre>
 parts =
-        * "shoulders"
+  * "shoulders"
-        * "knees"
+  * "knees"
 lyrics =
-        * "head"
+  * "head"
-        * ...parts
+  * ...parts
-        * "and"
+  * "and"
-        * "toes"
+  * "toes"
 copy = {...other}
@@ -566,11 +651,28 @@ merge = {...a, ...b}
 </pre>
 </YueDisplay>
+### Table Reversed Indexing
+You can use the **#** operator to get the last elements of a table.
+```moonscript
+last = data.items[#]
+second_last = data.items[#-1]
+data.items[#] = 1
+```
+<YueDisplay>
+<pre>
+last = data.items[#]
+second_last = data.items[#-1]
+data.items[#] = 1
+</pre>
+</YueDisplay>
 ### Metatable
 The **<>** operator can be used as a shortcut for metatable manipulation.
-* **Metatable Creation**  
+* **Metatable Creation**
 Create normal table with empty bracekets **<>** or metamethod key which is surrounded by **<>**.
 ```moonscript
@@ -606,7 +708,7 @@ close _ = &lt;close&gt;: -> print "out of scope"
 </pre>
 </YueDisplay>
-* **Metatable Accessing**  
+* **Metatable Accessing**
 Accessing metatable with **<>** or metamethod name surrounded by **<>** or writing some expression in **<>**.
 ```moonscript
@@ -630,7 +732,7 @@ print tb.item
 </pre>
 </YueDisplay>
-* **Metatable Destructure**  
+* **Metatable Destructure**
 Destruct metatable with metamethod key surrounded by **<>**.
 ```moonscript
@@ -732,34 +834,45 @@ a ??= false
 ### Implicit Object
-You can write a list of implicit structures that starts with the symbol **\*** inside a table block. If you are creating implicit object, the fields of the object must be with the same indent.
+You can write a list of implicit structures that starts with the symbol **\*** or **-** inside a table block. If you are creating implicit object, the fields of the object must be with the same indent.
 ```moonscript
+-- assignment with implicit object
 list =
  * 1
  * 2
  * 3
+-- function call with implicit object
 func
  * 1
  * 2
  * 3
+-- return with implicit object
+f = ->
+  return
+    * 1
+    * 2
+    * 3
+-- table with implicit object
 tb =
  name: "abc"
  values:
-    * "a"
+    - "a"
-    * "b"
+    - "b"
-    * "c"
+    - "c"
  objects:
-    * name: "a"
+    - name: "a"
      value: 1
      func: => @value + 1
      tb:
        fieldA: 1
-    * name: "b"
+    - name: "b"
      value: 2
      func: => @value + 2
      tb: { }
@@ -767,32 +880,42 @@ tb =
 ```
 <YueDisplay>
 <pre>
+-- assignment with implicit object
 list =
  * 1
  * 2
  * 3
+-- function call with implicit object
 func
  * 1
  * 2
  * 3
+-- return with implicit object
+f = ->
+  return
+    * 1
+    * 2
+    * 3
+-- table with implicit object
 tb =
  name: "abc"
  values:
-    * "a"
+    - "a"
-    * "b"
+    - "b"
-    * "c"
+    - "c"
  objects:
-    * name: "a"
+    - name: "a"
      value: 1
      func: => @value + 1
      tb:
        fieldA: 1
-    * name: "b"
+    - name: "b"
      value: 2
      func: => @value + 2
      tb: { }
@@ -856,11 +979,67 @@ do
 </pre>
 </YueDisplay>
+### Import Global
+You can import specific globals into local variables with `import`. When importing a chain of global variable accessings, the last field will be assigned to the local variable.
+```moonscript
+do
+  import tostring
+  import table.concat
+  print concat ["a", tostring 1]
+```
+<YueDisplay>
+<pre>
+do
+  import tostring
+  import table.concat
+  print concat ["a", tostring 1]
+</pre>
+</YueDisplay>
+#### Automatic Import
+You can place `import global` at the top of a block to automatically import all names that have not been explicitly declared or assigned in the current scope as globals. These implicit imports are treated as local consts that reference the corresponding globals at the position of the statement.
+Names that are explicitly declared as globals in the same scope will not be imported, so you can still assign to them.
+```moonscript
+do
+  import global
+  print "hello"
+  math.random 3
+  -- print = nil -- error: imported globals are const
+do
+  -- explicit global variable will not be imported
+  import global
+  global FLAG
+  print FLAG
+  FLAG = 123
+```
+<YueDisplay>
+<pre>
+do
+  import global
+  print "hello"
+  math.random 3
+  -- print = nil -- error: imported globals are const
+do
+  -- explicit global variable will not be imported
+  import global
+  global FLAG
+  print FLAG
+  FLAG = 123
+</pre>
+</YueDisplay>
 ### Export
 The export statement offers a concise way to define modules.
-* **Named Export**  
+* **Named Export**
 Named export will define a local variable as well as adding a field in the exported table.
 ```moonscript
@@ -924,7 +1103,7 @@ export["a-b-c"] = 123
 </pre>
 </YueDisplay>
-* **Unnamed Export**  
+* **Unnamed Export**
 Unnamed export will add the target item into the array part of the exported table.
 ```moonscript
@@ -954,7 +1133,7 @@ export with tmp
 </pre>
 </YueDisplay>
-* **Default Export**  
+* **Default Export**
 Using the **default** keyword in export statement to replace the exported table with any thing.
 ```moonscript
@@ -1202,7 +1381,7 @@ If the destructuring statement is complicated, feel free to spread it out over a
 </pre>
 </YueDisplay>
-It’s common to extract values from at table and assign them the local variables that have the same name as the key. In order to avoid repetition we can use the **:** prefix operator:
+It's common to extract values from at table and assign them the local variables that have the same name as the key. In order to avoid repetition we can use the **:** prefix operator:
 ```moonscript
 {:concat, :insert} = table
@@ -1246,6 +1425,52 @@ You can use `_` as placeholder when doing a list destructuring:
 </pre>
 </YueDisplay>
+### Range Destructuring
+You can use the spread operator `...` in list destructuring to capture a range of values. This is useful when you want to extract specific elements from the beginning and end of a list while collecting the rest in between.
+```moonscript
+orders = ["first", "second", "third", "fourth", "last"]
+[first, ...bulk, last] = orders
+print first  -- prints: first
+print bulk   -- prints: {"second", "third", "fourth"}
+print last   -- prints: last
+```
+<YueDisplay>
+<pre>
+orders = ["first", "second", "third", "fourth", "last"]
+[first, ...bulk, last] = orders
+print first  -- prints: first
+print bulk   -- prints: {"second", "third", "fourth"}
+print last   -- prints: last
+</pre>
+</YueDisplay>
+The spread operator can be used in different positions to capture different ranges, and you can use `_` as a placeholder for the values you don't want to capture:
+```moonscript
+-- Capture everything after first element
+[first, ...rest] = orders
+-- Capture everything before last element
+[...start, last] = orders
+-- Capture things except the middle elements
+[first, ..._, last] = orders
+```
+<YueDisplay>
+<pre>
+-- Capture everything after first element
+[first, ...rest] = orders
+-- Capture everything before last element
+[...start, last] = orders
+-- Capture things except the middle elements
+[first, ..._, last] = orders
+</pre>
+</YueDisplay>
 ### Destructuring In Other Places
 Destructuring can also show up in places where an assignment implicitly takes place. An example of this is a for loop:
@@ -1363,6 +1588,19 @@ print ok, count, first
 YueScript is a whitespace significant language. You have to write some code block in the same indent with space **' '** or tab **'\t'** like function body, value list and some control blocks. And expressions containing different whitespaces might mean different things. Tab is treated like 4 space, but it's better not mix the use of spaces and tabs.
+### Statement Separator
+A statement normally ends at a line break. You can also use a semicolon `;` to explicitly terminate a statement, which allows writing multiple statements on the same line:
+```moonscript
+a = 1; b = 2; print a + b
+```
+<YueDisplay>
+<pre>
+a = 1; b = 2; print a + b
+</pre>
+</YueDisplay>
 ### Multiline Chaining
 You can write multi-line chaining function calls with a same indent.
@@ -1475,6 +1713,47 @@ catch err
 </pre>
 </YueDisplay>
+### Try?
+`try?` is a simplified use for error handling syntax that omit the boolean status from the `try` statement, and it will return the result from the try block when success, return nil instead of error object otherwise.
+```moonscript
+a, b, c = try? func!
+-- with nil coalescing operator
+a = (try? func!) ?? "default"
+-- as function argument
+f try? func!
+-- with catch block
+f try?
+  print 123
+  func!
+catch e
+  print e
+  e
+```
+<YueDisplay>
+<pre>
+a, b, c = try? func!
+-- with nil coalescing operator
+a = (try? func!) ?? "default"
+-- as function argument
+f try? func!
+-- with catch block
+f try?
+  print 123
+  func!
+catch e
+  print e
+  e
+</pre>
+</YueDisplay>
 ## Attributes
 Syntax support for Lua 5.4 attributes. And you can still use both the `const` and `close` declaration and get constant check and scoped callback working when targeting Lua versions below 5.4.
@@ -1503,6 +1782,19 @@ const {:a, :b, c, d} = tb
 </pre>
 </YueDisplay>
+You can also declare a global variable to be `const`.
+```moonscript
+global const Constant = 123
+-- Constant = 1
+```
+<YueDisplay>
+<pre>
+global const Constant = 123
+-- Constant = 1
+</pre>
+</YueDisplay>
 ## Literals
 All of the primitive literals in Lua can be used. This applies to numbers, strings, booleans, and **nil**.
@@ -1535,12 +1827,73 @@ You can use underscores in a number literal to increase readability.
 ```moonscript
 integer = 1_000_000
 hex = 0xEF_BB_BF
+binary = 0B10011
 ```
 <YueDisplay>
 <pre>
 integer = 1_000_000
 hex = 0xEF_BB_BF
+binary = 0B10011
+</pre>
+</YueDisplay>
+### YAML Multiline String
+The `|` prefix introduces a YAML-style multiline string literal:
+```moonscript
+str = |
+  key: value
+  list:
+    - item1
+    - #{expr}
+```
+<YueDisplay>
+<pre>
+str = |
+  key: value
+  list:
+    - item1
+    - #{expr}
+</pre>
+</YueDisplay>
+This allows writing structured multiline text conveniently. All line breaks and indentation are preserved relative to the first non-empty line, and expressions inside `#{...}` are interpolated automatically as `tostring(expr)`.
+YAML Multiline String automatically detects the common leading whitespace prefix (minimum indentation across all non-empty lines) and removes it from all lines. This makes it easy to indent your code visually without affecting the resulting string content.
+```moonscript
+fn = ->
+  str = |
+    foo:
+      bar: baz
+  return str
+```
+<YueDisplay>
+<pre>
+fn = ->
+  str = |
+    foo:
+      bar: baz
+  return str
+</pre>
+</YueDisplay>
+Internal indentation is preserved relative to the removed common prefix, allowing clean nested structures.
+All special characters like quotes (`"`) and backslashes (`\`) in the YAMLMultiline block are automatically escaped so that the generated Lua string is syntactically valid and behaves as expected.
+```moonscript
+str = |
+  path: "C:\Program Files\App"
+  note: 'He said: "#{Hello}!"'
+```
+<YueDisplay>
+<pre>
+str = |
+  path: "C:\Program Files\App"
+  note: 'He said: "#{Hello}!"'
 </pre>
 </YueDisplay>
@@ -1861,6 +2214,138 @@ if func 1, 2, 3,
 </pre>
 </YueDisplay>
+### Parameter Destructuring
+YueScript now supports destructuring function parameters when the argument is an object. Two forms of destructuring table literals are available:
+* **Curly-brace wrapped literals/object parameters**, allowing optional default values when fields are missing (e.g., `{:a, :b}`, `{a: a1 = 123}`).
+* **Unwrapped simple table syntax**, starting with a sequence of key-value or shorthand bindings and continuing until another expression terminates it (e.g., `:a, b: b1, :c`). This form extracts multiple fields from the same object.
+```moonscript
+f1 = (:a, :b, :c) ->
+  print a, b, c
+f1 a: 1, b: "2", c: {}
+f2 = ({a: a1 = 123, :b = 'abc'}, c = {}) ->
+  print a1, b, c
+arg1 = {a: 0}
+f2 arg1, arg2
+```
+<YueDisplay>
+<pre>
+f1 = (:a, :b, :c) ->
+  print a, b, c
+f1 a: 1, b: "2", c: {}
+f2 = ({a: a1 = 123, :b = 'abc'}, c = {}) ->
+print a1, b, c
+arg1 = {a: 0}
+f2 arg1, arg2
+</pre>
+</YueDisplay>
+### Prefixed Return Expression
+When working with deeply nested function bodies, it can be tedious to maintain readability and consistency of the return value. To address this, YueScript introduces the **Prefixed Return Expression** syntax. Its form is as follows:
+```moon
+findFirstEven = (list): nil ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+```
+<YueDisplay>
+<pre>
+findFirstEven = (list): nil ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+</pre>
+</YueDisplay>
+This is equivalent to:
+```moon
+findFirstEven = (list) ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+  nil
+```
+<YueDisplay>
+<pre>
+findFirstEven = (list) ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+  nil
+</pre>
+</YueDisplay>
+The only difference is that you can move the final return expression before the `->` or `=>` token to indicate the function’s implicit return value as the last statement. This way, even in functions with multiple nested loops or conditional branches, you no longer need to write a trailing return expression at the end of the function body, making the logic structure more straightforward and easier to follow.
+### Named Varargs
+You can use the `(...t) ->` syntax to automatically store varargs into a named table. This table will contain all passed arguments (including `nil` values), and the `n` field of the table will store the actual number of arguments passed (including `nil` values).
+```moonscript
+f = (...t) ->
+  print "argument count:", t.n
+  print "table length:", #t
+  for i = 1, t.n
+    print t[i]
+f 1, 2, 3
+f "a", "b", "c", "d"
+f!
+-- Handling cases with nil values
+process = (...args) ->
+  sum = 0
+  for i = 1, args.n
+    if args[i] != nil and type(args[i]) == "number"
+      sum += args[i]
+  sum
+process 1, nil, 3, nil, 5
+```
+<YueDisplay>
+<pre>
+f = (...t) ->
+  print "argument count:", t.n
+  print "table length:", #t
+  for i = 1, t.n
+    print t[i]
+f 1, 2, 3
+f "a", "b", "c", "d"
+f!
+-- Handling cases with nil values
+process = (...args) ->
+  sum = 0
+  for i = 1, args.n
+    if args[i] != nil and type(args[i]) == "number"
+      sum += args[i]
+  sum
+process 1, nil, 3, nil, 5
+</pre>
+</YueDisplay>
 ## Backcalls
 Backcalls are used for unnesting callbacks. They are defined using arrows pointed to the left as the last parameter by default filling in a function call. All the syntax is mostly the same as regular arrow functions except that it is just pointing the other way and the function body does not require indent.
@@ -1902,22 +2387,22 @@ x * 2
 </pre>
 </YueDisplay>
-If you wish to have further code after your backcalls, you can set them aside with a do statement.
+If you wish to have further code after your backcalls, you can set them aside with a do statement. And the parentheses can be omitted with non-fat arrow functions.
 ```moonscript
 result, msg = do
-  (data) <- readAsync "filename.txt"
+  data <- readAsync "filename.txt"
  print data
-  (info) <- processAsync data
+  info <- processAsync data
  check info
 print result, msg
 ```
 <YueDisplay>
 <pre>
 result, msg = do
-  (data) <- readAsync "filename.txt"
+  data <- readAsync "filename.txt"
  print data
-  (info) <- processAsync data
+  info <- processAsync data
  check info
 print result, msg
 </pre>
@@ -2115,6 +2600,27 @@ doubled = [item * 2 for item in *items]
 </pre>
 </YueDisplay>
+In list comprehensions, you can also use the spread operator `...` to flatten nested lists, achieving a flat map effect:
+```moonscript
+data =
+  a: [1, 2, 3]
+  b: [4, 5, 6]
+flat = [...v for k,v in pairs data]
+-- flat is now [1, 2, 3, 4, 5, 6]
+```
+<YueDisplay>
+<pre>
+data =
+  a: [1, 2, 3]
+  b: [4, 5, 6]
+flat = [...v for k,v in pairs data]
+-- flat is now [1, 2, 3, 4, 5, 6]
+</pre>
+</YueDisplay>
 The for and when clauses can be chained as much as desired. The only requirement is that a comprehension has at least one for clause.
 Using multiple for clauses is the same as using nested loops:
@@ -2248,6 +2754,45 @@ slice = [item for item in *items[,,2]]
 </pre>
 </YueDisplay>
+Both the minimum and maximum bounds can be negative, which means that the bounds are counted from the end of the table.
+```moonscript
+-- take the last 4 items
+slice = [item for item in *items[-4,-1]]
+```
+<YueDisplay>
+<pre>
+-- take the last 4 items
+slice = [item for item in *items[-4,-1]]
+</pre>
+</YueDisplay>
+The step size can also be negative, which means that the items are taken in reverse order.
+```moonscript
+reverse_slice = [item for item in *items[-1,1,-1]]
+```
+<YueDisplay>
+<pre>
+reverse_slice = [item for item in *items[-1,1,-1]]
+</pre>
+</YueDisplay>
+#### Slicing Expression
+Slicing can also be used as an expression. This is useful for getting a sub-list of a table.
+```moonscript
+-- take the 2nd and 4th items as a new list
+sub_list = items[2, 4]
+```
+<YueDisplay>
+<pre>
+-- take the 2nd and 4th items as a new list
+sub_list = items[2, 4]
+</pre>
+</YueDisplay>
 ## For Loop
 There are two for loop forms, just like in Lua. A numeric one and a generic one:
@@ -2324,6 +2869,23 @@ doubled_evens = for i = 1, 20
 </pre>
 </YueDisplay>
+In addition, for loops support break with a return value, allowing the loop itself to be used as an expression that exits early with a meaningful result.
+For example, to find the first number greater than 10:
+```moonscript
+first_large = for n in *numbers
+  break n if n > 10
+```
+<YueDisplay>
+<pre>
+first_large = for n in *numbers
+  break n if n > 10
+</pre>
+</YueDisplay>
+This break-with-value syntax enables concise and expressive search or early-exit patterns directly within loop expressions.
 You can also filter values by combining the for loop expression with the continue statement.
 For loops at the end of a function body are not accumulated into a table for a return value (Instead the function will return nil). Either an explicit return statement can be used, or the loop can be converted into a list comprehension.
@@ -2345,7 +2907,7 @@ print func_b! -- prints table object
 </pre>
 </YueDisplay>
-This is done to avoid the needless creation of tables for functions that don’t need to return the results of the loop.
+This is done to avoid the needless creation of tables for functions that don't need to return the results of the loop.
 ## Repeat Loop
@@ -2624,28 +3186,26 @@ reader\parse_line! until reader\eof!
 ## Switch
-The switch statement is shorthand for writing a series of if statements that check against the same value. Note that the value is only evaluated once. Like if statements, switches can have an else block to handle no matches. Comparison is done with the == operator.
+The switch statement is shorthand for writing a series of if statements that check against the same value. Note that the value is only evaluated once. Like if statements, switches can have an else block to handle no matches. Comparison is done with the == operator. In switch statement, you can also use assignment expression to store temporary variable value.
 ```moonscript
-name = "Dan"
+switch name := "Dan"
-switch name
  when "Robert"
    print "You are Robert"
  when "Dan", "Daniel"
    print "Your name, it's Dan"
  else
-    print "I don't know about your name"
+    print "I don't know about you with name #{name}"
 ```
 <YueDisplay>
 <pre>
-name = "Dan"
+switch name := "Dan"
-switch name
  when "Robert"
    print "You are Robert"
  when "Dan", "Daniel"
    print "Your name, it's Dan"
  else
-    print "I don't know about your name"
+    print "I don't know about you with name #{name}"
 </pre>
 </YueDisplay>
@@ -2676,7 +3236,7 @@ next_number = switch b
 </pre>
 </YueDisplay>
-We can use the then keyword to write a switch’s when block on a single line. No extra keyword is needed to write the else block on a single line.
+We can use the then keyword to write a switch's when block on a single line. No extra keyword is needed to write the else block on a single line.
 ```moonscript
 msg = switch math.random(1, 5)
@@ -2722,7 +3282,7 @@ else
 </pre>
 </YueDisplay>
-It is worth noting the order of the case comparison expression. The case’s expression is on the left hand side. This can be useful if the case’s expression wants to overwrite how the comparison is done by defining an eq metamethod.
+It is worth noting the order of the case comparison expression. The case's expression is on the left hand side. This can be useful if the case's expression wants to overwrite how the comparison is done by defining an eq metamethod.
 ### Table Matching
@@ -2782,6 +3342,123 @@ switch item
 </pre>
 </YueDisplay>
+You can also match against array elements, table fields, and even nested structures with array or table literals.
+Match against array elements.
+```moonscript
+switch tb
+  when [1, 2, 3]
+    print "1, 2, 3"
+  when [1, b, 3]
+    print "1, #{b}, 3"
+  when [1, 2, b = 3] -- b has a default value
+    print "1, 2, #{b}"
+```
+<YueDisplay>
+<pre>
+switch tb
+  when [1, 2, 3]
+    print "1, 2, 3"
+  when [1, b, 3]
+    print "1, #{b}, 3"
+  when [1, 2, b = 3] -- b has a default value
+    print "1, 2, #{b}"
+</pre>
+</YueDisplay>
+Match against table fields with destructuring.
+```moonscript
+switch tb
+  when success: true, :result
+    print "success", result
+  when success: false
+    print "failed", result
+  else
+    print "invalid"
+```
+<YueDisplay>
+<pre>
+switch tb
+  when success: true, :result
+    print "success", result
+  when success: false
+    print "failed", result
+  else
+    print "invalid"
+</pre>
+</YueDisplay>
+Match against nested table structures.
+```moonscript
+switch tb
+  when data: {type: "success", :content}
+    print "success", content
+  when data: {type: "error", :content}
+    print "failed", content
+  else
+    print "invalid"
+```
+<YueDisplay>
+<pre>
+switch tb
+  when data: {type: "success", :content}
+    print "success", content
+  when data: {type: "error", :content}
+    print "failed", content
+  else
+    print "invalid"
+</pre>
+</YueDisplay>
+Match against array of tables.
+```moonscript
+switch tb
+  when [
+      {a: 1, b: 2}
+      {a: 3, b: 4}
+      {a: 5, b: 6}
+      fourth
+    ]
+    print "matched", fourth
+```
+<YueDisplay>
+<pre>
+switch tb
+  when [
+      {a: 1, b: 2}
+      {a: 3, b: 4}
+      {a: 5, b: 6}
+      fourth
+    ]
+    print "matched", fourth
+</pre>
+</YueDisplay>
+Match against a list and capture a range of elements.
+```moonscript
+segments = ["admin", "users", "logs", "view"]
+switch segments
+  when [...groups, resource, action]
+    print "Group:", groups -- prints: {"admin", "users"}
+    print "Resource:", resource -- prints: "logs"
+    print "Action:", action -- prints: "view"
+```
+<YueDisplay>
+<pre>
+segments = ["admin", "users", "logs", "view"]
+switch segments
+  when [...groups, resource, action]
+    print "Group:", groups -- prints: {"admin", "users"}
+    print "Resource:", resource -- prints: "logs"
+    print "Action:", action -- prints: "view"
+</pre>
+</YueDisplay>
 ## Object Oriented Programming
 In these examples, the generated Lua code may appear overwhelming. It is best to focus on the meaning of the YueScript code at first, then look into the Lua code if you wish to know the implementation details.
@@ -2913,7 +3590,7 @@ class BackPack extends Inventory
 Here we extend our Inventory class, and limit the amount of items it can carry.
-In this example, we don’t define a constructor on the subclass, so the parent class' constructor is called when we make a new instance. If we did define a constructor then we can use the super method to call the parent constructor.
+In this example, we don't define a constructor on the subclass, so the parent class' constructor is called when we make a new instance. If we did define a constructor then we can use the super method to call the parent constructor.
 Whenever a class inherits from another, it sends a message to the parent class by calling the method __inherited on the parent class if it exists. The function receives two arguments, the class that is being inherited and the child class.
@@ -3000,13 +3677,13 @@ print BackPack.size -- prints 10
 The class object is what we create when we use a class statement. The class object is stored in a variable of the same name of the class.
-The class object can be called like a function in order to create new instances. That’s how we created instances of classes in the examples above.
+The class object can be called like a function in order to create new instances. That's how we created instances of classes in the examples above.
 A class is made up of two tables. The class table itself, and the base table. The base is used as the metatable for all the instances. All properties listed in the class declaration are placed in the base.
-The class object’s metatable reads properties from the base if they don’t exist in the class object. This means we can access functions and properties directly from the class.
+The class object's metatable reads properties from the base if they don't exist in the class object. This means we can access functions and properties directly from the class.
-It is important to note that assigning to the class object does not assign into the base, so it’s not a valid way to add new methods to instances. Instead the base must explicitly be changed. See the __base field below.
+It is important to note that assigning to the class object does not assign into the base, so it's not a valid way to add new methods to instances. Instead the base must explicitly be changed. See the __base field below.
 The class object has a couple special properties:
@@ -3079,7 +3756,7 @@ print Counter.count -- prints 2
 </pre>
 </YueDisplay>
-The calling semantics of @@ are similar to @. Calling a @@ name will pass the class in as the first argument using Lua’s colon syntax.
+The calling semantics of @@ are similar to @. Calling a @@ name will pass the class in as the first argument using Lua's colon syntax.
 ```moonscript
 @@hello 1,2,3,4
@@ -3094,7 +3771,7 @@ The calling semantics of @@ are similar to @. Calling a @@ name will pass the cl
 In the body of a class declaration, we can have normal expressions in addition to key/value pairs. In this context, self is equal to the class object.
-Here is an alternative way to create a class variable compared to what’s described above:
+Here is an alternative way to create a class variable compared to what's described above:
 ```moonscript
 class Things
@@ -3360,19 +4037,19 @@ In this usage, with can be seen as a special form of the K combinator.
 The expression in the with statement can also be an assignment, if you want to give a name to the expression.
 ```moonscript
-with str = "Hello"
+with str := "Hello"
  print "original:", str
  print "upper:", \upper!
 ```
 <YueDisplay>
 <pre>
-with str = "Hello"
+with str := "Hello"
  print "original:", str
  print "upper:", \upper!
 </pre>
 </YueDisplay>
-Accessing special keys with `[]` in a `with` statement.
+You can access special keys with `[]` in a `with` statement.
 ```moonscript
 with tb
@@ -3395,6 +4072,18 @@ with tb
 </pre>
 </YueDisplay>
+`with?` is an enhanced version of `with` syntax, which introduces an existential check to safely access objects that may be nil without explicit null checks.
+```moonscript
+with? obj
+  print obj.name
+```
+<YueDisplay>
+<pre>
+with? obj
+  print obj.name
+</pre>
+</YueDisplay>
 ## Do
@@ -3415,7 +4104,7 @@ print var -- nil here
 </pre>
 </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.
 ```moonscript
 counter = do
@@ -3541,7 +4230,7 @@ print i -- will print 0
 </pre>
 </YueDisplay>
-In my_func, we've overwritten the value of i mistakenly. In this example it is quite obvious, but consider a large, or foreign code base where it isn’t clear what names have already been declared.
+In my_func, we've overwritten the value of i mistakenly. In this example it is quite obvious, but consider a large, or foreign code base where it isn't clear what names have already been declared.
 It would be helpful to say which variables from the enclosing scope we intend on change, in order to prevent us from changing others by accident.
@@ -3657,9 +4346,9 @@ The YueScript compiling function. It compiles the YueScript code to Lua code.
 **Signature:**
 ```lua
 to_lua: function(code: string, config?: Config):
-                --[[codes]] string | nil,
+    --[[codes]] string | nil,
-                --[[error]] string | nil,
+    --[[error]] string | nil,
-                --[[globals]] {{string, integer, integer}} | nil
+    --[[globals]] {{string, integer, integer}} | nil
 ```
 **Parameters:**
@@ -3782,8 +4471,8 @@ Loads YueScript code from a string into a function.
 **Signature:**
 ```lua
 loadstring: function(input: string, chunkname: string, env: table, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
+    --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[error]] string | nil
 ```
 **Parameters:**
@@ -3813,8 +4502,8 @@ Loads YueScript code from a string into a function.
 **Signature:**
 ```lua
 loadstring: function(input: string, chunkname: string, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
+    --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[error]] string | nil
 ```
 **Parameters:**
@@ -3843,8 +4532,8 @@ Loads YueScript code from a string into a function.
 **Signature:**
 ```lua
 loadstring: function(input: string, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
+    --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[error]] string | nil
 ```
 **Parameters:**
@@ -3872,8 +4561,8 @@ Loads YueScript code from a file into a function.
 **Signature:**
 ```lua
 loadfile: function(filename: string, env: table, config?: Config):
-                nil | function(...: any): (any...),
+    nil | function(...: any): (any...),
-                string | nil
+    string | nil
 ```
 **Parameters:**
@@ -3902,8 +4591,8 @@ Loads YueScript code from a file into a function.
 **Signature:**
 ```lua
 loadfile: function(filename: string, config?: Config):
-                nil | function(...: any): (any...),
+    nil | function(...: any): (any...),
-                string | nil
+    string | nil
 ```
 **Parameters:**
@@ -4158,9 +4847,9 @@ Converts the code to the AST.
 **Signature:**
 ```lua
-to_ast: function(code: string, flattenLevel?: number, astName?: string):
+to_ast: function(code: string, flattenLevel?: number, astName?: string, reserveComment?: boolean):
-                --[[AST]] AST | nil,
+    --[[AST]] AST | nil,
-                --[[error]] nil | string
+    --[[error]] nil | string
 ```
 **Parameters:**
@@ -4170,6 +4859,7 @@ to_ast: function(code: string, flattenLevel?: number, astName?: string):
 | code | string | The code. |
 | flattenLevel | integer | [Optional] The flatten level. Higher level means more flattening. Default is 0. Maximum is 2. |
 | astName | string | [Optional] The AST name. Default is "File". |
+| reserveComment | boolean | [Optional] Whether to reserve the original comments. Default is false. |
 **Returns:**
@@ -4178,6 +4868,33 @@ to_ast: function(code: string, flattenLevel?: number, astName?: string):
 | AST \| nil | The AST, or nil if the conversion failed. |
 | string \| nil | The error message, or nil if the conversion succeeded. |
+#### format
+**Type:** Function.
+**Description:**
+Formats the YueScript code.
+**Signature:**
+```lua
+format: function(code: string, tabSize?: number, reserveComment?: boolean): string
+```
+**Parameters:**
+| Parameter | Type | Description |
+| --- | --- | --- |
+| code | string | The code. |
+| tabSize | integer | [Optional] The tab size. Default is 4. |
+| reserveComment | boolean | [Optional] Whether to reserve the original comments. Default is true. |
+**Returns:**
+| Return Type | Description |
+| --- | --- |
+| string | The formatted code. |
 #### __call
 **Type:** Metamethod.
@@ -4249,6 +4966,19 @@ Whether the compiler should reserve the original line number in the compiled cod
 reserve_line_number: boolean
 ```
+#### reserve_comment
+**Type:** Field.
+**Description:**
+Whether the compiler should reserve the original comments in the compiled code.
+**Signature:**
+```lua
+reserve_comment: boolean
+```
 #### space_over_tab
 **Type:** Field.
@@ -4299,11 +5029,11 @@ The target Lua version enumeration.
 **Signature:**
 ```lua
 enum LuaTarget
-        "5.1"
+  "5.1"
-        "5.2"
+  "5.2"
-        "5.3"
+  "5.3"
-        "5.4"
+  "5.4"
-        "5.5"
+  "5.5"
 end
 ```
@@ -4380,7 +5110,7 @@ simplified: boolean
 ## Licence: MIT
-Copyright (c) 2017-2025 Li Jin \<dragon-fly@qq.com\>
+Copyright (c) 2017-2026 Li Jin \<dragon-fly@qq.com\>
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/doc/docs/zh/README.md b/doc/docs/zh/README.md
index f5c9811..05b2069 100755
--- a/doc/docs/zh/README.md
+++ b/doc/docs/zh/README.md
@@ -3,6 +3,6 @@ home: true
 heroImage: /image/yuescript.svg
 actionText: 快速上手 →
 actionLink: /zh/doc/
-footer: MIT Licensed | Copyright © 2017-2025 Li Jin
+footer: MIT Licensed | Copyright © 2017-2026 Li Jin
 ---
diff --git a/doc/docs/zh/doc/README.md b/doc/docs/zh/doc/README.md
index 754566c..43713fe 100755
--- a/doc/docs/zh/doc/README.md
+++ b/doc/docs/zh/doc/README.md
@@ -9,26 +9,36 @@ title: 参考手册
 ## 介绍
-月之脚本（YueScript）是一种动态语言，可以编译为Lua。它是[MoonScript](https://github.com/leafo/moonscript)的方言。用月之脚本编写的代码既有表现力又非常简洁。它适合编写一些更易于维护的代码，并在嵌入 Lua 的环境中运行，如游戏或网站服务器。
+月之脚本（YueScript）是一种动态语言，可以编译为 Lua。它是 [MoonScript](https://github.com/leafo/moonscript) 的方言。用月之脚本编写的代码既有表现力又非常简洁。它适合编写一些更易于维护的代码，并在嵌入 Lua 的环境中运行，如游戏或网站服务器。
 Yue（月）是中文中“月亮”的名称。
 ### 月之脚本概览
 ```moonscript
 -- 导入语法
-import "yue" as :p, :to_lua
+import p, to_lua from "yue"
 -- 隐式对象
 inventory =
  equipment:
-    * "sword"
+    - "sword"
-    * "shield"
+    - "shield"
  items:
-    * name: "potion"
+    - name: "potion"
      count: 10
-    * name: "bread"
+    - name: "bread"
      count: 3
+-- 列表推导
+map = (arr, action) ->
+  [action item for item in *arr]
+filter = (arr, cond) ->
+  [item for item in *arr when cond item]
+reduce = (arr, init, action): init ->
+  init = action init, item for item in *arr
 -- 管道操作符
 [1, 2, 3]
  |> map (x) -> x * 2
@@ -51,19 +61,29 @@ export 🌛 = "月之脚本"
 <YueDisplay>
 <pre>
 -- 导入语法
-import "yue" as :p, :to_lua
+import p, to_lua from "yue"
 -- 隐式对象
 inventory =
  equipment:
-    * "sword"
+    - "sword"
-    * "shield"
+    - "shield"
  items:
-    * name: "potion"
+    - name: "potion"
      count: 10
-    * name: "bread"
+    - name: "bread"
      count: 3
+-- 列表推导
+map = (arr, action) ->
+  [action item for item in *arr]
+filter = (arr, cond) ->
+  [item for item in *arr when cond item]
+reduce = (arr, init, action): init ->
+  init = action init, item for item in *arr
 -- 管道操作符
 [1, 2, 3]
  |> map (x) -> x * 2
@@ -89,7 +109,7 @@ export 🌛 = "月之脚本"
 * **Lua 模块**
-&emsp;安装 [luarocks](https://luarocks.org)，一个Lua模块的包管理器。然后作为Lua模块和可执行文件安装它：
+&emsp;安装 [luarocks](https://luarocks.org)，一个 Lua 模块的包管理器。然后作为 Lua 模块和可执行文件安装它：
 ```
 > luarocks install yuescript
@@ -122,7 +142,7 @@ export 🌛 = "月之脚本"
 * **下载预编译的二进制程序**
-&emsp;您可以下载预编译的二进制程序，包括兼容不同 Lua 版本的二进制可执行文件和库文件。
+&emsp;你可以下载预编译的二进制程序，包括兼容不同 Lua 版本的二进制可执行文件和库文件。
 &emsp;在[这里](https://github.com/IppClub/YueScript/releases)下载预编译的二进制程序。
@@ -130,16 +150,16 @@ export 🌛 = "月之脚本"
 ### Lua 模块
-在Lua中使用月之脚本模块：
+在 Lua 中使用月之脚本模块：
-* **用法 1**  
+* **用法 1**
-在Lua中引入 "你的脚本入口文件.yue"。
+在 Lua 中引入 "你的脚本入口文件.yue"。
 ```Lua
 require("yue")("你的脚本入口文件")
 ```
-当你在同一路径下把 "你的脚本入口文件.yue" 编译成了 "你的脚本入口文件.lua" 时，仍然可以使用这个代码加载 .lua 代码文件。在其余的月之脚本文件中，只需正常使用 **require** 或 **import**进行脚本引用即可。错误消息中的代码行号也会被正确处理。
+当你在同一路径下把 "你的脚本入口文件.yue" 编译成了 "你的脚本入口文件.lua" 时，仍然可以使用这个代码加载 .lua 代码文件。在其余的月之脚本文件中，只需正常使用 **require** 或 **import** 进行脚本引用即可。错误消息中的代码行号也会被正确处理。
-* **用法 2**  
+* **用法 2**
 手动引入月之脚本模块并重写错误消息来帮助调试。
 ```lua
 local yue = require("yue")
@@ -151,8 +171,8 @@ end, function(err)
 end)
 ```
-* **用法 3**  
+* **用法 3**
-在Lua中使用月之脚本编译器功能。
+在 Lua 中使用月之脚本编译器功能。
 ```lua
 local yue = require("yue")
 local codes, err, globals = yue.to_lua([[
@@ -333,7 +353,7 @@ end
 ### 导出宏
-宏函数可以从一个模块中导出，并在另一个模块中导入。您必须将导出的宏函数放在一个单独的文件中使用，而且只有宏定义、宏导入和宏展开可以放入这个宏导出模块中。
+宏函数可以从一个模块中导出，并在另一个模块中导入。你必须将导出的宏函数放在一个单独的文件中使用，而且只有宏定义、宏导入和宏展开可以放入这个宏导出模块中。
 ```moonscript
 -- 文件: utils.yue
 export macro map = (items, action) -> "[#{action} for _ in *#{items}]"
@@ -387,16 +407,16 @@ print $LINE -- 获取当前代码行数：2
 ```moonscript
 macro Enum = (...) ->
-        items = {...}
+  items = {...}
-        itemSet = {item, true for item in *items}
+  itemSet = {item, true for item in *items}
-        (item) ->
+  (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+    "\"#{item}\""
 macro BodyType = $Enum(
-        Static
+  Static
-        Dynamic
+  Dynamic
-        Kinematic
+  Kinematic
 )
 print "有效的枚举类型:", $BodyType Static
@@ -405,16 +425,16 @@ print "有效的枚举类型:", $BodyType Static
 <YueDisplay>
 <pre>
 macro Enum = (...) ->
-        items = {...}
+  items = {...}
-        itemSet = {item, true for item in *items}
+  itemSet = {item, true for item in *items}
-        (item) ->
+  (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+    "\"#{item}\""
 macro BodyType = $Enum(
-        Static
+  Static
-        Dynamic
+  Dynamic
-        Kinematic
+  Kinematic
 )
 print "有效的枚举类型:", $BodyType Static
@@ -422,9 +442,57 @@ print "有效的枚举类型:", $BodyType Static
 </pre>
 </YueDisplay>
+### 宏参数检查
+可以直接在参数列表中声明期望的 AST 节点类型，并在编译时检查传入的宏参数是否符合预期。
+```moonscript
+macro printNumAndStr = (num `Num, str `String) -> |
+  print(
+    #{num}
+    #{str}
+  )
+$printNumAndStr 123, "hello"
+```
+<YueDisplay>
+<pre>
+macro printNumAndStr = (num `Num, str `String) -> |
+  print(
+    #{num}
+    #{str}
+  )
+$printNumAndStr 123, "hello"
+</pre>
+</YueDisplay>
+如果需要做更加灵活的参数检查操作，可以使用内置的 `$is_ast` 宏函数在合适的位置进行手动检查。
+```moonscript
+macro printNumAndStr = (num, str) ->
+  error "expected Num as first argument" unless $is_ast Num, num
+  error "expected String as second argument" unless $is_ast String, str
+  "print(#{num}, #{str})"
+$printNumAndStr 123, "hello"
+```
+<YueDisplay>
+<pre>
+macro printNumAndStr = (num, str) ->
+  error "expected Num as first argument" unless $is_ast Num, num
+  error "expected String as second argument" unless $is_ast String, str
+  "print(#{num}, #{str})"
+$printNumAndStr 123, "hello"
+</pre>
+</YueDisplay>
+更多关于可用 AST 节点的详细信息，请参考 [yue_parser.cpp](https://github.com/IppClub/YueScript/blob/main/src/yuescript/yue_parser.cpp) 中大写的规则定义。
 ## 操作符
-Lua的所有二元和一元操作符在月之脚本中都是可用的。此外，**!=** 符号是 **~=** 的别名，而 **\\** 或 **::** 均可用于编写链式函数调用，如写作 `tb\func!` 或 `tb::func!`。此外月之脚本还提供了一些其他特殊的操作符，以编写更具表达力的代码。
+Lua 的所有二元和一元操作符在月之脚本中都是可用的。此外，**!=** 符号是 **~=** 的别名，而 **\\** 或 **::** 均可用于编写链式函数调用，如写作 `tb\func!` 或 `tb::func!`。此外月之脚本还提供了一些其他特殊的操作符，以编写更具表达力的代码。
 ```moonscript
 tb\func! if tb ~= nil
@@ -439,7 +507,7 @@ tb::func! if tb != nil
 ### 链式比较
-您可以在月之脚本中进行比较表达式的链式书写：
+你可以在月之脚本中进行比较表达式的链式书写：
 ```moonscript
 print 1 < 2 <= 2 < 3 == 3 > 2 >= 1 == 1 < 3 != 5
@@ -464,56 +532,56 @@ print 1 <= a <= 10
 ```moonscript
 v = (x) ->
-        print x
+  print x
-        x
+  x
 print v(1) < v(2) <= v(3)
 --[[
-        输出：
+  输出：
-        2
+  2
-        1
+  1
-        3
+  3
-        true
+  true
 ]]
 print v(1) > v(2) <= v(3)
 --[[
-        输出：
+  输出：
-        2
+  2
-        1
+  1
-        false
+  false
 ]]
 ```
 <YueDisplay>
 <pre>
 v = (x) ->
-        print x
+  print x
-        x
+  x
 print v(1) < v(2) <= v(3)
 --[[
-        输出：
+  输出：
-        2
+  2
-        1
+  1
-        3
+  3
-        true
+  true
 ]]
 print v(1) > v(2) <= v(3)
 --[[
-        输出：
+  输出：
-        2
+  2
-        1
+  1
-        false
+  false
 ]]
 </pre>
 </YueDisplay>
-在上面的例子里，中间的表达式`v(2)`仅被计算一次，如果把表达式写成`v(1) < v(2) and v(2) <= v(3)`的方式，中间的`v(2)`才会被计算两次。在链式比较中，求值的顺序往往是未定义的。所以强烈建议不要在链式比较中使用具有副作用（比如做打印操作）的表达式。如果需要使用有副作用的函数，应明确使用短路 `and` 运算符来做连接。
+在上面的例子里，中间的表达式 `v(2)` 仅被计算一次，如果把表达式写成 `v(1) < v(2) and v(2) <= v(3)` 的方式，中间的 `v(2)` 才会被计算两次。在链式比较中，求值的顺序往往是未定义的。所以强烈建议不要在链式比较中使用具有副作用（比如做打印操作）的表达式。如果需要使用有副作用的函数，应明确使用短路 `and` 运算符来做连接。
 ### 表追加
-**[] =** 操作符用于向Lua表的最后插入值。
+**[] =** 操作符用于向 Lua 表的最后插入值。
 ```moonscript
 tab = []
@@ -526,19 +594,36 @@ tab[] = "Value"
 </pre>
 </YueDisplay>
+你还可以使用展开操作符 `...` 来将一个列表中的所有元素追加到另一个列表中：
+```moonscript
+tbA = [1, 2, 3]
+tbB = [4, 5, 6]
+tbA[] = ...tbB
+-- tbA 现在为 [1, 2, 3, 4, 5, 6]
+```
+<YueDisplay>
+<pre>
+tbA = [1, 2, 3]
+tbB = [4, 5, 6]
+tbA[] = ...tbB
+-- tbA 现在为 [1, 2, 3, 4, 5, 6]
+</pre>
+</YueDisplay>
 ### 表扩展
-您可以使用前置 `...` 操作符在Lua表中插入数组表或哈希表。
+你可以使用前置 `...` 操作符在 Lua 表中插入数组表或哈希表。
 ```moonscript
 parts =
-        * "shoulders"
+  * "shoulders"
-        * "knees"
+  * "knees"
 lyrics =
-        * "head"
+  * "head"
-        * ...parts
+  * ...parts
-        * "and"
+  * "and"
-        * "toes"
+  * "toes"
 copy = {...other}
@@ -549,13 +634,13 @@ merge = {...a, ...b}
 <YueDisplay>
 <pre>
 parts =
-        * "shoulders"
+  * "shoulders"
-        * "knees"
+  * "knees"
 lyrics =
-        * "head"
+  * "head"
-        * ...parts
+  * ...parts
-        * "and"
+  * "and"
-        * "toes"
+  * "toes"
 copy = {...other}
@@ -565,12 +650,29 @@ merge = {...a, ...b}
 </pre>
 </YueDisplay>
+### 表反向索引
+你可以使用 **#** 操作符来反向索引表中的元素。
+```moonscript
+last = data.items[#]
+second_last = data.items[#-1]
+data.items[#] = 1
+```
+<YueDisplay>
+<pre>
+last = data.items[#]
+second_last = data.items[#-1]
+data.items[#] = 1
+</pre>
+</YueDisplay>
 ### 元表
 **<>** 操作符可提供元表操作的快捷方式。
-* **元表创建**  
+* **元表创建**
-使用空括号 **<>** 或被 **<>** 包围的元方法键创建普通的Lua表。
+使用空括号 **<>** 或被 **<>** 包围的元方法键创建普通的 Lua 表。
 ```moonscript
 mt = {}
@@ -605,7 +707,7 @@ close _ = &lt;close&gt;: -> print "超出范围"
 </pre>
 </YueDisplay>
-* **元表访问**  
+* **元表访问**
 使用 **<>** 或被 **<>** 包围的元方法名或在 **<>** 中编写某些表达式来访问元表。
 ```moonscript
@@ -629,7 +731,7 @@ print tb.item
 </pre>
 </YueDisplay>
-* **元表解构**  
+* **元表解构**
 使用被 **<>** 包围的元方法键解构元表。
 ```moonscript
@@ -680,7 +782,7 @@ with? io.open "test.txt", "w"
 ### 管道
-与其使用一系列嵌套的函数调用，您还可以考虑使用运算符 **|>** 来传递值。
+与其使用一系列嵌套的函数调用，你还可以考虑使用运算符 **|>** 来传递值。
 ```moonscript
 "你好" |> print
@@ -712,7 +814,7 @@ readFile "example.txt"
 ### 空值合并
-如果其左操作数不是**nil**，则nil合并运算符 **??** 返回其左操作数的值；否则，它将计算右操作数并返回其结果。如果左操作数计算结果为非nil的值，**??** 运算符将不再计算其右操作数。
+如果其左操作数不是 **nil**，则nil合并运算符 **??** 返回其左操作数的值；否则，它将计算右操作数并返回其结果。如果左操作数计算结果为非 nil 的值，**??** 运算符将不再计算其右操作数。
 ```moonscript
 local a, b, c, d
 a = b ?? c ?? d
@@ -731,67 +833,87 @@ a ??= false
 ### 隐式对象
-您可以在表格块内使用符号 **\*** 开始编写一系列隐式结构。如果您正在创建隐式对象，对象的字段必须具有相同的缩进。
+你可以在表格块内使用符号 **\*** 或是 **-** 开始编写一系列隐式结构。如果你正在创建隐式对象，对象的字段必须具有相同的缩进。
 ```moonscript
+-- 赋值时使用隐式对象
 list =
  * 1
  * 2
  * 3
+-- 函数调用时使用隐式对象
 func
  * 1
  * 2
  * 3
+-- 返回时使用隐式对象
+f = ->
+  return
+    * 1
+    * 2
+    * 3
+-- 表格时使用隐式对象
 tb =
  name: "abc"
  values:
-    * "a"
+    - "a"
-    * "b"
+    - "b"
-    * "c"
+    - "c"
  objects:
-    * name: "a"
+    - name: "a"
      value: 1
      func: => @value + 1
      tb:
        fieldA: 1
-    * name: "b"
+    - name: "b"
      value: 2
      func: => @value + 2
      tb: { }
 ```
 <YueDisplay>
 <pre>
+-- 赋值时使用隐式对象
 list =
  * 1
  * 2
  * 3
+-- 函数调用时使用隐式对象
 func
  * 1
  * 2
  * 3
+-- 返回时使用隐式对象
+f = ->
+  return
+    * 1
+    * 2
+    * 3
+-- 表格时使用隐式对象
 tb =
  name: "abc"
  values:
-    * "a"
+    - "a"
-    * "b"
+    - "b"
-    * "c"
+    - "c"
  objects:
-    * name: "a"
+    - name: "a"
      value: 1
      func: => @value + 1
      tb:
        fieldA: 1
-    * name: "b"
+    - name: "b"
      value: 2
      func: => @value + 2
      tb: { }
@@ -855,11 +977,67 @@ do
 </pre>
 </YueDisplay>
+### 导入全局变量
+你可以使用 `import` 将指定的全局变量导入到本地变量中。当导入一系列对全局变量的链式访问时，最后一个访问的字段将被赋值给本地变量。
+```moonscript
+do
+  import tostring
+  import table.concat
+  print concat ["a", tostring 1]
+```
+<YueDisplay>
+<pre>
+do
+  import tostring
+  import table.concat
+  print concat ["a", tostring 1]
+</pre>
+</YueDisplay>
+#### 自动导入
+在一个代码块的顶部写 `import global`，会将当前作用域中尚未显式声明或赋值过的变量名，自动导入为本地常量，并在该语句的位置绑定到同名的全局变量。
+但是在同一作用域中被显式声明为全局的变量不会被自动导入，因此可以继续进行赋值操作。
+```moonscript
+do
+  import global
+  print "hello"
+  math.random 3
+  -- print = nil -- 报错：自动导入的全局变量为常量
+do
+  -- 被显式声明为全局的变量不会被自动导入
+  import global
+  global FLAG
+  print FLAG
+  FLAG = 123
+```
+<YueDisplay>
+<pre>
+do
+  import global
+  print "hello"
+  math.random 3
+  -- print = nil -- 报错：自动导入的全局变量是常量
+do
+  -- 被显式声明为全局的变量不会被自动导入
+  import global
+  global FLAG
+  print FLAG
+  FLAG = 123
+</pre>
+</YueDisplay>
 ### 导出
 导出语句提供了一种简洁的方式来定义当前的模块。
-* **命名导出**  
+* **命名导出**
 带命名的导出将定义一个局部变量，并在导出的表中添加一个同名的字段。
 ```moonscript
@@ -923,7 +1101,7 @@ export["a-b-c"] = 123
 </pre>
 </YueDisplay>
-* **未命名导出**  
+* **未命名导出**
 未命名导出会将要导出的目标项目添加到导出表的数组部分。
 ```moonscript
@@ -953,7 +1131,7 @@ export with tmp
 </pre>
 </YueDisplay>
-* **默认导出**  
+* **默认导出**
 在导出语句中使用 **default** 关键字，来替换导出的表为一个目标的对象。
 ```moonscript
@@ -971,7 +1149,7 @@ export default ->
 ## 赋值
-月之脚本中定义的变量是动态类型的，并默认为局部变量。但你可以通过**local**和**global**声明来改变声明变量的作用范围。
+月之脚本中定义的变量是动态类型的，并默认为局部变量。但你可以通过 **local** 和 **global** 声明来改变声明变量的作用范围。
 ```moonscript
 hello = "world"
@@ -1100,9 +1278,9 @@ do
 ## 解构赋值
-解构赋值是一种快速从Lua表中按名称或基于数组中的位置提取值的方法。
+解构赋值是一种快速从 Lua 表中按名称或基于数组中的位置提取值的方法。
-通常当你看到一个字面量的Lua表，比如{1,2,3}，它位于赋值的右侧，因为它是一个值。解构赋值语句的写法就是交换了字面量Lua表的角色，并将其放在赋值语句的左侧。
+通常当你看到一个字面量的 Lua 表，比如 `{1,2,3}`，它位于赋值的右侧，因为它是一个值。解构赋值语句的写法就是交换了字面量 Lua 表的角色，并将其放在赋值语句的左侧。
 最好是通过示例来解释。以下是如何从表格中解包前两个值的方法：
@@ -1201,7 +1379,7 @@ print first, second, color
 </pre>
 </YueDisplay>
-有时候我们会需要从Lua表中提取值并将它们赋给与键同名的局部变量。为了避免编写重复代码，我们可以使用 **:** 前缀操作符：
+有时候我们会需要从 Lua 表中提取值并将它们赋给与键同名的局部变量。为了避免编写重复代码，我们可以使用 **:** 前缀操作符：
 ```moonscript
 {:concat, :insert} = table
@@ -1223,7 +1401,7 @@ print first, second, color
 </pre>
 </YueDisplay>
-在进行解构时，您可以指定默认值，如：
+在进行解构时，你可以指定默认值，如：
 ```moonscript
 {:name = "nameless", :job = "jobless"} = person
@@ -1234,7 +1412,7 @@ print first, second, color
 </pre>
 </YueDisplay>
-在进行列表解构时，您可以使用`_`作为占位符：
+在进行列表解构时，你可以使用`_`作为占位符：
 ```moonscript
 [_, two, _, four] = items
@@ -1245,9 +1423,55 @@ print first, second, color
 </pre>
 </YueDisplay>
-### 在其�����方的解构
+### �����解构
-解构也可以出现在其它隐式进行赋值的地方。一个例子是用在for循环：
+你可以使用展开运算符 `...` 在列表解构中来捕获一个范围的值到子列表中。这在当你想要从列表的开头和结尾提取特定元素，同时收集中间的元素时非常有用。
+```moonscript
+orders = ["first", "second", "third", "fourth", "last"]
+[first, ...bulk, last] = orders
+print first  -- 打印: first
+print bulk   -- 打印: {"second", "third", "fourth"}
+print last   -- 打印: last
+```
+<YueDisplay>
+<pre>
+orders = ["first", "second", "third", "fourth", "last"]
+[first, ...bulk, last] = orders
+print first  -- 打印: first
+print bulk   -- 打印: {"second", "third", "fourth"}
+print last   -- 打印: last
+</pre>
+</YueDisplay>
+展开运算符可以用在不同的位置来捕获不同的范围，并且你可以使用 `_` 作为占位符来表示你想跳过对应范围的捕获：
+```moonscript
+-- 捕获第一个元素之后的所有元素
+[first, ...rest] = orders
+-- 捕获最后一个元素之前的所有元素
+[...start, last] = orders
+-- 跳过中间的元素，只捕获第一个和最后一个元素
+[first, ..._, last] = orders
+```
+<YueDisplay>
+<pre>
+-- 捕获第一个元素之后的所有元素
+[first, ...rest] = orders
+-- 捕获最后一个元素之前的所有元素
+[...start, last] = orders
+-- 跳过中间的元素，只捕获第一个和最后一个元素
+[first, ..._, last] = orders
+</pre>
+</YueDisplay>
+### 在其它地方的解构赋值
+解构赋值也可以出现在其它隐式进行赋值的地方。一个例子是用在 for 循环中：
 ```moonscript
 tuples = [
@@ -1270,7 +1494,7 @@ for [left, right] in *tuples
 </pre>
 </YueDisplay>
-我们知道数组表中的每个元素都是一个两项的元组，所以我们可以直接在for语句的名称子句中使用解构来解包它。
+我们知道数组表中的每个元素都是一个两项的元组，所以我们可以直接在 for 语句的名称子句中使用解构来解包它。
 ## If 赋值
@@ -1322,7 +1546,7 @@ print "好的"
 ### While 赋值
-您可以在 while 循环中同样使用赋值来获取循环条件的值。
+你可以在 while 循环中同样使用赋值来获取循环条件的值。
 ```moonscript
 while byte := stream\read_one!
  -- 对 byte 做一些操作
@@ -1338,7 +1562,7 @@ while byte := stream\read_one!
 ## 可变参数赋值
-您可以将函数返回的结果赋值给一个可变参数符号 `...`。然后使用Lua的方式访问其内容。
+你可以将函数返回的结果赋值给一个可变参数符号 `...`。然后使用 Lua 的方式访问其内容。
 ```moonscript
 list = [1, 2, 3, 4, 5]
 fn = (ok) -> ok, table.unpack list
@@ -1360,7 +1584,20 @@ print ok, count, first
 ## 空白
-月之脚本是一个对空白敏感的语言。您必须在相同的缩进中使用空格 **' '** 或制表符 **'\t'** 来编写一些代码块，如函数体、值列表和一些控制块。包含不同空白的表达式可能意味着不同的事情。制表符被视为4个空格，但最好不要混合使用空格和制表符。
+月之脚本是一个对空白敏感的语言。你必须在相同的缩进中使用空格 **' '** 或制表符 **'\t'** 来编写一些代码块，如函数体、值列表和一些控制块。包含不同空白的表达式可能意味着不同的事情。制表符被视为4个空格，但最好不要混合使用空格和制表符。
+### 语句分隔符
+一条语句通常以换行结束。你也可以使用分号 `;` 显式结束一条语句，从而在同一行中编写多条语句：
+```moonscript
+a = 1; b = 2; print a + b
+```
+<YueDisplay>
+<pre>
+a = 1; b = 2; print a + b
+</pre>
+</YueDisplay>
 ### 多行链式调用
@@ -1415,7 +1652,7 @@ func --[[端口]] 3000, --[[ip]] "192.168.1.1"
 ## 错误处理
-用于统一进行Lua错误处理的便捷语法。
+用于统一进行 Lua 错误处理的便捷语法。
 ```moonscript
 try
@@ -1474,9 +1711,50 @@ catch err
 </pre>
 </YueDisplay>
+### 错误处理简化
+`try?` 是 `try` 的功能简化语法，它不再返回 `try` 语句的布尔状态，并在成功时直接返回 `try` 代码块的结果，失败时返回 `nil` 值而非错误对象。
+```moonscript
+a, b, c = try? func!
+-- 与空值合并运算符一起使用
+a = (try? func!) ?? "default"
+-- 作为函数参数
+f try? func!
+-- 带 catch 块的 try!
+f try?
+  print 123
+  func!
+catch e
+  print e
+  e
+```
+<YueDisplay>
+<pre>
+a, b, c = try? func!
+-- 与空值合并运算符一起使用
+a = (try? func!) ?? "default"
+-- 作为函数参数
+f try? func!
+-- 带 catch 块的 try!
+f try?
+  print 123
+  func!
+catch e
+  print e
+  e
+</pre>
+</YueDisplay>
 ## 属性
-月之脚本现在提供了Lua 5.4新增的叫做属性的语法支持。在月之脚本编译到的Lua目标版本低于5.4时，你仍然可以同时使用`const`和`close`的属性声明语法，并获得常量检查和作用域回调的功能。
+月之脚本现在提供了 Lua 5.4 新增的叫做属性的语法支持。在月之脚本编译到的 Lua 目标版本低于 5.4 时，你仍然可以同时使用`const` 和 `close` 的属性声明语法，并获得常量检查和作用域回调的功能。
 ```moonscript
 const a = 123
@@ -1502,11 +1780,24 @@ const {:a, :b, c, d} = tb
 </pre>
 </YueDisplay>
+你也可以声明全局变量为常量。
+```moonscript
+global const Constant = 123
+-- Constant = 1
+```
+<YueDisplay>
+<pre>
+global const Constant = 123
+-- Constant = 1
+</pre>
+</YueDisplay>
 ## 字面量
-Lua中的所有基本字面量都可以在月之脚本中使用。包括数字、字符串、布尔值和**nil**。
+Lua 中的所有基本字面量都可以在月之脚本中使用。包括数字、字符串、布尔值和 **nil**。
-但与Lua不同的是，单引号和双引号字符串内部允许有换行：
+但与 Lua 不同的是，单引号和双引号字符串内部允许有换行：
 ```moonscript
 some_string = "这是一个字符串
@@ -1529,17 +1820,78 @@ print "我有#{math.random! * 100}%的把握。"
 ### 数字字面量
-您可以在数字字面量中使用下划线来增加可读性。
+你可以在数字字面量中使用下划线来增加可读性。
 ```moonscript
 integer = 1_000_000
 hex = 0xEF_BB_BF
+binary = 0B10011
 ```
 <YueDisplay>
 <pre>
 integer = 1_000_000
 hex = 0xEF_BB_BF
+binary = 0B10011
+</pre>
+</YueDisplay>
+### YAML 风格字符串
+使用 `|` 前缀标记一个多行 YAML 风格字符串：
+```moonscript
+str = |
+  key: value
+  list:
+    - item1
+    - #{expr}
+```
+<YueDisplay>
+<pre>
+str = |
+  key: value
+  list:
+    - item1
+    - #{expr}
+</pre>
+</YueDisplay>
+其效果类似于原生 Lua 的多行拼接，所有文本（含换行）将被保留下来，并支持 `#{...}` 语法，通过 `tostring(expr)` 插入表达式结果。
+YAML 风格的多行字符串会自动检测首行后最小的公共缩进，并从所有行中删除该前缀空白字符。这让你可以在代码中对齐文本，但输出字符串不会带多余缩进。
+```moonscript
+fn = ->
+  str = |
+    foo:
+      bar: baz
+  return str
+```
+<YueDisplay>
+<pre>
+fn = ->
+  str = |
+    foo:
+      bar: baz
+  return str
+</pre>
+</YueDisplay>
+输出字符串中的 foo: 对齐到行首，不会带有函数缩进空格。保留内部缩进的相对结构，适合书写结构化嵌套样式的内容。
+支持自动处理字符中的引号、反斜杠等特殊符号，无需手动转义：
+```moonscript
+str = |
+  path: "C:\Program Files\App"
+  note: 'He said: "#{Hello}!"'
+```
+<YueDisplay>
+<pre>
+str = |
+  path: "C:\Program Files\App"
+  note: 'He said: "#{Hello}!"'
 </pre>
 </YueDisplay>
@@ -1644,7 +1996,7 @@ print "数字的和是", sum 10, 20
 </pre>
 </YueDisplay>
-如果您需要做显式返回，可以使用return关键字：
+如果你需要做显式返回，可以使用 return 关键字：
 ```moonscript
 sum = (x, y) -> return x + y
@@ -1670,7 +2022,7 @@ a, b = mystery 10, 20
 ### 粗箭头
-因为在Lua中调用方法时，经常习惯将对象作为第一个参数传入，所以月之脚本提供了一种特殊的语法来创建自动包含self参数的函数。
+因为在 Lua 中调用方法时，经常习惯将对象作为第一个参数传入，所以月之脚本提供了一种特殊的语法来创建自动包含 self 参数的函数。
 ```moonscript
 func = (num) => @value + num
@@ -1683,7 +2035,7 @@ func = (num) => @value + num
 ### 参数默认值
-可以为函数的参数提供默认值。如果参数的值为nil，则确定该参数为空。任何具有默认值的nil参数在函数体运行之前都会被替换。
+可以为函数的参数提供默认值。如果参数的值为 nil，则确定该参数为空。任何具有默认值的 nil 参数在函数体运行之前都会被替换。
 ```moonscript
 my_function = (name = "某物", height = 100) ->
@@ -1755,7 +2107,7 @@ my_func 5, 6, 7,
 </pre>
 </YueDisplay>
-因为Lua表也使用逗号作为分隔符，这种缩进语法有助于让值成为参数列表的一部分，而不是Lua表的一部分。
+因为 Lua 表也使用逗号作为分隔符，这种缩进语法有助于让值成为参数列表的一部分，而不是 Lua 表的一部分。
 ```moonscript
 x = [
@@ -1822,6 +2174,138 @@ if func 1, 2, 3,
 </pre>
 </YueDisplay>
+### 参数解构
+月之脚本支持在函数形参位置对传入对象进行解构。适用两类解构表子面量：
+- 使用 {} 包裹的字面量/对象形参，支持提供获得空字段时的默认值（例如 {:a, :b}、{a: a1 = 123}）。
+- 无 {} 包裹、以键值/简写键序列开头，直至遇到其它表达式终止（例如 :a, b: b1, :c），表示从同一个对象中解构多个字段。
+```moonscript
+f1 = (:a, :b, :c) ->
+  print a, b, c
+f1 a: 1, b: "2", c: {}
+f2 = ({a: a1 = 123, :b = 'abc'}, c = {}) ->
+  print a1, b, c
+arg1 = {a: 0}
+f2 arg1, arg2
+```
+<YueDisplay>
+<pre>
+f1 = (:a, :b, :c) ->
+  print a, b, c
+f1 a: 1, b: "2", c: {}
+f2 = ({a: a1 = 123, :b = 'abc'}, c = {}) ->
+  print a1, b, c
+arg1 = {a: 0}
+f2 arg1, arg2
+</pre>
+</YueDisplay>
+### 前置返回表达式
+在深度嵌套的函数体中，为了提升返回值的可读性及编写便利性，我们新增了 “前置返回表达式” 语法。其形式如下：
+```moon
+findFirstEven = (list): nil ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+```
+<YueDisplay>
+<pre>
+findFirstEven = (list): nil ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+</pre>
+</YueDisplay>
+这个写法等价于：
+```moon
+findFirstEven = (list) ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+  nil
+```
+<YueDisplay>
+<pre>
+findFirstEven = (list) ->
+  for item in *list
+    if type(item) == "table"
+      for sub in *item
+        if sub % 2 == 0
+          return sub
+  nil
+</pre>
+</YueDisplay>
+唯一的区别在于：你可以将函数的返回值表达式提前写在 `->` 或 `=>` 前，用以指示该函数应隐式返回该表达式的值。这样即使在多层循环或条件判断的场景下，也无需编写尾行悬挂的返回表达式，逻辑结构会更加直观清晰。
+### 命名变长参数
+你可以使用 `(...t) ->` 语法来将变长参数自动存储到一个命名表中。这个表会包含所有传入的参数（包括 `nil` 值），并且会在表的 `n` 字段中存储实际传入的参数个数（包括 `nil` 值在内的个数）。
+```moonscript
+f = (...t) ->
+  print "参数个数:", t.n
+  print "表长度:", #t
+  for i = 1, t.n
+    print t[i]
+f 1, 2, 3
+f "a", "b", "c", "d"
+f!
+-- 处理包含 nil 的情况
+process = (...args) ->
+  sum = 0
+  for i = 1, args.n
+    if args[i] != nil and type(args[i]) == "number"
+      sum += args[i]
+  sum
+process 1, nil, 3, nil, 5
+```
+<YueDisplay>
+<pre>
+f = (...t) ->
+  print "参数个数:", t.n
+  print "表长度:", #t
+  for i = 1, t.n
+    print t[i]
+f 1, 2, 3
+f "a", "b", "c", "d"
+f!
+-- 处理包含 nil 的情况
+process = (...args) ->
+  sum = 0
+  for i = 1, args.n
+    if args[i] != nil and type(args[i]) == "number"
+      sum += args[i]
+  sum
+process 1, nil, 3, nil, 5
+</pre>
+</YueDisplay>
 ## 反向回调
 反向回调用于减少函数回调的嵌套。它们使用指向左侧的箭头，并且默认会被定义为传入后续函数调用的最后一个参数。它的语法大部分与常规箭头函数相同，只是它指向另一方向，并且后续的函数体不需要进行缩进。
@@ -1850,7 +2334,7 @@ print @value
 </pre>
 </YueDisplay>
-您可以通过一个占位符指定回调函数的传参位置。
+你可以通过一个占位符指定回调函数的传参位置。
 ```moonscript
 (x) <- map _, [1, 2, 3]
@@ -1863,22 +2347,22 @@ x * 2
 </pre>
 </YueDisplay>
-如果您希望在反向回调处理后继续编写更多其它的代码，您可以使用do语句将不归属反向回调的代码分开。
+如果你希望在反向回调处理后继续编写更多其它的代码，可以使用 do 语句将不属于反向回调的代码分隔开。对于非粗箭头函数的反向回调，回调返回值的括号也是可以省略的。
 ```moonscript
 result, msg = do
-  (data) <- readAsync "文件名.txt"
+  data <- readAsync "文件名.txt"
  print data
-  (info) <- processAsync data
+  info <- processAsync data
  check info
 print result, msg
 ```
 <YueDisplay>
 <pre>
 result, msg = do
-  (data) <- readAsync "文件名.txt"
+  data <- readAsync "文件名.txt"
  print data
-  (info) <- processAsync data
+  info <- processAsync data
  check info
 print result, msg
 </pre>
@@ -1886,7 +2370,7 @@ print result, msg
 ## 表格字面量
-和Lua一样，表格可以通过花括号进行定义。
+和 Lua 一样，表格可以通过花括号进行定义。
 ```moonscript
 some_values = [1, 2, 3, 4]
@@ -1969,7 +2453,7 @@ y = type: "狗", legs: 4, tails: 1
 </pre>
 </YueDisplay>
-表格字面量的键可以使用Lua语言的关键字，而无需转义：
+表格字面量的键可以使用 Lua 语言的关键字，而无需转义：
 ```moonscript
 tbl = {
@@ -2005,7 +2489,7 @@ print_table :hair, :height
 </pre>
 </YueDisplay>
-如果你希望表中字段的键是某个表达式的结果，那么可以用 **[ ]** 包裹它，就像在Lua中一样。如果键中有任何特殊字符，也可以直接使用字符串字面量作为键，省略方括号。
+如果你希望表中字段的键是某个表达式的结果，那么可以用 **[ ]** 包裹它，就像在 Lua 中一样。如果键中有任何特殊字符，也可以直接使用字符串字面量作为键，省略方括号。
 ```moonscript
 t = {
@@ -2022,7 +2506,7 @@ t = {
 </pre>
 </YueDisplay>
-Lua的表同时具有数组部分和哈希部分，但有时候你会希望在书写Lua表时，对Lua表做数组和哈希不同用法的语义区分。然后你可以用 **[ ]** 而不是 **{ }** 来编写表示数组的 Lua 表，并且不允许在数组 Lua 表中写入任何键值对。
+Lua 的表同时具有数组部分和哈希部分，但有时候你会希望在书写 Lua 表时，对 Lua 表做数组和哈希不同用法的语义区分。然后你可以用 **[ ]** 而不是 **{ }** 来编写表示数组的 Lua 表，并且不允许在数组 Lua 表中写入任何键值对。
 ```moonscript
 some_values = [ 1, 2, 3, 4 ]
@@ -2037,11 +2521,11 @@ list_with_one_element = [ 1, ]
 ## 推导式
-推导式为我们提供了一种便捷的语法，通过遍历现有对象并对其值应用表达式来构造出新的表格。月之脚本有两种推导式：列表推导式和表格推导式。它们最终都是产生Lua表格；列表推导式将值累积到类似数组的表格中，而表格推导式允许您在每次遍历时设置新表格的键和值。
+推导式为我们提供了一种便捷的语法，通过遍历现有对象并对其值应用表达式来构造出新的表格。月之脚本有两种推导式：列表推导式和表格推导式。它们最终都是产生 Lua 表格；列表推导式将值累积到类似数组的表格中，而表格推导式允许你在每次遍历时设置新表格的键和值。
 ### 列表推导式
-以下操作创建了一个items表的副本，但所有包含的值都翻倍了。
+以下操作创建了一个 items 表的副本，但所有包含的值都翻倍了。
 ```moonscript
 items = [1, 2, 3, 4]
@@ -2054,7 +2538,7 @@ doubled = [item * 2 for i, item in ipairs items]
 </pre>
 </YueDisplay>
-可以使用when子句筛选新表中包含的项目：
+可以使用 `when` 子句筛选新表中包含的项目：
 ```moonscript
 slice = [item for i, item in ipairs items when i > 1 and i < 3]
@@ -2065,7 +2549,7 @@ slice = [item for i, item in ipairs items when i > 1 and i < 3]
 </pre>
 </YueDisplay>
-因为我们常常需要迭代数值索引表的值，所以引入了 **\*** 操作符来做语法简化。doubled示例可以重写为：
+因为我们常常需要迭代数值索引表的值，所以引入了 **\*** 操作符来做语法简化。doubled 示例可以重写为：
 ```moonscript
 doubled = [item * 2 for item in *items]
@@ -2076,9 +2560,30 @@ doubled = [item * 2 for item in *items]
 </pre>
 </YueDisplay>
-for和when子句可以根据需要进行链式操作。唯一的要求是推导式中至少要有一个for子句。
+在列表推导式中，你还可以使用展开操作符 `...` 来实现对列表嵌套层级进行扁平化的处理：
+```moonscript
+data =
+  a: [1, 2, 3]
+  b: [4, 5, 6]
+flat = [...v for k,v in pairs data]
+-- flat 现在为 [1, 2, 3, 4, 5, 6]
+```
+<YueDisplay>
+<pre>
+data =
+  a: [1, 2, 3]
+  b: [4, 5, 6]
+flat = [...v for k,v in pairs data]
+-- flat 现在为 [1, 2, 3, 4, 5, 6]
+</pre>
+</YueDisplay>
+for 和 when 子句可以根据需要进行链式操作。唯一的要求是推导式中至少要有一个 for 子句。
-使用多个for子句与使用多重循环的效果相同：
+使用多个 for 子句与使用多重循环的效果相同：
 ```moonscript
 x_coords = [4, 5, 6, 7]
@@ -2097,7 +2602,7 @@ for y in *y_coords]
 </pre>
 </YueDisplay>
-在推导式中也可以使用简单的数值for循环：
+在推导式中也可以使用简单的数值 for 循环：
 ```moonscript
 evens = [i for i = 1, 100 when i % 2 == 0]
@@ -2112,7 +2617,7 @@ evens = [i for i = 1, 100 when i % 2 == 0]
 表格推导式和列表推导式的语法非常相似，只是要使用 **{** 和 **}** 并从每次迭代中取两个值。
-以下示例生成了表格thing的副本：
+以下示例生成了表格 thing 的副本：
 ```moonscript
 thing = {
@@ -2174,9 +2679,9 @@ tbl = {unpack tuple for tuple in *tuples}
 ### 切片
-当使用 **\*** 操作符时，月之脚本还提供了一种特殊的语法来限制要遍历的列表范围。这个语法也相当于在for循环中设置迭代边界和步长。
+当使用 **\*** 操作符时，月之脚本还提供了一种特殊的语法来限制要遍历的列表范围。这个语法也相当于在 for 循环中设置迭代边界和步长。
-下面的案例中，我们在切片中设置最小和最大边界，取索引在1到5之间（包括1和5）的所有项目：
+下面的案例中，我们在切片中设置最小和最大边界，取索引在 1 到 5 之间（包括 1 和 5）的所有项目：
 ```moonscript
 slice = [item for item in *items[1, 5]]
@@ -2198,7 +2703,7 @@ slice = [item for item in *items[2,]]
 </pre>
 </YueDisplay>
-如果省略了最小边界，便默认会设置为1。这里我们只提供一个步长，并留下其他边界为空。这样会使得代码取出所有奇数索引的项目：(1, 3, 5, …)
+如果省略了最小边界，便默认会设置为 1。这里我们只提供一个步长，并留下其他边界为空。这样会使得代码取出所有奇数索引的项目：(1, 3, 5, …)
 ```moonscript
 slice = [item for item in *items[,,2]]
@@ -2210,9 +2715,48 @@ slice = [item for item in *items[,,2]]
 </pre>
 </YueDisplay>
+最小和最大边界都可以是负数，使用负数意味着边界是从表的末尾开始计算的。
+```moonscript
+-- 取最后4个元素
+slice = [item for item in *items[-4,-1]]
+```
+<YueDisplay>
+<pre>
+-- 取最后4个元素
+slice = [item for item in *items[-4,-1]]
+</pre>
+</YueDisplay>
+切片的步长也可以是负数，这意味着元素会以相反的顺序被取出。
+```moonscript
+reverse_slice = [item for item in *items[-1,1,-1]]
+```
+<YueDisplay>
+<pre>
+reverse_slice = [item for item in *items[-1,1,-1]]
+</pre>
+</YueDisplay>
+#### 切片表达式
+切片也可以作为表达式来使用。可以用于获取一个表包含的子列表。
+```moonscript
+-- 取第2和第4个元素作为新的列表
+sub_list = items[2, 4]
+```
+<YueDisplay>
+<pre>
+-- 取第2和第4个元素作为新的列表
+sub_list = items[2, 4]
+</pre>
+</YueDisplay>
 ## for 循环
-Lua中有两种for循环形式，数字型和通用型：
+Lua 中有两种 for 循环形式，数字型和通用型：
 ```moonscript
 for i = 10, 20
@@ -2265,7 +2809,7 @@ for j = 1, 10, 3 do print j
 </pre>
 </YueDisplay>
-for循环也可以用作表达式。for循环主体中的最后一条语句会被强制转换为一个返回值的表达式，并会将表达式计算结果的值追加到一个作为结果的数组表中。
+for 循环也可以用作表达式。for 循环主体中的最后一条语句会被强制转换为一个返回值的表达式，并会将表达式计算结果的值追加到一个作为结果的数组表中。
 将每个偶数加倍：
@@ -2286,9 +2830,24 @@ doubled_evens = for i = 1, 20
 </pre>
 </YueDisplay>
-您还可以结合for循环表达式与continue语句来过滤值。
+此外，for 循环还支持带返回值的 break 语句，这样循环本身就可以作为一个表达式，在满足条件时提前退出并返回有意义的结果。
+例如，查找第一个大于 10 的数字：
+```moonscript
+first_large = for n in *numbers
+  break n if n > 10
+```
+<YueDisplay>
+<pre>
+first_large = for n in *numbers
+  break n if n > 10
+</pre>
+</YueDisplay>
+你还可以结合 for 循环表达式与 continue 语句来过滤值。
-注意出现在函数体末尾的for循环，不会被当作是一个表达式，并将循环结果累积到一个列表中作为返回值（相反，函数将返回nil）。如果要函数末尾的循环转换为列表表达式，可以使用返回语句加for循环表达式。
+注意出现在函数体末尾的 for 循环，不会被当作是一个表达式并将循环结果累积到一个列表中作为返回值（相反，函数将返回 nil）。如果要函数末尾的循环转换为列表表达式，可以显式地使用返回语句加 for 循环表达式。
 ```moonscript
 func_a = -> for i = 1, 10 do print i
@@ -2311,7 +2870,7 @@ print func_b! -- 打印 table 对象
 ## repeat 循环
-repeat循环是从Lua语言中搬过来的相似语法：
+repeat 循环是从 Lua 语言中搬过来的相似语法：
 ```moonscript
 i = 10
@@ -2332,7 +2891,7 @@ until i == 0
 ## while 循环
-在月之脚本中的while循环有四种写法：
+在月之脚本中的 while 循环有四种写法：
 ```moonscript
 i = 10
@@ -2371,7 +2930,7 @@ until running == false do my_function!
 </pre>
 </YueDisplay>
-像for循环的语法一样，while循环也可以作为一个表达式使用。为了使函数返回while循环的累积列表值，必须明确使用返回语句返回while循环表达式。
+像 for 循环的语法一样，while 循环也可以作为一个表达式使用。为了使函数返回 while 循环的累积列表值，必须明确使用返回语句返回 while 循环表达式。
 ## 继续
@@ -2489,13 +3048,14 @@ print message -- 打印: 我很高
 </pre>
 </YueDisplay>
-if的反义词是unless（相当于if not，如果 vs 除非）：
+if 的反义词是 unless（相当于 if not，正如“如果”对应“除非”）：
 ```moonscript
 unless os.date("%A") == "Monday"
  print "今天不是星期一！"
 ```
 <YueDisplay>
 <pre>
 unless os.date("%A") == "Monday"
  print "今天不是星期一！"
@@ -2513,7 +3073,7 @@ print "你真幸运！" unless math.random! > 0.1
 ### 范围表达式
-您可以使用范围表达式来编写进行范围检查的代码。
+你可以使用范围表达式来编写进行范围检查的代码。
 ```moonscript
 a = 5
@@ -2547,7 +3107,7 @@ print "你很幸运!" unless math.random! > 0.1
 ## 代码行修饰符
-为了方便编写代码，循环语句和if语句可以应用于单行代码语句的末尾：
+为了方便编写代码，循环语句和 if 语句可以应用于单行代码语句的末尾：
 ```moonscript
 print "你好，世界" if name == "Rob"
@@ -2558,7 +3118,7 @@ print "你好，世界" if name == "Rob"
 </pre>
 </YueDisplay>
-修饰for循环的示例：
+修饰 for 循环的示例：
 ```moonscript
 print "项目: ", item for item in *items
@@ -2569,7 +3129,7 @@ print "项目: ", item for item in *items
 </pre>
 </YueDisplay>
-修饰while循环的示例：
+修饰 while 循环的示例：
 ```moonscript
 game\update! while game\isRunning!
@@ -2586,34 +3146,32 @@ reader\parse_line! until reader\eof!
 ## switch 语句
-switch语句是为了简化检查一系列相同值的if语句而提供的简写语法。要注意用于比较检查的目标值只会计算一次。和if语句一样，switch语句在最后可以接一个else代码块来处理没有匹配的情况。在生成的Lua代码中，进行比较是使用==操作符完成的。
+switch 语句是为了简化检查一系列相同值的if语句而提供的简写语法。要注意用于比较检查的目标值只会计算一次。和 if 语句一样，switch 语句在最后可以接一个 else 代码块来处理没有匹配的情况。在生成的 Lua 代码中，进行比较是使用 == 操作符完成的。switch 语句中也可以使用赋值表达式来储存临时变量值。
 ```moonscript
-name = "Dan"
+switch name := "Dan"
-switch name
  when "Robert"
    print "你是Robert"
  when "Dan", "Daniel"
    print "你的名字是Dan"
  else
-    print "我不知道你的名字"
+    print "我不认识你，你的名字是#{name}"
 ```
 <YueDisplay>
 <pre>
-name = "Dan"
+switch name := "Dan"
-switch name
  when "Robert"
    print "你是Robert"
  when "Dan", "Daniel"
    print "你的名字是Dan"
  else
-    print "我不知道你的名字"
+    print "我不认识你，你的名字是#{name}"
 </pre>
 </YueDisplay>
-switch语句的when子句中可以通过使用逗号分隔的列表来匹配多个值。
+switch 语句的 when 子句中可以通过使用逗号分隔的列表来匹配多个值。
-switch语句也可以作为表达式使用，下面我们可以将switch语句返回的结果分配给一个变量：
+switch 语句也可以作为表达式使用，下面我们可以将 switch 语句返回的结果分配给一个变量：
 ```moonscript
 b = 1
@@ -2638,7 +3196,7 @@ next_number = switch b
 </pre>
 </YueDisplay>
-我们可以使用then关键字在when子句的同一行上编写处理代码。else代码块的后续代码中要写在同一行上不需要额外的关键字。
+我们可以使用 then 关键字在 when 子句的同一行上编写处理代码。else 代码块的后续代码中要写在同一行上不需要额外的关键字。
 ```moonscript
 msg = switch math.random(1, 5)
@@ -2655,7 +3213,7 @@ msg = switch math.random(1, 5)
 </pre>
 </YueDisplay>
-如果在编写switch语句时希望少写一个缩进，那么你可以把第一个when子句放在switch开始语句的第一行，然后后续的子语句就都可以都少写一个缩进。
+如果在编写 switch 语句时希望少写一个缩进，那么你可以把第一个 when 子句放在 switch 开始语句的第一行，然后后续的子语句就都可以都少写一个缩进。
 ```moonscript
 switch math.random(1, 5)
@@ -2684,11 +3242,11 @@ else
 </pre>
 </YueDisplay>
-值得注意的是，在生成Lua代码时，我们要做检查的目标变量会放在==表达式的右侧。当您希望给when子句的比较对象定义一个\_\_eq元方法来重载判断逻辑时，可能会有用。
+值得注意的是，在生成 Lua 代码时，我们要做检查的目标变量会放在 == 表达式的右侧。当你希望给 when 子句的比较对象定义一个 \_\_eq 元方法来重载判断逻辑时，可能会有用。
 ### 表格匹配
-在switch的when子句中，如果期待检查目标是一个表格，且可以通过特定的结构进行解构并获得非nil值，那么你可以尝试使用表格匹配的语法。
+在 switch 的 when 子句中，如果期待检查目标是一个表格，且可以通过特定的结构进行解构并获得非 nil 值，那么你可以尝试使用表格匹配的语法。
 ```moonscript
 items =
@@ -2744,9 +3302,126 @@ switch item
 </pre>
 </YueDisplay>
+你也可以匹配数组元素、表格字段，甚至使用数组或表格字面量来匹配嵌套的结构。
+匹配数组元素。
+```moonscript
+switch tb
+  when [1, 2, 3]
+    print "1, 2, 3"
+  when [1, b, 3]
+    print "1, #{b}, 3"
+  when [1, 2, b = 3] -- 变量b有默认值
+    print "1, 2, #{b}"
+```
+<YueDisplay>
+<pre>
+switch tb
+  when [1, 2, 3]
+    print "1, 2, 3"
+  when [1, b, 3]
+    print "1, #{b}, 3"
+  when [1, 2, b = 3] -- 变量b有默认值
+    print "1, 2, #{b}"
+</pre>
+</YueDisplay>
+匹配表格字段。
+```moonscript
+switch tb
+  when success: true, :result
+    print "成功", result
+  when success: false
+    print "失败", result
+  else
+    print "无效值"
+```
+<YueDisplay>
+<pre>
+switch tb
+  when success: true, :result
+    print "成功", result
+  when success: false
+    print "失败", result
+  else
+    print "无效值"
+</pre>
+</YueDisplay>
+匹配嵌套的表格结构。
+```moonscript
+switch tb
+  when data: {type: "success", :content}
+    print "成功", content
+  when data: {type: "error", :content}
+    print "失败", content
+  else
+    print "无效值"
+```
+<YueDisplay>
+<pre>
+switch tb
+  when data: {type: "success", :content}
+    print "成功", content
+  when data: {type: "error", :content}
+    print "失败", content
+  else
+    print "无效值"
+</pre>
+</YueDisplay>
+匹配表格数组。
+```moonscript
+switch tb
+  when [
+      {a: 1, b: 2}
+      {a: 3, b: 4}
+      {a: 5, b: 6}
+      fourth
+    ]
+    print "匹配成功", fourth
+```
+<YueDisplay>
+<pre>
+switch tb
+  when [
+      {a: 1, b: 2}
+      {a: 3, b: 4}
+      {a: 5, b: 6}
+      fourth
+    ]
+    print "匹配成功", fourth
+</pre>
+</YueDisplay>
+匹配一个列表并捕获特定范围内的元素。
+```moonscript
+segments = ["admin", "users", "logs", "view"]
+switch segments
+  when [...groups, resource, action]
+    print "Group:", groups -- 打印: {"admin", "users"}
+    print "Resource:", resource -- 打印: "logs"
+    print "Action:", action -- 打印: "view"
+```
+<YueDisplay>
+<pre>
+segments = ["admin", "users", "logs", "view"]
+switch segments
+  when [...groups, resource, action]
+    print "Group:", groups -- 打印: {"admin", "users"}
+    print "Resource:", resource -- 打印: "logs"
+    print "Action:", action -- 打印: "view"
+</pre>
+</YueDisplay>
 ## 面向对象编程
-在以下的示例中，月之脚本生成的Lua代码可能看起来会很复杂。所以最好主要关注月之脚本代码层面的意义，然后如果您想知道关于面向对象功能的实现细节，再查看Lua代码。
+在以下的示例中，月之脚本生成的 Lua 代码可能看起来会很复杂。所以最好主要关注月之脚本代码层面的意义，然后如果你想知道关于面向对象功能的实现细节，再查看 Lua 代码。
 一个简单的类：
@@ -2775,11 +3450,11 @@ class Inventory
 </pre>
 </YueDisplay>
-在月之脚本中采用面向对象的编程方式时，通常会使用类声明语句结合Lua表格字面量来做类定义。这个类的定义包含了它的所有方法和属性。在这种结构中，键名为“new”的成员扮演了一个重要的角色，是作为构造函数来使用。
+在月之脚本中采用面向对象的编程方式时，通常会使用类声明语句结合 Lua 表格字面量来做类定义。这个类的定义包含了它的所有方法和属性。在这种结构中，键名为 “new” 的成员扮演了一个重要的角色，是作为构造函数来使用。
-值得注意的是，类中的方法都采用了粗箭头函数语法。当在类的实例上调用方法时，该实例会自动作为第一个参数被传入，因此粗箭头函数用于生成一个名为“self”的参数。
+值得注意的是，类中的方法都采用了粗箭头函数语法。当在类的实例上调用方法时，该实例会自动作为第一个参数被传入，因此粗箭头函数用于生成一个名为 “self” 的参数。
-此外，“@”前缀在变量名上起到了简化作用，代表“self”。例如，`@items` 就等同于 `self.items`。
+此外，“@” 前缀在变量名上起到了简化作用，代表 “self”。例如，`@items` 就等同于 `self.items`。
 为了创建类的一个新实例，可以将类名当作一个函数来调用，这样就可以生成并返回一个新的实例。
@@ -2801,7 +3476,7 @@ inv\add_item "pants"
 需要特别注意的是，类的所有属性在其实例之间是共享的。这对于函数类型的成员属性通常不会造成问题，但对于其他类型的属性，可能会导致意外的结果。
-例如，在下面的示例中，clothes属性在所有实例之间共享。因此，对这个属性在一个实例中的修改，将会影响到其他所有实例。
+例如，在下面的示例中，clothes 属性在所有实例之间共享。因此，对这个属性在一个实例中的修改，将会影响到其他所有实例。
 ```moonscript
 class Person
@@ -2853,7 +3528,7 @@ class Person
 ### 继承
-`extends`关键字可以在类声明中使用，以继承另一个类的属性和方法。
+`extends` 关键字可以在类声明中使用，以继承另一个类的属性和方法。
 ```moonscript
 class BackPack extends Inventory
@@ -2873,11 +3548,11 @@ class BackPack extends Inventory
 </YueDisplay>
-在这一部分，我们对月之脚本中的`Inventory`类进行了扩展，加入了对可以携带物品数量的限制。
+在这一部分，我们对月之脚本中的 `Inventory` 类进行了扩展，加入了对可以携带物品数量的限制。
-在这个特定的例子中，子类并没有定义自己的构造函数。因此，当创建一个新的实例时，系统会默认调用父类的构造函数。但如果我们在子类中定义了构造函数，我们可以利用`super`方法来调用并执行父类的构造函数。
+在这个特定的例子中，子类并没有定义自己的构造函数。因此，当创建一个新的实例时，系统会默认调用父类的构造函数。但如果我们在子类中定义了构造函数，我们可以利用 `super` 方法来调用并执行父类的构造函数。
-此外，当一个类继承自另一个类时，它会尝试调用父类上的`__inherited`方法（如果这个方法存在的话），以此来向父类发送通知。这个`__inherited`函数接受两个参数：被继承的父类和继承的子类。
+此外，当一个类继承自另一个类时，它会尝试调用父类上的 `__inherited` 方法（如果这个方法存在的话），以此来向父类发送通知。这个 `__inherited` 函数接受两个参数：被继承的父类和继承的子类。
 ```moonscript
 class Shelf
@@ -2900,15 +3575,15 @@ class Cupboard extends Shelf
 ### super 关键字
-`super`是一个特别的关键字，它有两种不同的使用方式：既可以当作一个对象来看待，也可以像调用函数那样使用。它仅在类的内部使用时具有特殊的功能。
+`super` 是一个特别的关键字，它有两种不同的使用方式：既可以当作一个对象来看待，也可以像调用函数那样使用。它仅在类的内部使用时具有特殊的功能。
-当`super`被作为一个函数调用时，它将调用父类中与之同名的函数。此时，当前的`self`会自动作为第一个参数传递，正如上面提到的继承示例所展示的那样。
+当 `super` 被作为一个函数调用时，它将调用父类中与之同名的函数。此时，当前的 `self` 会自动作为第一个参数传递，正如上面提到的继承示例所展示的那样。
-在将`super`当作普通值使用时，它实际上是对父类对象的引用。通过这种方式，我们可以访问父类中可能被子类覆盖的值，就像访问任何普通对象一样。
+在将 `super` 当作普通值使用时，它实际上是对父类对象的引用。通过这种方式，我们可以访问父类中可能被子类覆盖的值，就像访问任何普通对象一样。
-此外，当使用`\`操作符与`super`一起使用时，`self`将被插入为第一个参数，而不是使用`super`本身的值。而在使用`.`操作符来检索函数时，则会返回父类中的原始函数。
+此外，当使用 `\` 操作符与 `super` 一起使用时，`self`将被插入为第一个参数，而不是使用 `super` 本身的值。而在使用`.`操作符来检索函数时，则会返回父类中的原始函数。
-下面是一些使用`super`的不同方法的示例：
+下面是一些使用 `super` 的不同方法的示例：
 ```moonscript
 class MyClass extends ParentClass
@@ -2967,9 +3642,9 @@ print BackPack.size -- 打印 10
 如果在类对象的元表中找不到某个属性，系统会从基表中检索该属性。这就意味着我们可以直接从类本身访问到其方法和属性。
-需要特别注意的是，对类对象的赋值并不会影响到基表，因此这不是向实例添加新方法的正确方式。相反，需要直接修改基表。关于这点，可以参考下面的“__base”字段。
+需要特别注意的是，对类对象的赋值并不会影响到基表，因此这不是向实例添加新方法的正确方式。相反，需要直接修改基表。关于这点，可以参考下面的 “__base” 字段。
-此外，类对象包含几个特殊的属性：当类被声明时，类的名称会作为一个字符串存储在类对象的“__name”字段中。
+此外，类对象包含几个特殊的属性：当类被声明时，类的名称会作为一个字符串存储在类对象的 “__name” 字段中。
 ```moonscript
 print BackPack.__name -- 打印 Backpack
@@ -3051,7 +3726,7 @@ print Counter.count -- 输出 2
 ### 类声明语句
-在类声明的主体中，除了键/值对外，我们还可以编写普通的表达式。在这种类声明体中的普通代码的上下文中，self等于类对象，而不是实例对象。
+在类声明的主体中，除了键/值对外，我们还可以编写普通的表达式。在这种类声明体中的普通代码的上下文中，self 等于类对象，而不是实例对象。
 以下是创建类变量的另一种方法：
@@ -3091,9 +3766,9 @@ class MoreThings
 ### @ 和 @@ 值
-当@和@@前缀在一个名字前时，它们分别代表在self和self.\_\_class中访问的那个名字。
+当 @ 和 @@ 前缀在一个名字前时，它们分别代表在 self 和 self.\_\_class 中访问的那个名字。
-如果它们单独使用，它们是self和self.\_\_class的别名。
+如果它们单独使用，它们是 self 和 self.\_\_class 的别名。
 ```moonscript
 assert @ == self
@@ -3106,7 +3781,7 @@ assert @@ == self.__class
 </pre>
 </YueDisplay>
-例如，使用@@从实例方法快速创建同一类的新实例的方法：
+例如，使用 @@ 从实例方法快速创建同一类的新实例的方法：
 ```moonscript
 some_instance_method = (...) => @@ ...
@@ -3184,7 +3859,7 @@ x = class Bucket
 ### 匿名类
-声明类时可以省略名称。如果类的表达式不在赋值语句中，\_\_name属性将为nil。如果出现在赋值语句中，赋值操作左侧的名称将代替nil。
+声明类时可以省略名称。如果类的表达式不在赋值语句中，\_\_name 属性将为 nil。如果出现在赋值语句中，赋值操作左侧的名称将代替 nil。
 ```moonscript
 BigBucket = class extends Bucket
@@ -3214,7 +3889,7 @@ x = class
 ### 类混合
-您可以通过使用 `using` 关键字来实现类混合。这意味着您可以从一个普通 Lua 表格或已定义的类对象中，复制函数到您创建的新类中。当您使用普通 Lua 表格进行类混合时，您有机会用自己的实现来重写类的索引方法（例如元方法 `__index`）。然而，当您从一个类对象做混合时，需要注意的是该类对象的元方法将不会被复制到新类。
+你可以通过使用 `using` 关键字来实现类混合。这意味着你可以从一个普通 Lua 表格或已定义的类对象中，复制函数到你创建的新类中。当你使用普通 Lua 表格进行类混合时，你有机会用自己的实现来重写类的索引方法（例如元方法 `__index`）。然而，当你从一个类对象做混合时，需要注意的是该类对象的元方法将不会被复制到新类。
 ```moonscript
 MyIndex = __index: var: 1
@@ -3255,11 +3930,11 @@ assert y.__class.__parent ~= X -- X 不是 Y 的父类
 ## with 语句
-在编写Lua代码时，我们在创建对象后的常见操作是立即调用这个对象一系列操作函数并设置一系列属性。
+在编写 Lua 代码时，我们在创建对象后的常见操作是立即调用这个对象一系列操作函数并设置一系列属性。
 这导致在代码中多次重复引用对象的名称，增加了不必要的文本噪音。一个常见的解决方案是在创建对象时，在构造函数传入一个表，该表包含要覆盖设置的键和值的集合。这样做的缺点是该对象的构造函数必须支持这种初始化形式。
-with块有助于简化编写这样的代码。在with块内，我们可以使用以.或\开头的特殊语句，这些语句代表我们正在使用的对象的操作。
+with 块有助于简化编写这样的代码。在 with 块内，我们可以使用以 . 或 \ 开头的特殊语句，这些语句代表我们正在使用的对象的操作。
 例如，我们可以这样处理一个新创建的对象：
@@ -3280,7 +3955,7 @@ with Person!
 </pre>
 </YueDisplay>
-with语句也可以用作一个表达式，并返回它的代码块正在处理的对象。
+with 语句也可以用作一个表达式，并返回它的代码块正在处理的对象。
 ```moonscript
 file = with File "favorite_foods.txt"
@@ -3314,24 +3989,24 @@ me = create_person "Leaf", [dad, mother, sister]
 </pre>
 </YueDisplay>
-在此用法中，with可以被视为K组合子（k-combinator）的一种特殊形式。
+在此用法中，with 可以被视为K组合子（k-combinator）的一种特殊形式。
-如果������给表达式另外起一个名称的话，with语句中的表达式也可以是一个赋值语句。
+如果你想给表达式另外起一个名称的话，with 语句中的表达式也可以是一个赋值语句。
 ```moonscript
-with str = "你好"
+with str := "你好"
  print "原始:", str
  print "大写:", \upper!
 ```
 <YueDisplay>
 <pre>
-with str = "你好"
+with str := "你好"
  print "原始:", str
  print "大写:", \upper!
 </pre>
 </YueDisplay>
-在with语句中可������用`[]`访问特殊键。
+你���以��� `with` 语句中使用 `[]` 访问特殊键。
 ```moonscript
 with tb
@@ -3354,9 +4029,22 @@ with tb
 </pre>
 </YueDisplay>
+`with?` 是 `with` 语法的一个增强版本，引入了存在性检查，用于在不显式判空的情况下安全访问可能为 nil 的对象。
+```moonscript
+with? obj
+  print obj.name
+```
+<YueDisplay>
+<pre>
+with? obj
+  print obj.name
+</pre>
+</YueDisplay>
 ## do 语句
-当用作语句时，do语句的作用就像在Lua中差不多。
+当用作语句时，do 语句的作用就像在 Lua 中差不多。
 ```moonscript
 do
@@ -3373,7 +4061,7 @@ print var -- 这里是nil
 </pre>
 </YueDisplay>
-月之脚本的 **do** 也可以用作表达式。允许您将多行代码的处理合并为一个表达式，并将do语句代码块的最后一个语句作为表达式返回的结果。
+月之脚本的 **do** 也可以用作表达式。允许你将多行代码的处理合并为一个表达式，并将 do 语句代码块的最后一个语句作为表达式返回的结果。
 ```moonscript
 counter = do
@@ -3557,7 +4245,7 @@ print i, k -- 这些已经被更新
 ## 月之脚本语言库
-使用`require("yue")`来访问。
+使用 `require("yue")` 来访问。
 ### yue
@@ -3615,9 +4303,9 @@ yue_compiled: {string: string}
 **签名：**
 ```lua
 to_lua: function(code: string, config?: Config):
-                --[[codes]] string | nil,
+    --[[codes]] string | nil,
-                --[[error]] string | nil,
+    --[[error]] string | nil,
-                --[[globals]] {{string, integer, integer}} | nil
+    --[[globals]] {{string, integer, integer}} | nil
 ```
 **参数：**
@@ -3740,8 +4428,8 @@ remove_loader: function(): boolean
 **签名：**
 ```lua
 loadstring: function(input: string, chunkname: string, env: table, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
+    --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[error]] string | nil
 ```
 **参数：**
@@ -3771,8 +4459,8 @@ loadstring: function(input: string, chunkname: string, env: table, config?: Conf
 **签名：**
 ```lua
 loadstring: function(input: string, chunkname: string, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
+    --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[error]] string | nil
 ```
 **参数：**
@@ -3801,8 +4489,8 @@ loadstring: function(input: string, chunkname: string, config?: Config):
 **签名：**
 ```lua
 loadstring: function(input: string, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
+    --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[error]] string | nil
 ```
 **参数：**
@@ -3830,8 +4518,8 @@ loadstring: function(input: string, config?: Config):
 **签名：**
 ```lua
 loadfile: function(filename: string, env: table, config?: Config):
-                nil | function(...: any): (any...),
+    nil | function(...: any): (any...),
-                string | nil
+    string | nil
 ```
 **参数：**
@@ -3860,8 +4548,8 @@ loadfile: function(filename: string, env: table, config?: Config):
 **签名：**
 ```lua
 loadfile: function(filename: string, config?: Config):
-                nil | function(...: any): (any...),
+    nil | function(...: any): (any...),
-                string | nil
+    string | nil
 ```
 **参数：**
@@ -4116,9 +4804,9 @@ type AST = {string, integer, integer, any}
 **签名：**
 ```lua
-to_ast: function(code: string, flattenLevel?: number, astName?: string):
+to_ast: function(code: string, flattenLevel?: number, astName?: string, reserveComment?: boolean):
-                --[[AST]] AST | nil,
+    --[[AST]] AST | nil,
-                --[[error]] nil | string
+    --[[error]] nil | string
 ```
 **参数：**
@@ -4127,6 +4815,42 @@ to_ast: function(code: string, flattenLevel?: number, astName?: string):
 | --- | --- | --- |
 | code | string | 代码。 |
 | flattenLevel | integer | [可选] 扁平化级别。级别越高，会消除更多的 AST 结构的嵌套。默认为 0。最大为 2。 |
+| astName | string | [可选] AST 名称。默认为 "File"。 |
+| reserveComment | boolean | [可选] 是否保留原始注释。默认为 false。 |
+**返回值：**
+| 返回类型 | 描述 |
+| --- | --- |
+| AST \| nil | AST，如果转换失败则为 nil。 |
+| string \| nil | 错误消息，如果转换成功则为 nil。 |
+#### format
+**类型：** 函数。
+**描述：**
+格式化 YueScript 代码。
+**签名：**
+```lua
+format: function(code: string, tabSize?: number, reserveComment?: boolean): string
+```
+**参数：**
+| 参数名 | 类型 | 描述 |
+| --- | --- | --- |
+| code | string | 代码。 |
+| tabSize | integer | [可选] 制表符大小。默认为 4。 |
+| reserveComment | boolean | [可选] 是否保留原始注释。默认为 true。 |
+**返回值：**
+| 返回类型 | 描述 |
+| --- | --- |
+| string | 格式化后的代码。 |
 #### __call
@@ -4199,6 +4923,19 @@ implicit_return_root: boolean
 reserve_line_number: boolean
 ```
+#### reserve_comment
+**类型：** 成员变量。
+**描述：**
+编译器是否应该在编译后的代码中保留原始注释。
+**签名：**
+```lua
+reserve_comment: boolean
+```
 #### space_over_tab
 **类型：** 成员变量。
@@ -4249,11 +4986,11 @@ line_offset: integer
 **签名：**
 ```lua
 enum LuaTarget
-        "5.1"
+  "5.1"
-        "5.2"
+  "5.2"
-        "5.3"
+  "5.3"
-        "5.4"
+  "5.4"
-        "5.5"
+  "5.5"
 end
 ```
@@ -4332,8 +5069,8 @@ simplified: boolean
 版权 (c) 2017-2025 李瑾  \<dragon-fly@qq.com\>
-特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，以及再授权被配发了本软件的人如上的权利，须在下列条件下：  
+特此免费授予任何获得本软件副本和相关文档文件（下称“软件”）的人不受限制地处置该软件的权利，包括不受限制地使用、复制、修改、合并、发布、分发、转授许可和/或出售该软件副本，以及再授权被配发了本软件的人如上的权利，须在下列条件下：
-上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。  
+上述版权声明和本许可声明应包含在该软件的所有副本或实质成分中。
 本软件是“如此”提供的，没有任何形式的明示或暗示的保证，包括但不限于对适销性、特定用途的适用性和不侵权的保证。在任何情况下，作者或版权持有人都不对任何索赔、损害或其他责任负责，无论这些追责来自合同、侵权或其它行为中，还是产生于、源于或有关于本软件以及本软件的使用或其它处置。
 <CompilerModal />
diff --git a/makefile b/makefile
index d1b074a..047718a 100644
--- a/makefile
+++ b/makefile
@@ -3,6 +3,7 @@
 BIN_NAME := yue
 # Compiler used
 CXX ?= g++
+CC ?= gcc
 # Extension of source files used in the project
 SRC_EXT = cpp
 # Path to the source directory, relative to the makefile
@@ -10,7 +11,7 @@ SRC_PATH = ./src
 # Space-separated pkg-config libraries used by this project
 LIBS =
 # General compiler flags
-COMPILE_FLAGS = -std=c++17 -Wall -Wextra -Wno-deprecated-declarations
+COMPILE_FLAGS = -std=c++17 -Wall -Wextra -DYUE_UTF8_IMPL
 # Additional release-specific flags
 RCOMPILE_FLAGS = -D NDEBUG -O3
 # Additional debug-specific flags
@@ -54,13 +55,42 @@ endif
        INCLUDES += -I $(SRC_PATH)/3rdParty/lua
        LINK_FLAGS += -L $(SRC_PATH)/3rdParty/lua -llua -ldl
 endif
+# Detect Android Termux environment
+# Termux typically has ANDROID_ROOT environment variable set and PREFIX points to Termux directory
+IS_TERMUX := false
+ANDROID_ROOT_VAR := $(shell echo $$ANDROID_ROOT)
+PREFIX_VAR := $(shell echo $$PREFIX)
+ifneq ($(ANDROID_ROOT_VAR),)
+        # Check if PREFIX environment variable points to Termux directory
+        ifneq ($(PREFIX_VAR),)
+                ifneq ($(findstring com.termux,$(PREFIX_VAR)),)
+                        IS_TERMUX := true
+                endif
+        endif
+        # Alternative check: verify if Termux installation path exists
+        ifeq ($(IS_TERMUX),false)
+                ifneq ($(shell test -d /data/data/com.termux/files/usr && echo yes),)
+                        IS_TERMUX := true
+                endif
+        endif
+endif
+# Auto-set NO_WATCHER for Termux environment if not explicitly set
+ifeq ($(IS_TERMUX),true)
+        ifeq ($(NO_WATCHER),)
+                NO_WATCHER := true
+                $(info Detected Android Termux environment, automatically setting NO_WATCHER=true)
+        endif
+endif
 ifeq ($(NO_WATCHER),true)
        COMPILE_FLAGS += -DYUE_NO_WATCHER
 endif
 # Add platform related linker flag
 ifneq ($(UNAME_S),Darwin)
-        LINK_FLAGS += -lstdc++fs -Wl,-E
+        LINK_FLAGS += -Wl,-E
        PLAT = linux
 else
        LINK_FLAGS += -framework CoreFoundation -framework CoreServices
@@ -96,10 +126,13 @@ endif
 # Combine compiler and linker flags
 release: export CXXFLAGS := $(CXXFLAGS) $(COMPILE_FLAGS) $(RCOMPILE_FLAGS)
+release: export CFLAGS := $(CFLAGS) $(filter-out -std=c++17,$(COMPILE_FLAGS)) $(RCOMPILE_FLAGS)
 release: export LDFLAGS := $(LDFLAGS) $(LINK_FLAGS) $(RLINK_FLAGS)
 debug: export CXXFLAGS := $(CXXFLAGS) $(COMPILE_FLAGS) $(DCOMPILE_FLAGS)
+debug: export CFLAGS := $(CFLAGS) $(filter-out -std=c++17,$(COMPILE_FLAGS)) $(DCOMPILE_FLAGS)
 debug: export LDFLAGS := $(LDFLAGS) $(LINK_FLAGS) $(DLINK_FLAGS)
 shared: export CXXFLAGS := $(CXXFLAGS) $(COMPILE_FLAGS) $(RCOMPILE_FLAGS) $(TARGET_FLAGS)
+shared: export CFLAGS := $(CFLAGS) $(filter-out -std=c++17,$(COMPILE_FLAGS)) $(RCOMPILE_FLAGS) $(TARGET_FLAGS)
 # Build and output paths
 release: export BUILD_PATH := build/release
@@ -134,9 +167,15 @@ ifeq ($(NO_LUA),true)
        SOURCES := $(filter-out $(SRC_PATH)/yuescript/yuescript.cpp, $(SOURCES))
 endif
+# Add colib ljson.c source file
+SOURCES += $(SRC_PATH)/3rdParty/colib/ljson.c
 # Set the object file names, with the source directory stripped
 # from the path, and the build path prepended in its place
-OBJECTS = $(SOURCES:$(SRC_PATH)/%.$(SRC_EXT)=$(BUILD_PATH)/%.o)
+CPP_SOURCES = $(filter %.cpp,$(SOURCES))
+C_SOURCES = $(filter %.c,$(SOURCES))
+OBJECTS = $(CPP_SOURCES:$(SRC_PATH)/%.cpp=$(BUILD_PATH)/%.o)
+OBJECTS += $(C_SOURCES:$(SRC_PATH)/%.c=$(BUILD_PATH)/%.o)
 # Set the dependency files that will be used to add header dependencies
 DEPS = $(OBJECTS:.o=.d)
@@ -225,8 +264,10 @@ wasm-node: clean
                -O2 \
                -o wasm/dist/esm/yuescript.mjs \
                -I $(SRC_PATH) \
+                -I $(SRC_PATH)/3rdParty/ \
                -I $(SRC_PATH)/3rdParty/lua \
                -std=c++17 \
+                -DYUE_UTF8_IMPL \
                --bind \
                -fexceptions \
                -Wno-deprecated-declarations \
@@ -265,8 +306,10 @@ wasm-node: clean
                -o wasm/dist/cjs/yuescript.cjs \
                --emit-tsd="yuescript.d.ts" \
                -I $(SRC_PATH) \
+                -I $(SRC_PATH)/3rdParty/ \
                -I $(SRC_PATH)/3rdParty/lua \
                -std=c++17 \
+                -DYUE_UTF8_IMPL \
                --bind \
                -fexceptions \
                -Wno-deprecated-declarations \
@@ -309,8 +352,10 @@ wasm: clean
                -O2 \
                -o doc/docs/.vuepress/public/js/yuescript.js \
                -I $(SRC_PATH) \
+                -I $(SRC_PATH)/3rdParty/ \
                -I $(SRC_PATH)/3rdParty/lua \
                -std=c++17 \
+                -DYUE_UTF8_IMPL \
                --bind \
                -fexceptions \
                -Wno-deprecated-declarations
@@ -390,8 +435,8 @@ test: debug
        @./$(BIN_NAME) $(TEST_INPUT)/loops.yue -o $(TEST_OUTPUT)/5.1/loops.lua --target=5.1
        @./$(BIN_NAME) $(TEST_INPUT)/try_catch.yue -o $(TEST_OUTPUT)/5.1/try_catch.lua --target=5.1
        @./$(BIN_NAME) $(TEST_INPUT)/attrib.yue -o $(TEST_OUTPUT)/5.1/attrib.lua --target=5.1
+        @./$(BIN_NAME) $(TEST_INPUT)/import_global.yue -o $(TEST_OUTPUT)/5.1/import_global.lua --target=5.1
        @./$(BIN_NAME) $(TEST_INPUT)/test/loops_spec.yue -o $(TEST_OUTPUT)/5.1/test/loops_spec.lua --target=5.1
-        @./$(BIN_NAME) $(TEST_INPUT)/literals.yue -o $(TEST_OUTPUT)/5.1/literals.lua --target=5.1
        @./$(BIN_NAME) -e spec/inputs/compile_doc.yue $(TEST_OUTPUT)
        @echo -en "Compile time: "
        @$(END_TIME)
@@ -410,7 +455,7 @@ gen: release
        @./$(BIN_NAME) $(TEST_INPUT)/loops.yue -o $(GEN_OUTPUT)/5.1/loops.lua --target=5.1
        @./$(BIN_NAME) $(TEST_INPUT)/try_catch.yue -o $(GEN_OUTPUT)/5.1/try_catch.lua --target=5.1
        @./$(BIN_NAME) $(TEST_INPUT)/attrib.yue -o $(GEN_OUTPUT)/5.1/attrib.lua --target=5.1
-        @./$(BIN_NAME) $(TEST_INPUT)/literals.yue -o $(GEN_OUTPUT)/5.1/literals.lua --target=5.1
+        @./$(BIN_NAME) $(TEST_INPUT)/import_global.yue -o $(GEN_OUTPUT)/5.1/import_global.lua --target=5.1
        @./$(BIN_NAME) $(TEST_INPUT)/test/loops_spec.yue -o $(GEN_OUTPUT)/5.1/test/loops_spec.lua --target=5.1
        @./$(BIN_NAME) -e spec/inputs/compile_doc.yue $(GEN_OUTPUT)
        @echo -en "Compile time: "
@@ -442,3 +487,11 @@ $(BUILD_PATH)/%.o: $(SRC_PATH)/%.$(SRC_EXT)
        $(CMD_PREFIX)$(CXX) $(CXXFLAGS) $(INCLUDES) -MP -MMD -c $< -o $@
        @echo -en "\t Compile time: "
        @$(END_TIME)
+# C source file rules
+$(BUILD_PATH)/%.o: $(SRC_PATH)/%.c
+        @echo "Compiling: $< -> $@"
+        @$(START_TIME)
+        $(CMD_PREFIX)$(CC) $(CFLAGS) $(INCLUDES) -MP -MMD -c $< -o $@
+        @echo -en "\t Compile time: "
+        @$(END_TIME)
diff --git a/spec/inputs/backcall.yue b/spec/inputs/backcall.yue
index 8aadc71..e6b8c21 100644
--- a/spec/inputs/backcall.yue
+++ b/spec/inputs/backcall.yue
@@ -13,9 +13,9 @@ do
        x > 2
 do
-        (data) <- http?.get "ajaxtest"
+        data <- http?.get "ajaxtest"
        body[".result"]\html data
-        (processed) <- http.post "ajaxprocess", data
+        processed <- http.post "ajaxprocess", data
        body[".result"]\append processed
        <- setTimeout 1000
        print "done"
diff --git a/spec/inputs/destructure.yue b/spec/inputs/destructure.yue
index 674dfe4..179056c 100644
--- a/spec/inputs/destructure.yue
+++ b/spec/inputs/destructure.yue
@@ -94,7 +94,7 @@ do
 --
 do
-        with {a,b} = thing
+        with {a,b} := thing
                print a, b
@@ -240,5 +240,53 @@ do
        switch tb
                when {c: {<"abc">: meta_field = "def"}, <[[any string]]>: {d: abc = 123}, <'str'>: {e: def = {}}}
                        print meta_field, abc, def
+do
+        clients = ["VIP_Alice", "User_Bob", "User_Clara", "VIP_Eva"]
+        [vipStart, ...regulars, vipEnd] = clients
+        print vipStart -- "VIP_Alice"
+        print regulars -- {"User_Bob", "User_Clara"}
+        print vipEnd   -- "VIP_Eva"
+do
+        setupMeeting = (participants) ->
+                [chair, ..._, secretary] = participants
+                print chair, secretary
+        setupMeeting ["Alice", "Bob", "Charlie", "David"]
+        -- Output: Alice David
+do
+        getTransactions = ->
+                {
+                        {id: "T1", amount: 100}
+                        {id: "T2", amount: 200}
+                        {id: "T3", amount: 300}
+                }
+        :id, :amount = getTransactions![#]
+        assert id == "T3"
+        assert amount == 300
+do
+        [
+                _
+                ...middle
+                _
+        ] = tb
+do
+        {a, :abc, b, :def, ...sub, d, e} = tb
+do
+        for {:a, :b} in *items
+                print a, b
+        
+        for :a, :b in *items
+                print a, b
+        
+        for :body in pairs data
+                print body if body
 nil
diff --git a/spec/inputs/funcs.yue b/spec/inputs/funcs.yue
index e647edc..d19c2d1 100644
--- a/spec/inputs/funcs.yue
+++ b/spec/inputs/funcs.yue
@@ -98,7 +98,7 @@ f(
 x = (a,
        b) ->
-         print "what"
+                print "what"
 y = (a="hi",
@@ -193,4 +193,35 @@ do
        func = (): -> check 123
        print func! -- get nil
+do
+        f = ({:a, :b, :c}) -> print a, b, c
+        f = (:a, :b, :c) -> print a, b, c
+        g = (x, :y) -> print x, y
+        i = ({a: ax = 0, b: by = 0}) -> print ax, by
+        j = (name, {id: uid = "n/a", :role = "guest"}) -> print name, uid, role
+        m = ({user: {:name, :age}, meta: {:ver = 1}}) -> print name, age, ver
+        m1 = ({user: {:name, :age}, :meta = {}}) -> print name, age, meta and meta.ver or "nil"
+        new = ({:name = "anon", :age = 0}) =>
+                @name = name
+                @age  = age
+        set = ({:name = @name, :age = @age}) =>
+                @name = name
+                @age = age
+        logKV = ({:k, :v}, ...) ->
+                print "kv:", k, v
+                print "rest count:", select "#", ...
+        macro gen = (fname) -> |
+                #{fname} = ({:a, :b = 0}) -> print a, b
+        $gen foo
+        t1 = (:a, x) -> print a, x
+        t2 = (:a) -> print a
+        w = (
+                id
+                {:x = 0, :y = 0}
+                :flag
+        ) ->
+                print id, x, y, flag
+        g1 = ({:a, a: ax}) -> print a, ax
+        g4 = ({:a, :b, ...rest}) -> print a, b
 nil
diff --git a/spec/inputs/global.yue b/spec/inputs/global.yue
index ce1cc15..4e3b8aa 100644
--- a/spec/inputs/global.yue
+++ b/spec/inputs/global.yue
@@ -82,3 +82,9 @@ do
        FooBar = "pascal case"
        FOOBAR = "all uppercase"
+do
+        global const class A
+        global const Flag = 1
+        global const const, x, y = "const", 1, 2
+        global const math, table
diff --git a/spec/inputs/import.yue b/spec/inputs/import.yue
index b8ffc24..ee1fdfc 100644
--- a/spec/inputs/import.yue
+++ b/spec/inputs/import.yue
@@ -23,7 +23,7 @@ do
                b, c from z
 do
-        import a
+        import a,
                b
                c from z
@@ -139,3 +139,13 @@ do
        import "m" as {c: d}
        import "m" as {g, {<close>: i}}
+do
+        import require
+        import string as stringlib
+        import string.format
+        import io.read as io_read
+        type = ->
+        import type as tp
+        import 月 as yue
diff --git a/spec/inputs/import_global.yue b/spec/inputs/import_global.yue
new file mode 100644
index 0000000..18f0e85
--- /dev/null
+++ b/spec/inputs/import_global.yue
@@ -0,0 +1,93 @@
+do
+        import global
+        print "hello"
+        math.random 10
+do
+        import global
+        value = 1
+        value += 2
+        print value
+do
+        local print = (msg) ->
+                return msg
+        do
+                import global
+                print "local"
+                math.random 1
+do
+        import global
+        local tostring = (v) -> "local"
+        tostring "value"
+        print tostring 123
+do
+        func = (x, y) ->
+                import global
+                return type x, tostring y, print
+        func 1, 2
+do
+        import global
+        try
+                func "hello #{world}"
+        catch err
+                print err
+do
+        import global
+        global FLAG
+        print FLAG
+        FLAG = 123
+do
+        import global
+        global Foo = 10
+        print Foo
+        Foo += 2
+do
+        import global
+        global Bar, Baz
+        Bar = 1
+        Baz = 2
+        print Bar, Baz
+do
+        import global
+        global *
+        x = 3434
+        if y then
+                x = 10
+do
+        import global
+        global ^
+        foobar = "all #{lowercase}"
+        FooBar = "pascal case"
+        FOOBAR = "all #{Uppercase}"
+do
+        import global
+        global const class A
+        global const Flag = 1
+        global const const, x, y = "const", 1, 2
+        global const math, table
+        print math, table
+do
+        import global
+        with X
+                \func 1, 2, 3
+                .tag = "abc"
+do
+        import global
+        f = ->
+                func!
+                try func
diff --git a/spec/inputs/lists.yue b/spec/inputs/lists.yue
index 921cae0..dd951a5 100644
--- a/spec/inputs/lists.yue
+++ b/spec/inputs/lists.yue
@@ -87,4 +87,194 @@ do
        [a, b] = hello
        [name = "nameless", job = "jobless"] = person
+do
+        transactions = ["T001", "T002", "T003", "T004", "T005"]
+        middleTransactions = transactions[2, -2]
+        print middleTransactions -- => {"T002", "T003", "T004"}
+do
+        logs =
+                - start: 0, end: 100
+                - start: 100, end: 200
+                - start: 200, end: 123
+        print logs[#].end -- => 123
+do
+        pendingOrders = ["O001", "O002", "O003", "O004"]
+        print pendingOrders[# - 1] -- => "O003" 
+do
+        getOrders = ->
+                {
+                        { id: "O1001", status: "pending" }
+                        { id: "O1002", status: "processing" }
+                        { id: "O1003", status: "done" }
+                }
+        lastStatus = getOrders()[#].status
+        assert lastStatus == "done"
+do
+        cloneList1 = (list) -> list[,]
+        cloneList2 = (list) -> [...list,]
+        cloneTable = (tb) -> {...tb}
+do
+        print(
+                globalTB[#]
+                a.b.c[# - 2]
+                x?\y?!.z?[# - 3]
+        )
+do
+        f = ->
+                print(
+                        globalTB[#]\end 123
+                        a.b.c[5,-5][# - 2]
+                        x?\y?!.z?[# - 3]?[, -3]
+                )
+do
+        tb = [1, 2, 3]
+        tb[#] = 40
+        tb[# - 1] = 20
+do
+        a = b = c = "x"
+        lst = []
+        lst[#] = a
+        lst[# - 1] = b
+do
+        x, y, z = 1, 2, 3
+        arr = []
+        arr[#], head = x, y
+        arr[#] = z
+do
+        triple = ["keep", "skip", "tail"]
+        [head, _, tailv] = triple
+        buf = []
+        buf[#] = head
+        buf[#] = tailv
+do
+        src = ["a", "", "c", nil, "d"]
+        collected = []
+        for item in *src
+                if item and #item > 0
+                        collected[#] = item
+do
+        nums = [1, 2, 3, 4, 5]
+        last_two = [v for v in *nums when v > 3]
+        nums[#] = last_two[1]
+        nums[#] = last_two[2]
+do
+        store = []
+        store[#] = { meta: { id: 1, ok: true }, payload: [10, 20] }
+        store[#] = { meta: { id: 1, ok: false }, payload: [10, 20, 30] }
+do
+        f = ->
+                q = []
+                tb.tmp = [n for n = 1, 4]
+                if #tb.tmp >= 3
+                        q[#] = {head: tb.tmp[1], tail: tb.tmp[#]}
+do
+        make_pair = (a, b) -> [a, b]
+        pairs = []
+        p1 = make_pair 7, 8
+        pairs[#] = p1
+        k, v = "key", 42
+        pairs[#] = {k: k, v: v}
+do
+        cfg = {mode: "safe", tags: []}
+        if cfg.mode == "safe"
+                cfg.mode = "fast"
+                cfg.tags[#] = "newbie"
+do
+        mat = [ [1,2], [3,4], [5,6]]
+        last_row = mat[#]
+        rows = []
+        rows[#] = last_row[1]
+do
+        kv = []
+        kv[#] = {k: "a", v: 1}
+        kv[#] = {k: "b", v: 2}
+        pair_last = kv[#]
+        dict = {}
+        dict[pair_last.k] = pair_last.v
+        dict[pair_last.k] = 3
+do
+        base = [ i for i = 1, 4 ]
+        pack = []
+        pack[#] = [ base[1], base[#] ]
+        pack[#] = { first: base[1], last: base[#] }
+do
+        opts = {limit: 10}
+        {:limit, :offset = 0} = opts
+        pages = []
+        pages[#] = {limit: limit, offset: offset}
+do
+        chain = { a: { b: { c: 0 } }, list: [ {x:0}, {x:0} ] }
+        chain.a.b.c = 1
+        chain.list[1].x = 10
+        chain.list[#].x = 20
+        chain.list[# - 1] = { x: 30 }
+do
+        node = {left: {v:0}, right: {v:0}}
+        bag = []
+        { :left, :right } = node
+        bag[#], left.v, right.v = "k", 1, 2
+do
+        a1, a2, a3 = 100, 200, 300
+        mix = []
+        mix[#], mix[#], meta = a1, a2, {tag: "ok"}
+do
+        cfg2 = {limit: 5, opts: {flag: false}}
+        {limit: lim, opts: opt2} = cfg2
+        bucket = {xs: []}
+        bucket.xs[#], bucket.flag, opt2.flags[] = lim, true, 123
+do
+        ret2 = ()-> 7, 8
+        box = []
+        box[#], x1 = ret2!
+do
+        q = [1, 2]
+        lastq = q[#]
+        q[# - 1] = lastq * 10
+do
+        mat2 = [[9,8], [7,6]]
+        t = { hold: nil }
+        t.hold = mat2[#][1]
+do
+        f = -> globalTB[#][#] = 1
+        f1 = -> globalTB[#][# - 1]
+do
+        tbA[] = ...tbB
+        a, tb[], b[], c = 1, ...x, 3, 4
+        data =
+                a: {1,2,3}
+                b: {4,5,6}
+        flat = [...v for k,v in pairs data]
 nil
diff --git a/spec/inputs/loops.yue b/spec/inputs/loops.yue
index c5b28b3..5df10ca 100644
--- a/spec/inputs/loops.yue
+++ b/spec/inputs/loops.yue
@@ -213,3 +213,55 @@ do
 do
        until x := func 'a', b do
                print "false expected"
+do
+        index = for i = 1, #tb
+                break i if tb[i]
+        f for i = 1, #tb
+                break i if tb[i]
+        f for i = 1, #tb
+                i if tb[i]
+        i = 1
+        ids = while tb[i]
+                i += 1
+                i - 1
+        i = 1
+        idx = while tb[i]
+                i += 1
+                break i - 1
+        f1 = ->
+                i = 1
+                f while tb[i]
+                        i += 1
+                        i - 1
+        i = 1
+        f while tb[i]
+                i += 1
+                break i - 1
+        list = for item in *items
+                switch item
+                        when type: "A", :value
+                                if value > 5
+                                        item
+do
+        repeat print 1 until true
+        x = repeat
+                a = func!
+                break a.x
+        until a.v
+        items = repeat
+                item = getItem!
+                break unless item
+                item if item.value > 0
+        until false
diff --git a/spec/inputs/macro.yue b/spec/inputs/macro.yue
index 5d5f1a9..191f09f 100644
--- a/spec/inputs/macro.yue
+++ b/spec/inputs/macro.yue
@@ -60,6 +60,11 @@ macro NumAndStr = (num, str) ->
 print $NumAndStr 123, 'xyz'
+macro NumAndStr2 = (num`Num, str`SingleString) -> |
+        [#{num}, #{str}]
+print $NumAndStr2 456, 'abc'
 $asserts item == nil
 $myconfig false
@@ -100,13 +105,14 @@ macro filter = (items, action)->
        $showMacro "filter", "[_ for _ in *#{items} when #{action}]"
 macro reduce = (items, def, action)->
-        $showMacro "reduce", "if ##{items} == 0
+        $showMacro "reduce", |
-        #{def}
+                if ##{items} == 0
-else
+                        #{def}
-        _1 = #{def}
+                else
-        for _2 in *#{items}
+                        _1 = #{def}
-                _1 = #{action}
+                        for _2 in *#{items}
-        _1"
+                                _1 = #{action}
+                        _1
 macro foreach = (items, action)->
        $showMacro "foreach", "for _ in *#{items}
@@ -154,13 +160,15 @@ macro curry = (...)->
 f = $curry x,y,z,do
        print x,y,z
-macro get_inner = (var)-> "do
+macro get_inner = (var)-> |
-        a = 1
+        do
-        a + 1"
+                a = 1
+                a + 1
-macro get_inner_hygienic = (var)-> "(->
+macro get_inner_hygienic = (var)-> |
-        local a = 1
+        (->
-        a + 1)!"
+                local a = 1
+                a + 1)!
 do
        a = 8
@@ -196,6 +204,18 @@ end
 print x
+import "yue"
+macro lua = (code`YAMLMultiline) -> {
+        code: yue.loadstring(code)!
+        type: "lua"
+}
+$lua |
+        local function f2(a)
+                return a + 1
+        end
+        x = x + f2(3)
 macro def = (fname, ...)->
        args = {...}
        last = table.remove args
@@ -317,7 +337,13 @@ $chainC(
        Destroy!
 )
-macro tb = -> "{'abc', a:123, <call>:=> 998}"
+macro tb = -> |
+        {
+                'abc'
+                a: 123
+                <call>: => 998
+        }
 print $tb[1], $tb.a, ($tb)!, $tb!
 print "current line: #{ $LINE }"
diff --git a/spec/inputs/macro_export.yue b/spec/inputs/macro_export.yue
index cc7d459..22905b5 100644
--- a/spec/inputs/macro_export.yue
+++ b/spec/inputs/macro_export.yue
@@ -8,13 +8,12 @@ export macro config = (debugging = true)->
        ""
 export macro showMacro = (name, res)->
-        if debugMacro then "
+        if debugMacro then |
-do
+                do
-        txt = #{res}
+                        txt = #{res}
-        print '[macro ' .. #{name} .. ']'
+                        print '[macro #{name}]'
-        print txt
+                        print txt
-        txt
+                        txt
-"
        else
                res
@@ -35,14 +34,16 @@ export macro copy = (src, dst, ...)->
                src != "_src_" and src != "_dst_" and dst != "_src_" and dst != "_dst_"
                "copy targets can not be _src_ or _dst_"
        )
-        "
+        copyFields = table.concat(
-do
+                ["_dst_.#{field} = _src_.#{field}" for field in *{...}]
-        local _src_, _dst_
+                "\n\t\t\t"
-        with _dst_ = #{dst}
+        )
-                with _src_ = #{src}
+        |
-#{table.concat for field in *{...} do "
+                do
-                        _dst_.#{field} = _src_.#{field}
+                        local _src_, _dst_
-"}"
+                        with _dst_ := #{dst}
+                                with _src_ := #{src}
+                                        #{copyFields}
 export macro enum = (...) ->
        items = {...}
diff --git a/spec/inputs/macro_teal.yue b/spec/inputs/macro_teal.yue
index 0cfd862..e51bcd7 100644
--- a/spec/inputs/macro_teal.yue
+++ b/spec/inputs/macro_teal.yue
@@ -4,11 +4,16 @@ $ ->
                options.target_extension = "tl"
        package.path ..= ";./spec/lib/?.lua"
-macro to_lua = (code)->
+macro to_lua = (code)-> |
-        "require('yue').to_lua(#{code}, reserve_line_number:false, same_module:true)"
+        require('yue').to_lua #{code},
+                reserve_line_number: false
+                same_module: true
-macro trim = (name)->
+macro trim = (name)-> |
-        "if result := #{name}\\match '[\\'\"](.*)[\\'\"]' then result else #{name}"
+        if result := #{name}\match '[\'"](.*)[\'"]'
+                result
+        else
+                #{name}
 export macro local = (decl, value = nil)->
        import "yue" as {options:{:tl_enabled}}
diff --git a/spec/inputs/macro_todo.yue b/spec/inputs/macro_todo.yue
index 752c9cb..c9c8f77 100644
--- a/spec/inputs/macro_todo.yue
+++ b/spec/inputs/macro_todo.yue
@@ -5,9 +5,6 @@ export macro todoInner = (module, line, msg)->
                type: "lua"
        }
-export macro todo = (msg)->
+export macro todo = (msg)-> |
-        if msg
+        $todoInner $FILE, $LINE#{msg and ", #{msg}" or ""}
-                "$todoInner $FILE, $LINE, #{msg}"
-        else
-                "$todoInner $FILE, $LINE"
diff --git a/spec/inputs/props.yue b/spec/inputs/props.yue
new file mode 100644
index 0000000..bbb7aae
--- /dev/null
+++ b/spec/inputs/props.yue
@@ -0,0 +1,61 @@
+class Props
+        __index: (name): nil =>
+                cls = @.<>
+                if item := cls.__getter?[name] -- access properties
+                        return item @
+                elseif item := rawget cls, name -- access member functions
+                        return item
+                else
+                        c = cls
+                        while c := c.<> -- recursive to access base classes
+                                if item := c.__getter?[name]
+                                        cls.__getter ??= {}
+                                        cls.__getter[name] = item -- cache base properties to class
+                                        return item @
+                                elseif item := rawget c, name
+                                        rawset cls, name, item -- cache base member to class
+                                        return item
+        __newindex: (name, value) =>
+                cls = @.<>
+                if item := cls.__setter?[name] -- access properties
+                        item @, value
+                else
+                        c = cls
+                        while c := c.<> -- recursive to access base classes
+                                if item := c.__setter?[name]
+                                        cls.__setter ??= {}
+                                        cls.__setter[name] = item -- cache base property to class
+                                        item @, value
+                                        return
+                        rawset @, name, value -- assign field to self
+        assignReadOnly = -> error "assigning a readonly property"
+        prop: (name, props) =>
+                {
+                        :get
+                        :set = assignReadOnly
+                } = props
+                if getter := rawget @__base, "__getter"
+                        getter[name] = get
+                else
+                        rawset @__base, "__getter", [name]: get
+                if setter := rawget @__base, "__setter"
+                        setter[name] = set
+                else
+                        rawset @__base, "__setter", [name]: set
+class A extends Props
+        @prop 'x'
+                get: => @_x + 1000
+                set: (v) => @_x = v
+        new: =>
+                @_x = 0
+                
+class B extends A
+        @prop 'abc', get: => "hello"
+b = B!
+b.x = 999
+print b.x, b.abc
diff --git a/spec/inputs/string.yue b/spec/inputs/string.yue
index f91383e..611205d 100644
--- a/spec/inputs/string.yue
+++ b/spec/inputs/string.yue
@@ -74,3 +74,76 @@ _ = "hello"
 something"hello"\world!
 something "hello"\world!
+do
+        str = |
+                key: value
+        str = |
+                config:
+                        enabled: true
+                        level: 5
+        str = |
+                header: start
+                footer: end
+        str = |
+                name: #{username}
+        str = |
+                count: #{total} items
+        str = |
+                user: #{name}
+                id: #{id}
+        str = |
+                path: "C:\\Program Files\\App"
+                desc: 'single "quote" test'
+        str = |
+                key: value   
+                next: 123   
+        str = |
+                list:
+                        - "one"
+                        - "two"
+        str = |
+                -- comment
+                content text
+                -- comment
+        str = |
+                #{1 + 2}
+                #{2 + 3}
+                #{"a" .. "b"}
+        obj =
+                settings: |
+                        mode: #{mode}
+                        flags:
+                                - #{flag1}
+                                - default
+        fn = -> |
+                Hello
+                name: #{userName}
+        str = |
+                result:
+                        status: #{if ok then "pass" else "fail"}
+                        code: #{code}
+        summary = |
+                date: #{os.date()}
+                values:
+                        -
+                                a: #{aVal}
+                                b: #{bVal or defaultB}
+        msg = send |
+                Hello, #{user}!
+                Today is #{os.date("%A")}.
+        desc = do
+                prefix = "Result"
+                |
+                        #{prefix}:
+                        value: #{compute!}
+        (|
+                1
+                2
+                3
+        ) |> print
+export yaml = |
+        version: #{ver}
+        ok: true
diff --git a/spec/inputs/switch.yue b/spec/inputs/switch.yue
index 49d47f3..2b0669c 100644
--- a/spec/inputs/switch.yue
+++ b/spec/inputs/switch.yue
@@ -165,5 +165,128 @@ do
                        print item
                when [a = 1, b = "abc"]
                        print a, b
-nil
+do
+        switch tb
+                when [1, 2, 3]
+                        print "1, 2, 3"
+                when [1, b, 3]
+                        print "1, #{b}, 3"
+                when [1, 2, b = 3]
+                        print "1, 2, #{b}"
+do
+        switch tb
+                when success: true, :result
+                        print "success", result
+                when success: false
+                        print "failed", result
+                else
+                        print "invalid"
+do
+        switch tb
+                when {type: "success", :content}
+                        print "success", content
+                when {type: "error", :content}
+                        print "failed", content
+                else
+                        print "invalid"
+do
+        switch tb
+                when [
+                                {a: 1, b: 2}
+                                {a: 3, b: 4}
+                                {a: 5, b: 6}
+                                fourth
+                        ]
+                        print "matched", fourth
+        switch tb
+                when [
+                                {c: 1, d: 2}
+                                {c: 3, d: 4}
+                                {c: 5, d: 6}
+                        ]
+                        print "OK"
+                when [
+                                _
+                                _
+                                {a: 1, b: 2}
+                                {a: 3, b: 4}
+                                {a: 5, b: 6}
+                                sixth
+                        ]
+                        print "matched", sixth
+do
+        switch v := "hello"
+                when "hello"
+                        print "matched hello"
+                else
+                        print "not matched"
+        -- output: matched hello
+do
+        f = -> "ok"
+        switch val := f!
+                when "ok"
+                        print "it's ok"
+        -- output: it's ok
+do
+        g = -> 42
+        switch result := g!
+                when 1, 2
+                        print "small"
+                when 42
+                        print "life universe everything"
+                else
+                        print "other #{result}"
+        -- output: life universe everything
+do
+        check = ->
+                if true
+                        "yes"
+                else
+                        "no"
+        switch x := check!
+                when "yes"
+                        print "affirmative"
+                else
+                        print "negative"
+        -- output: affirmative
+do
+        t = (): tb ->
+                tb = {a: 1}
+                tb.a = 2
+        switch data := t!
+                when {a: 2}
+                        print "matched"
+                else
+                        print "not matched"
+do
+        clientData = ["Meta", "CUST_1001", "CHK123"]
+        switch clientData
+                when [...metadata, customerId, checksum]
+                        print metadata -- {"Meta"}
+                        print customerId -- "CUST_1001"
+                        print checksum -- "CHK123"
+do
+        handlePath = (segments) ->
+                switch segments
+                        when [..._, resource, action]
+                                print "Resource:", resource
+                                print "Action:", action
+        handlePath ["admin", "logs", "view"]
+nil
diff --git a/spec/inputs/syntax.yue b/spec/inputs/syntax.yue
index a414d6f..a63f629 100644
--- a/spec/inputs/syntax.yue
+++ b/spec/inputs/syntax.yue
@@ -7,7 +7,7 @@ a, bunch, go, here = another, world, nil, nil
 func arg1, arg2, another, arg3
 here, we = () ->, yeah
-the, different = () -> approach; yeah
+the, different = (() -> approach), yeah
 dad()
 dad(lord)
@@ -321,7 +321,7 @@ ajax url,
        (error) ->
                print error
-- 
+--
 a += 3 - 5
 a *= 3 + 5
 a *= 3
@@ -392,7 +392,7 @@ invokeA(
 v = {
        a -1
        a(
-1)
+        -1)
        a \
 - 1
        a-1
@@ -405,7 +405,7 @@ v = {
        a ~1
        a(
-~1)
+        ~1)
        a \
 ~ 1
        a~1
@@ -478,5 +478,65 @@ do
        f2 = ->
                --
+do
+        return res if res ~= ""
+do
+        return res if res ~= ""
+                --
+do
+        -- Simple one-liners
+        x = 1; y = 2
+        -- Short related statements
+        i += 1; j += 1
+        if condition
+                setup!; run!; cleanup!
+        a = 1; b = 2; c = a + b
+        print a; print b; print c
+        f = ->
+                a = 1; b = 2; a + b
+        a = 1;
+        b = 2;
+        success, result = try func!; print result if success
+        value = "foo"; print value; value = value .. "bar"; print value
+        do
+                if ok then print "ok!"; return 42
+        for i=1,3
+                print i; continue
+        n = 0
+        while n < 2
+                print "n=", n; n += 1
+        obj = {}
+        obj\set 10; obj\get!; print "done"
+        with tbl
+                \push 1; print "push"
+        a = 5
+        if a > 3
+                print "big"; b = a * 2; print b
+        else
+                print "small"; b = a
+        try
+                x = 1; y = 2; print x + y
+        catch err
+                print "error:", err
+q = 1 --[[it's q]]; --[[got w]] w = 2; e = 3; print --[[param q]] q, w, e; --[[here]] -- line ends
 nil
diff --git a/spec/inputs/tables.yue b/spec/inputs/tables.yue
index 0de8a8c..702e04a 100644
--- a/spec/inputs/tables.yue
+++ b/spec/inputs/tables.yue
@@ -245,6 +245,24 @@ menus =
                                click: ->
                        }
+_ =
+        boolean:
+                - true
+                - false
+        float:
+                - 3.14
+                - -6.8523015e+5
+        int:
+                - 123
+                - -0b1010_0111_0100_1010_1110
+        null:
+                nodeName: 'node'
+                parent: nil
+        string:
+                - 'Hello world'
+                - "newline
+newline2"
 tb = {...other}
 tbMix = {
diff --git a/spec/inputs/test/format_spec.yue b/spec/inputs/test/format_spec.yue
index cbd9d22..3ad2c7f 100644
--- a/spec/inputs/test/format_spec.yue
+++ b/spec/inputs/test/format_spec.yue
@@ -119,7 +119,7 @@ for file in *files
        original_ast = yue.to_ast code
        assert.is_not_nil original_ast
        rewriteLineCol original_ast
-        formated = yue.format code
+        formated = yue.format code, 0, false
        ast = yue.to_ast formated
        assert.is_not_nil ast
        rewriteLineCol ast
diff --git a/spec/inputs/try_catch.yue b/spec/inputs/try_catch.yue
index 4e05bc6..6c29a52 100644
--- a/spec/inputs/try_catch.yue
+++ b/spec/inputs/try_catch.yue
@@ -62,6 +62,126 @@ f = ->
        do
                <- x
                local tb, a, b, c
-                f = -> try tb.f a, b, c
+                f1 = -> try tb.f a, b, c
+        do
+                f1 = -> do
+                        ok, ... = try func!
+                        ...
+        do
+                local func
+                a, b, c = try? func!
+        
+        do
+                a, b, c = try? func!
+        do
+                a = (try? func!) ?? "default"
+        do
+                f try? func!
+        
+        do
+                f try?
+                        print 123
+                        func!
+                catch e
+                        print e
+                        e
        nil
+do
+        try
+                func 1, 2, 3
+        catch err
+                print err
+        try func 1, 2, 3
+        catch err
+                print err
+        try
+                print "trying"
+                func 1, 2, 3
+        do
+                success, result = try
+                        func 1, 2, 3
+                catch err
+                        print err
+                success, result = try func 1, 2, 3
+        tb = {}
+        try tb.func
+        try tb.func!
+        try tb.func()
+        try (tb.func!)
+        try (tb\func(1, 2, 3))
+        try tb.func 1
+        try tb.func(1)
+        if (try func 1
+        catch err
+                print err)
+                print "OK"
+        if try (func 1)
+        catch err
+                        print err
+                print "OK"
+        do
+                if success, result := try func "abc", 123
+                        print result
+                success, result = try func "abc", 123
+                catch err
+                        print err
+                print result if success, result := try func "abc", 123
+                catch err
+                        print err
+        do
+                try
+                        func 1, 2, 3
+                try func 1, 2, 3
+        do
+                <- x
+                local tb, a, b, c
+                f1 = -> try tb.f a, b, c
+        do
+                f1 = -> do
+                        ok, ... = try func!
+                        ...
+        do
+                local func
+                a, b, c = try? func!
+        
+        do
+                a, b, c = try? func!
+        do
+                a = (try? func!) ?? "default"
+        do
+                f try? func!
+        
+        do
+                f try?
+                        print 123
+                        func!
+                catch e
+                        print e
+                        e
+nil
diff --git a/spec/inputs/unicode/destructure.yue b/spec/inputs/unicode/destructure.yue
index 3c3a369..a5ffd5d 100644
--- a/spec/inputs/unicode/destructure.yue
+++ b/spec/inputs/unicode/destructure.yue
@@ -84,7 +84,7 @@ do
 --
 do
-        with {元素a,元素b} = 东西
+        with {元素a,元素b} := 东西
                打印 元素a, 元素b
diff --git a/spec/inputs/unicode/funcs.yue b/spec/inputs/unicode/funcs.yue
index c563356..cb35500 100644
--- a/spec/inputs/unicode/funcs.yue
+++ b/spec/inputs/unicode/funcs.yue
@@ -98,7 +98,7 @@ _无效变量 = -> 真名 if 某物
 变量x = (参数a,
        参数b) ->
-         打印 "什么"
+                打印 "什么"
 变量y = (参数a="hi",
diff --git a/spec/inputs/unicode/import.yue b/spec/inputs/unicode/import.yue
index c229edb..a7724ab 100644
--- a/spec/inputs/unicode/import.yue
+++ b/spec/inputs/unicode/import.yue
@@ -23,7 +23,7 @@ do
                字段b, 字段c from 对象z
 do
-        import 字段a
+        import 字段a,
                字段b
                字段c from 对象z
diff --git a/spec/inputs/unicode/macro_export.yue b/spec/inputs/unicode/macro_export.yue
index 3c9a942..56571cd 100644
--- a/spec/inputs/unicode/macro_export.yue
+++ b/spec/inputs/unicode/macro_export.yue
@@ -37,8 +37,8 @@ export macro 复制 = (源, 目标, ...)->
        "
 do
        local _源_, _目标_
-        with _目标_ = #{目标}
+        with _目标_ := #{目标}
-                with _源_ = #{源}
+                with _源_ := #{源}
 #{table.concat for 字段 in *{...} do "
                        _目标_.#{字段} = _源_.#{字段}
 "}"
diff --git a/spec/inputs/unicode/syntax.yue b/spec/inputs/unicode/syntax.yue
index 8a98416..939579b 100644
--- a/spec/inputs/unicode/syntax.yue
+++ b/spec/inputs/unicode/syntax.yue
@@ -7,7 +7,7 @@
 函数 参数1, 参数2, 另外, 参数3
 这里, 我们 = () ->, 是的
-这个, 不同 = () -> 方法; 是的
+这个, 不同 = (() -> 方法), 是的
 爸爸()
 爸爸(主)
@@ -376,7 +376,7 @@ with 对象
 变量v = {
        变量a -1
        变量a(
-1)
+        -1)
        变量a \
 - 1
        变量a-1
@@ -389,7 +389,7 @@ with 对象
        变量a ~1
        变量a(
-~1)
+        ~1)
        变量a \
 ~ 1
        变量a~1
diff --git a/spec/inputs/unicode/vararg.yue b/spec/inputs/unicode/vararg.yue
index e59e114..b508fbb 100644
--- a/spec/inputs/unicode/vararg.yue
+++ b/spec/inputs/unicode/vararg.yue
@@ -55,12 +55,12 @@
        _ = ->
                列表 = {1, 2, 3, 4, 5}
                函数名 = (确定) ->
-                  确定, table.unpack 列表
+                        确定, table.unpack 列表
                确定, ... = 函数名 true
                打印 确定, ...
                多参数函数 = ->
-                  10, nil, 20, nil, 30
+                        10, nil, 20, nil, 30
                ... = 多参数函数!
                打印 select "#", ...
diff --git a/spec/inputs/unicode/whitespace.yue b/spec/inputs/unicode/whitespace.yue
index efe55ce..151789a 100644
--- a/spec/inputs/unicode/whitespace.yue
+++ b/spec/inputs/unicode/whitespace.yue
@@ -97,19 +97,19 @@ v = ->
                        变量c -- v3
 v1, v2, \
-        v3 = ->
+        v3 = (->
-        变量a; \-- 函数结束于v1
+        变量a), \-- 函数结束于v1
                变量b, \-- v2
                        变量c -- v3
 变量a, 变量b, \
        变量c, 变量d, \
 变量e, 变量f = 1, \
-        f2
+        (f2
-                :abc; \-- 参数2
+                :abc), \-- 参数2
                3, \
                        4, \
-                                函数5 abc; \-- 参数5
+                                函数5(abc), \-- 参数5
                                        6
 for 变量a, \-- 解构1
diff --git a/spec/inputs/unicode/with.yue b/spec/inputs/unicode/with.yue
index ecbfdab..3c15add 100644
--- a/spec/inputs/unicode/with.yue
+++ b/spec/inputs/unicode/with.yue
@@ -45,19 +45,19 @@ do
        with 变量a
                打印 .世界
-        模块 = with _模块 = {}
+        模块 = with _模块 := {}
                .事物 = "你好"
-        with 变量a, 变量b = 东西, 布
+        with 变量a, 变量b := 东西, 布
                打印 .世界
-        变量x = with 变量a, 变量b = 1, 2
+        变量x = with 变量a, 变量b := 1, 2
                打印 变量a + 变量b
-        打印 with 变量a, 变量b = 1, 2
+        打印 with 变量a, 变量b := 1, 2
                打印 变量a + 变量b
-        p = with 你好!.字段x, 世界!.字段y = 1, 2
+        p = with 你好!.字段x, 世界!.字段y := 1, 2
                打印 变量a + 变量b
 --
@@ -68,16 +68,16 @@ do
                变量x\大写!
 do
-        with 变量k = "乔"
+        with 变量k := "乔"
                打印 \大写!
 do
-        with 变量a,变量b,变量c = "", "", ""
+        with 变量a,变量b,变量c := "", "", ""
                打印 \大写!
 do
        变量a = "床铺"
-        with 变量a,变量b,变量c = "", "", ""
+        with 变量a,变量b,变量c := "", "", ""
                打印 \大写!
 do
@@ -85,7 +85,7 @@ do
                打印 \大写!
 do
-        with 变量k.变量j = "乔"
+        with 变量k.变量j := "乔"
                打印 \大写!
 do
@@ -96,7 +96,7 @@ do
 do
        with 变量a
-                with .b = 2
+                with .b := 2
                        打印 .c
 do
@@ -131,12 +131,12 @@ do
 do
        global 掩码
-        with? 掩码 = 实心矩形 宽: w, 高: h, 颜色: 0x66000000
+        with? 掩码 := 实心矩形 宽: w, 高: h, 颜色: 0x66000000
                .触摸启用 = true
                .吞噬触摸 = true
 do
-        with? 掩码 = 实心矩形 宽: w, 高: h, 颜色: 0x66000000
+        with? 掩码 := 实心矩形 宽: w, 高: h, 颜色: 0x66000000
                .触摸启用 = true
                .吞噬触摸 = true
diff --git a/spec/inputs/vararg.yue b/spec/inputs/vararg.yue
index 941cd97..4f8a0d7 100644
--- a/spec/inputs/vararg.yue
+++ b/spec/inputs/vararg.yue
@@ -55,12 +55,12 @@ join = (...) ->
        _ = ->
                list = {1, 2, 3, 4, 5}
                fn = (ok) ->
-                  ok, table.unpack list
+                        ok, table.unpack list
                ok, ... = fn true
                print ok, ...
                fn_many_args = ->
-                  10, nil, 20, nil, 30
+                        10, nil, 20, nil, 30
                ... = fn_many_args!
                print select "#", ...
@@ -86,3 +86,47 @@ join = (...) ->
                print ...
        nil
+do
+        f1 = (...t) ->
+                print t.n
+                print #t
+                for i = 1, t.n
+                        print t[i]
+        f1 1, 2, 3
+        f1 "a", "b", "c", "d"
+        f1!
+        f2 = (...args) ->
+                print "args count:", args.n
+                print "args length:", #args
+                for i = 1, args.n
+                        if args[i] == nil
+                                print "position", i, "is nil"
+                        else
+                                print "position", i, ":", args[i]
+        f2 1, nil, 3, nil, 5
+        f3 = (prefix, ...items) ->
+                result = {}
+                for i = 1, items.n
+                        result[i] = prefix .. tostring items[i]
+                result
+        f3 "item_", 1, 2, 3
+        f4 = (...empty) ->
+                print "empty count:", empty.n
+                print "empty length:", #empty
+        f4!
+        process = (...data) ->
+                sum = 0
+                for i = 1, data.n
+                        if type(data[i]) == "number"
+                                sum += data[i]
+                sum
+        process 1, 2, 3, "skip", 5
diff --git a/spec/inputs/whitespace.yue b/spec/inputs/whitespace.yue
index 2655961..e501d3d 100644
--- a/spec/inputs/whitespace.yue
+++ b/spec/inputs/whitespace.yue
@@ -128,19 +128,19 @@ v = ->
                        c -- v3
 v1, v2, \
-        v3 = ->
+        v3 = (->
-        a; \-- end of function for v1
+        a), \-- end of function for v1
                b, \-- v2
                        c -- v3
 a, b, \
        c, d, \
 e, f = 1, \
-        f2
+        (f2
-                :abc; \-- arg2
+                :abc), \-- arg2
                3, \
                        4, \
-                                f5 abc; \-- arg5
+                                f5(abc), \-- arg5
                                        6
 for a, \-- destruct 1
diff --git a/spec/inputs/with.yue b/spec/inputs/with.yue
index 19b7be1..19ed2a7 100644
--- a/spec/inputs/with.yue
+++ b/spec/inputs/with.yue
@@ -48,21 +48,21 @@ do
        with a -- only one value allowed
                print .world
-        mod = with _M = {}
+        mod = with _M := {}
                .Thing = "hi"
        -- operate on a only
-        with a, b = something, pooh
+        with a, b := something, pooh
                print .world
-        x = with a, b = 1, 2
+        x = with a, b := 1, 2
                print a + b
-        print with a, b = 1, 2
+        print with a, b := 1, 2
                print a + b
        -- assignment lhs must be evaluated in the order they appear
-        p = with hello!.x, world!.y = 1, 2
+        p = with hello!.x, world!.y := 1, 2
                print a + b
 --
@@ -73,16 +73,16 @@ do
                x\upper!
 do
-        with k = "jo"
+        with k := "jo"
                print \upper!
 do
-        with a,b,c = "", "", ""
+        with a,b,c := "", "", ""
                print \upper!
 do
        a = "bunk"
-        with a,b,c = "", "", ""
+        with a,b,c := "", "", ""
                print \upper!
 do
@@ -90,7 +90,7 @@ do
                print \upper!
 do
-        with k.j = "jo"
+        with k.j := "jo"
                print \upper!
 do
@@ -103,7 +103,7 @@ do
 do
        with a
                -- nested `with`s with assignments should change the scope correctly
-                with .b = 2
+                with .b := 2
                        print .c
 do
@@ -138,12 +138,12 @@ do
 do
        global mask
-        with? mask = SolidRect width: w, height: h, color: 0x66000000
+        with? mask := SolidRect width: w, height: h, color: 0x66000000
                .touchEnabled = true
                .swallowTouches = true
 do
-        with? mask = SolidRect width: w, height: h, color: 0x66000000
+        with? mask := SolidRect width: w, height: h, color: 0x66000000
                .touchEnabled = true
                .swallowTouches = true
@@ -152,4 +152,22 @@ do
                return with {}
                        return [123]
+do
+        f with item
+                if .id > 0
+                        break .content
+        a = with tb
+                if .v
+                        break .a
+        a = while true
+                break with? tb
+                        break 1
+do
+        a = for i = 1, 100
+                with? x := tb[i]
+                        break x if .id := 1
 nil
diff --git a/spec/outputs/5.1/import_global.lua b/spec/outputs/5.1/import_global.lua
new file mode 100644
index 0000000..3b8334a
--- /dev/null
+++ b/spec/outputs/5.1/import_global.lua
@@ -0,0 +1,131 @@
+do
+        local print = print
+        local math = math
+        print("hello")
+        math.random(10)
+end
+do
+        local print = print
+        local value = 1
+        value = value + 2
+        print(value)
+end
+do
+        local print
+        print = function(msg)
+                return msg
+        end
+        do
+                local math = math
+                print("local")
+                math.random(1)
+        end
+end
+do
+        local print = print
+        local tostring
+        tostring = function(v)
+                return "local"
+        end
+        tostring("value")
+        print(tostring(123))
+end
+do
+        local func
+        func = function(x, y)
+                local type = type
+                local tostring = tostring
+                local print = print
+                return type(x, tostring(y, print))
+        end
+        func(1, 2)
+end
+do
+        local xpcall = xpcall
+        local func = func
+        local world = world
+        local tostring = tostring
+        local print = print
+        xpcall(function()
+                return func("hello " .. tostring(world))
+        end, function(err)
+                return print(err)
+        end)
+end
+do
+        local print = print
+        print(FLAG)
+        FLAG = 123
+end
+do
+        local print = print
+        Foo = 10
+        print(Foo)
+        Foo = Foo + 2
+end
+do
+        local print = print
+        Bar = 1
+        Baz = 2
+        print(Bar, Baz)
+end
+do
+        local y = y
+        x = 3434
+        if y then
+                x = 10
+        end
+end
+do
+        local lowercase = lowercase
+        local tostring = tostring
+        local Uppercase = Uppercase
+        local foobar = "all " .. tostring(lowercase)
+        FooBar = "pascal case"
+        FOOBAR = "all " .. tostring(Uppercase)
+end
+do
+        local setmetatable = setmetatable
+        local print = print
+        do
+                local _class_0
+                local _base_0 = { }
+                if _base_0.__index == nil then
+                        _base_0.__index = _base_0
+                end
+                _class_0 = setmetatable({
+                        __init = function() end,
+                        __base = _base_0,
+                        __name = "A"
+                }, {
+                        __index = _base_0,
+                        __call = function(cls, ...)
+                                local _self_0 = setmetatable({ }, _base_0)
+                                cls.__init(_self_0, ...)
+                                return _self_0
+                        end
+                })
+                _base_0.__class = _class_0
+                A = _class_0
+        end
+        Flag = 1
+        const, x, y = "const", 1, 2
+        print(math, table)
+end
+do
+        local X = X
+        X:func(1, 2, 3)
+        X.tag = "abc"
+end
+local _anon_func_0 = function(func)
+        return func
+end
+do
+        local func = func
+        local pcall = pcall
+        local f
+        f = function()
+                func()
+                return pcall(_anon_func_0, func)
+        end
+end
diff --git a/spec/outputs/5.1/literals.lua b/spec/outputs/5.1/literals.lua
deleted file mode 100644
index 36c705a..0000000
--- a/spec/outputs/5.1/literals.lua
+++ /dev/null
@@ -1,44 +0,0 @@
-local _ = {
-        121,
-        121.2323,
-        121.2323e-1,
-        121.2323e13434,
-        2323E34,
-        0x12323,
-        0xfF2323,
-        0xabcdef,
-        0xABCDEF,
-        0XFBC400,
-        2.7365508487142853e-35,
-        0xABCP321,
-        2.4074124304840448e-35,
-        6.4326233113470805e-94,
-        0.1171875,
-        162.1875,
-        3.1415926535897931,
-        1,
-        8,
-        15,
-        201,
-        .2323,
-        .2323e-1,
-        .2323e13434,
-        1LL,
-        1ULL,
-        9332LL,
-        9332,
-        0x2aLL,
-        0x2aULL,
-        1000000.0000001,
-        1234e5678,
-        1234E-5678,
-        0xDEADBEEF,
-        [[ hello world ]],
-        [=[ hello world ]=],
-        [====[ hello world ]====],
-        "another world",
-        'what world',
-        "\n     hello world\n   ",
-        'yeah\n what is going on\n      here is something cool'
-}
-return nil
diff --git a/spec/outputs/5.1/loops.lua b/spec/outputs/5.1/loops.lua
index 57b19be..e4f2871 100644
--- a/spec/outputs/5.1/loops.lua
+++ b/spec/outputs/5.1/loops.lua
@@ -60,8 +60,8 @@ do
                local y = hello[_index_0]
                if y % 2 == 0 then
                        _accum_0[_len_0] = y
+                        _len_0 = _len_0 + 1
                end
-                _len_0 = _len_0 + 1
        end
        x = _accum_0
 end
@@ -132,13 +132,11 @@ do
 end
 do
        local _accum_0 = { }
-        local _len_0 = 1
        local _list_2 = 3
        for _index_0 = 1, #_list_2 do
                local thing = _list_2[_index_0]
                y = "hello"
                break
-                _len_0 = _len_0 + 1
        end
        x = _accum_0
 end
@@ -489,3 +487,131 @@ do
                end
        until false
 end
+local _anon_func_0 = function(i, tb)
+        local _accum_0 = { }
+        local _len_0 = 1
+        while tb[i] do
+                i = i + 1
+                _accum_0[_len_0] = i - 1
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end
+do
+        local index
+        do
+                local _accum_0
+                for i = 1, #tb do
+                        if tb[i] then
+                                _accum_0 = i
+                                break
+                        end
+                end
+                index = _accum_0
+        end
+        f((function()
+                local _accum_0
+                for i = 1, #tb do
+                        if tb[i] then
+                                _accum_0 = i
+                                break
+                        end
+                end
+                return _accum_0
+        end)())
+        f((function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                for i = 1, #tb do
+                        if tb[i] then
+                                _accum_0[_len_0] = i
+                                _len_0 = _len_0 + 1
+                        end
+                end
+                return _accum_0
+        end)())
+        i = 1
+        local ids
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                while tb[i] do
+                        i = i + 1
+                        _accum_0[_len_0] = i - 1
+                        _len_0 = _len_0 + 1
+                end
+                ids = _accum_0
+        end
+        i = 1
+        local idx
+        do
+                local _accum_0
+                while tb[i] do
+                        i = i + 1
+                        _accum_0 = i - 1
+                        break
+                end
+                idx = _accum_0
+        end
+        local f1
+        f1 = function()
+                i = 1
+                return f(_anon_func_0(i, tb))
+        end
+        i = 1
+        f((function()
+                local _accum_0
+                while tb[i] do
+                        i = i + 1
+                        _accum_0 = i - 1
+                        break
+                end
+                return _accum_0
+        end)())
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _list_3 = items
+        for _index_0 = 1, #_list_3 do
+                local item = _list_3[_index_0]
+                local _type_0 = type(item)
+                local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+                if _tab_0 then
+                        local value = item.value
+                        if "A" == item.type and value ~= nil then
+                                if value > 5 then
+                                        _accum_0[_len_0] = item
+                                        _len_0 = _len_0 + 1
+                                end
+                        end
+                end
+        end
+        list = _accum_0
+end
+do
+        repeat
+                print(1)
+        until true
+        do
+                local _accum_0
+                repeat
+                        a = func()
+                        _accum_0 = a.x
+                        break
+                until a.v
+                x = _accum_0
+        end
+        local items
+        local _accum_0 = { }
+        local _len_0 = 1
+        repeat
+                local item = getItem()
+                if not item then
+                        break
+                end
+                if item.value > 0 then
+                        _accum_0[_len_0] = item
+                        _len_0 = _len_0 + 1
+                end
+        until false
+        items = _accum_0
+end
diff --git a/spec/outputs/5.1/try_catch.lua b/spec/outputs/5.1/try_catch.lua
index efd92c6..d2b58bc 100644
--- a/spec/outputs/5.1/try_catch.lua
+++ b/spec/outputs/5.1/try_catch.lua
@@ -22,6 +22,43 @@ end
 local _anon_func_7 = function(a, b, c, tb)
        return tb.f(a, b, c)
 end
+local _anon_func_8 = function(_arg_0, ...)
+        local ok = _arg_0
+        return ...
+end
+local _anon_func_10 = function(_arg_0, ...)
+        local _ok_0 = _arg_0
+        if _ok_0 then
+                return ...
+        end
+end
+local _anon_func_9 = function(func, pcall)
+        return _anon_func_10(pcall(func))
+end
+local _anon_func_12 = function(_arg_0, ...)
+        local _ok_0 = _arg_0
+        if _ok_0 then
+                return ...
+        end
+end
+local _anon_func_11 = function(func, pcall)
+        return _anon_func_12(pcall(func))
+end
+local _anon_func_14 = function(_arg_0, ...)
+        local _ok_0 = _arg_0
+        if _ok_0 then
+                return ...
+        end
+end
+local _anon_func_13 = function(func, print, xpcall)
+        return _anon_func_14(xpcall(function()
+                print(123)
+                return func()
+        end, function(e)
+                print(e)
+                return e
+        end))
+end
 local f
 f = function()
        xpcall(function()
@@ -104,10 +141,236 @@ f = function()
        do
                x(function()
                        local tb, a, b, c
-                        f = function()
+                        local f1
+                        f1 = function()
                                return pcall(_anon_func_7, a, b, c, tb)
                        end
                end)
        end
+        do
+                local f1
+                f1 = function()
+                        do
+                                return _anon_func_8(pcall(function()
+                                        return func()
+                                end))
+                        end
+                end
+        end
+        do
+                local func
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                        return func()
+                end)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a
+                local _exp_0 = (_anon_func_9(func, pcall))
+                if _exp_0 ~= nil then
+                        a = _exp_0
+                else
+                        a = "default"
+                end
+        end
+        do
+                f(_anon_func_11(func, pcall))
+        end
+        do
+                f(_anon_func_13(func, print, xpcall))
+        end
        return nil
 end
+local _anon_func_15 = function(a, b, c, tb)
+        return tb.f(a, b, c)
+end
+local _anon_func_16 = function(_arg_0, ...)
+        local ok = _arg_0
+        return ...
+end
+do
+        xpcall(function()
+                return func(1, 2, 3)
+        end, function(err)
+                return print(err)
+        end)
+        xpcall(function()
+                return func(1, 2, 3)
+        end, function(err)
+                return print(err)
+        end)
+        pcall(function()
+                print("trying")
+                return func(1, 2, 3)
+        end)
+        do
+                local success, result = xpcall(function()
+                        return func(1, 2, 3)
+                end, function(err)
+                        return print(err)
+                end)
+                success, result = pcall(function()
+                        return func(1, 2, 3)
+                end)
+        end
+        local tb = { }
+        pcall(function()
+                return tb.func
+        end)
+        pcall(function()
+                return tb.func()
+        end)
+        pcall(function()
+                return tb.func()
+        end)
+        pcall(function()
+                return (tb.func())
+        end)
+        pcall(function()
+                return (tb:func(1, 2, 3))
+        end)
+        pcall(function()
+                return tb.func(1)
+        end)
+        pcall(function()
+                return tb.func(1)
+        end)
+        if (xpcall(function()
+                return func(1)
+        end, function(err)
+                return print(err)
+        end)) then
+                print("OK")
+        end
+        if xpcall(function()
+                return (func(1))
+        end, function(err)
+                return print(err)
+        end) then
+                print("OK")
+        end
+        do
+                do
+                        local success, result = pcall(function()
+                                return func("abc", 123)
+                        end)
+                        if success then
+                                print(result)
+                        end
+                end
+                local success, result = xpcall(function()
+                        return func("abc", 123)
+                end, function(err)
+                        return print(err)
+                end)
+                success, result = xpcall(function()
+                        return func("abc", 123)
+                end, function(err)
+                        return print(err)
+                end)
+                if success then
+                        print(result)
+                end
+        end
+        do
+                pcall(function()
+                        return func(1, 2, 3)
+                end)
+                pcall(function()
+                        return func(1, 2, 3)
+                end)
+        end
+        do
+                x(function()
+                        local tb, a, b, c
+                        local f1
+                        f1 = function()
+                                return pcall(_anon_func_15, a, b, c, tb)
+                        end
+                end)
+        end
+        do
+                local f1
+                f1 = function()
+                        do
+                                return _anon_func_16(pcall(function()
+                                        return func()
+                                end))
+                        end
+                end
+        end
+        do
+                local func
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                        return func()
+                end)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a
+                local _exp_0 = ((function()
+                        return (function(_arg_0, ...)
+                                local _ok_0 = _arg_0
+                                if _ok_0 then
+                                        return ...
+                                end
+                        end)(pcall(function()
+                                return func()
+                        end))
+                end)())
+                if _exp_0 ~= nil then
+                        a = _exp_0
+                else
+                        a = "default"
+                end
+        end
+        do
+                f((function()
+                        return (function(_arg_0, ...)
+                                local _ok_0 = _arg_0
+                                if _ok_0 then
+                                        return ...
+                                end
+                        end)(pcall(function()
+                                return func()
+                        end))
+                end)())
+        end
+        do
+                f((function()
+                        return (function(_arg_0, ...)
+                                local _ok_0 = _arg_0
+                                if _ok_0 then
+                                        return ...
+                                end
+                        end)(xpcall(function()
+                                print(123)
+                                return func()
+                        end, function(e)
+                                print(e)
+                                return e
+                        end))
+                end)())
+        end
+end
+return nil
diff --git a/spec/outputs/assign.lua b/spec/outputs/assign.lua
index 162c5a8..89c5f8a 100644
--- a/spec/outputs/assign.lua
+++ b/spec/outputs/assign.lua
@@ -43,10 +43,8 @@ do
        end
 end
 local _anon_func_0 = function(print)
-        do
+        print(123)
-                print(123)
+        return { }
-                return { }
-        end
 end
 return _(function()
        setmetatable(a, _anon_func_0(print))
diff --git a/spec/outputs/codes_from_doc.lua b/spec/outputs/codes_from_doc.lua
index f6d5d61..3b0724a 100644
--- a/spec/outputs/codes_from_doc.lua
+++ b/spec/outputs/codes_from_doc.lua
@@ -20,6 +20,38 @@ local inventory = {
                }
        }
 }
+local map
+map = function(arr, action)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                _accum_0[_len_0] = action(item)
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end
+local filter
+filter = function(arr, cond)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                if cond(item) then
+                        _accum_0[_len_0] = item
+                        _len_0 = _len_0 + 1
+                end
+        end
+        return _accum_0
+end
+local reduce
+reduce = function(arr, init, action)
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                init = action(init, item)
+        end
+        return init
+end
 print(reduce(filter(map({
        1,
        2,
@@ -41,8 +73,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
        p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
+local _u1f31b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('hello world')
@@ -77,6 +109,12 @@ end
 print("yuescript")
 print(3)
 print("Valid enum type:", "Static")
+do
+        print(123, "hello")
+end
+do
+        print(123, "hello")
+end
 if tb ~= nil then
        tb:func()
 end
@@ -109,6 +147,21 @@ print((function()
 end)())
 local tab = { }
 tab[#tab + 1] = "Value"
+local tbA = {
+        1,
+        2,
+        3
+}
+local tbB = {
+        4,
+        5,
+        6
+}
+local _len_0 = #tbA + 1
+for _index_0 = 1, #tbB do
+        local _elm_0 = tbB[_index_0]
+        tbA[_len_0], _len_0 = _elm_0, _len_0 + 1
+end
 local parts = {
        "shoulders",
        "knees"
@@ -177,6 +230,18 @@ for _key_0, _value_0 in pairs(b) do
        end
 end
 merge = _tab_0
+local last
+do
+        local _item_0 = data.items
+        last = _item_0[#_item_0]
+end
+local second_last
+do
+        local _item_0 = data.items
+        second_last = _item_0[#_item_0 - 1]
+end
+local _obj_0 = data.items
+_obj_0[#_obj_0] = 1
 local mt = { }
 local add
 add = function(self, right)
@@ -307,6 +372,14 @@ func({
        2,
        3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
        name = "abc",
        values = {
@@ -368,6 +441,25 @@ do
        local _obj_0 = require("export")
        one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1]
 end
+do
+        local tostring <const> = tostring
+        local concat <const> = table.concat
+        print(concat({
+                "a",
+                tostring(1)
+        }))
+end
+do
+        local print <const> = print
+        local math <const> = math
+        print("hello")
+        math.random(3)
+end
+do
+        local print <const> = print
+        print(FLAG)
+        FLAG = 123
+end
 local _module_0 = { }
 local a, b, c = 1, 2, 3
 _module_0["a"], _module_0["b"], _module_0["c"] = a, b, c
@@ -547,6 +639,59 @@ end
 local two, four
 local _obj_0 = items
 two, four = _obj_0[2], _obj_0[4]
+local orders = {
+        "first",
+        "second",
+        "third",
+        "fourth",
+        "last"
+}
+local first, bulk, last = orders[1], (function()
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _max_0 = #orders + -2 + 1
+        for _index_0 = 2, _max_0 do
+                local _item_0 = orders[_index_0]
+                _accum_0[_len_0] = _item_0
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end)(), orders[#orders]
+print(first)
+print(bulk)
+print(last)
+local first, rest
+do
+        local _obj_0 = orders
+        first, rest = _obj_0[1], (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0
+                for _index_0 = 2, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)()
+end
+local start, last
+do
+        local _obj_0 = orders
+        start, last = (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0 + -2 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)(), _obj_0[#_obj_0]
+end
+local _obj_0 = orders
+first, last = _obj_0[1], _obj_0[#_obj_0]
 local tuples = {
        {
                "hello",
@@ -611,6 +756,9 @@ end
        local first = select(1, ...)
        return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
        return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -648,6 +796,56 @@ end)
 if success then
        print(result)
 end
+local a, b, c
+do
+        local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                return func()
+        end)
+        if _ok_0 then
+                a, b, c = _ret_0, _ret_1, _ret_2
+        end
+end
+do
+        local _exp_0 = ((function()
+                return (function(_arg_0, ...)
+                        local _ok_0 = _arg_0
+                        if _ok_0 then
+                                return ...
+                        end
+                end)(pcall(function()
+                        return func()
+                end))
+        end)())
+        if _exp_0 ~= nil then
+                a = _exp_0
+        else
+                a = "default"
+        end
+end
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(pcall(function()
+                return func()
+        end))
+end)())
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(xpcall(function()
+                print(123)
+                return func()
+        end, function(e)
+                print(e)
+                return e
+        end))
+end)())
 local a <const> = 123
 local _ <close> = setmetatable({ }, {
        __close = function()
@@ -657,10 +855,19 @@ local _ <close> = setmetatable({ }, {
 local a, b, c, d
 local _obj_0 = tb
 a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2]
+Constant = 123
 local some_string = "Here is a string\n  that has a line break in it."
 print("I am " .. tostring(math.random() * 100) .. "% sure.")
 local integer = 1000000
 local hex = 0xEFBBBF
+local binary = 19
+local str = "key: value\nlist:\n  - item1\n  - " .. tostring(expr)
+local fn
+fn = function()
+        local str = "foo:\n  bar: baz"
+        return str
+end
+local str = "path: \"C:\\Program Files\\App\"\nnote: 'He said: \"" .. tostring(Hello) .. "!\"'"
 local my_function
 my_function = function() end
 my_function()
@@ -755,6 +962,66 @@ if func(1, 2, 3, "hello", "world") then
        print("hello")
        print("I am inside if")
 end
+local f1
+f1 = function(_arg_0)
+        local a, b, c
+        a, b, c = _arg_0.a, _arg_0.b, _arg_0.c
+        return print(a, b, c)
+end
+f1({
+        a = 1,
+        b = "2",
+        c = { }
+})
+local f2
+f2 = function(_arg_0, c)
+        local a1, b
+        a1, b = _arg_0.a, _arg_0.b
+        if a1 == nil then
+                a1 = 123
+        end
+        if b == nil then
+                b = 'abc'
+        end
+        if c == nil then
+                c = { }
+        end
+        return print(a1, b, c)
+end
+local arg1 = {
+        a = 0
+}
+f2(arg1, arg2)
+local f
+f = function(...)
+        local t = {
+                n = select("#", ...),
+                ...
+        }
+        print("argument count:", t.n)
+        print("table length:", #t)
+        for i = 1, t.n do
+                print(t[i])
+        end
+end
+f(1, 2, 3)
+f("a", "b", "c", "d")
+f()
+local process
+process = function(...)
+        local args = {
+                n = select("#", ...),
+                ...
+        }
+        local sum = 0
+        for i = 1, args.n do
+                if args[i] ~= nil and type(args[i]) == "number" then
+                        sum = sum + args[i]
+                end
+        end
+        return sum
+end
+process(1, nil, 3, nil, 5)
 f(function()
        return print("hello")
 end)
@@ -880,6 +1147,28 @@ for _index_0 = 1, #_list_0 do
        _len_0 = _len_0 + 1
 end
 doubled = _accum_0
+local data = {
+        a = {
+                1,
+                2,
+                3
+        },
+        b = {
+                4,
+                5,
+                6
+        }
+}
+local flat
+local _accum_0 = { }
+for k, v in pairs(data) do
+        local _len_0 = #_accum_0 + 1
+        for _index_0 = 1, #v do
+                local _elm_0 = v[_index_0]
+                _accum_0[_len_0], _len_0 = _elm_0, _len_0 + 1
+        end
+end
+flat = _accum_0
 local x_coords = {
        4,
        5,
@@ -970,8 +1259,18 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
+for _index_0 = 1, 5 do
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+slice = _accum_0
+local slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _max_0 = #_list_0
+for _index_0 = 2, _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -981,7 +1280,8 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 2, #_list_0 do
+local _max_0 = #_list_0
+for _index_0 = 1, _max_0, 2 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -991,12 +1291,35 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 1, #_list_0, 2 do
+local _min_0 = #_list_0 + -4 + 1
+local _max_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
 end
 slice = _accum_0
+local reverse_slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _min_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, 1, -1 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+reverse_slice = _accum_0
+local sub_list
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+for _index_0 = 2, 4 do
+        local _item_0 = _list_0[_index_0]
+        _accum_0[_len_0] = _item_0
+        _len_0 = _len_0 + 1
+end
+sub_list = _accum_0
 for i = 10, 20 do
        print(i)
 end
@@ -1007,8 +1330,7 @@ for key, value in pairs(object) do
        print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
+for _index_0 = 2, 4 do
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
        local item = _list_0[_index_0]
        print(item)
 end
@@ -1026,12 +1348,24 @@ local _len_0 = 1
 for i = 1, 20 do
        if i % 2 == 0 then
                _accum_0[_len_0] = i * 2
+                _len_0 = _len_0 + 1
        else
                _accum_0[_len_0] = i
+                _len_0 = _len_0 + 1
        end
-        _len_0 = _len_0 + 1
 end
 doubled_evens = _accum_0
+local first_large
+local _accum_0
+local _list_0 = numbers
+for _index_0 = 1, #_list_0 do
+        local n = _list_0[_index_0]
+        if n > 10 then
+                _accum_0 = n
+                break
+        end
+end
+first_large = _accum_0
 local func_a
 func_a = function()
        for i = 1, 10 do
@@ -1180,7 +1514,7 @@ if "Robert" == name then
 elseif "Dan" == name or "Daniel" == name then
        print("Your name, it's Dan")
 else
-        print("I don't know about your name")
+        print("I don't know about you with name " .. tostring(name))
 end
 local b = 1
 local next_number
@@ -1280,6 +1614,192 @@ if _tab_0 then
        end
        print("Vec2 " .. tostring(x) .. ", " .. tostring(y))
 end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        if 1 == _exp_0[1] and 2 == _exp_0[2] and 3 == _exp_0[3] then
+                _match_0 = true
+                print("1, 2, 3")
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local b = _exp_0[2]
+                if 1 == _exp_0[1] and b ~= nil and 3 == _exp_0[3] then
+                        _match_1 = true
+                        print("1, " .. tostring(b) .. ", 3")
+                end
+        end
+        if not _match_1 then
+                if _tab_0 then
+                        local b = _exp_0[3]
+                        if b == nil then
+                                b = 3
+                        end
+                        if 1 == _exp_0[1] and 2 == _exp_0[2] then
+                                print("1, 2, " .. tostring(b))
+                        end
+                end
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local result = _exp_0.result
+        if true == _exp_0.success and result ~= nil then
+                _match_0 = true
+                print("success", result)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                if false == _exp_0.success then
+                        _match_1 = true
+                        print("failed", result)
+                end
+        end
+        if not _match_1 then
+                print("invalid")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local content
+        do
+                local _obj_0 = _exp_0.data
+                local _type_1 = type(_obj_0)
+                if "table" == _type_1 or "userdata" == _type_1 then
+                        content = _obj_0.content
+                end
+        end
+        local _val_0
+        do
+                local _obj_0 = _exp_0.data
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.type
+                end
+        end
+        if "success" == _val_0 and content ~= nil then
+                _match_0 = true
+                print("success", content)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local content
+                do
+                        local _obj_0 = _exp_0.data
+                        local _type_1 = type(_obj_0)
+                        if "table" == _type_1 or "userdata" == _type_1 then
+                                content = _obj_0.content
+                        end
+                end
+                local _val_0
+                do
+                        local _obj_0 = _exp_0.data
+                        if _obj_0 ~= nil then
+                                _val_0 = _obj_0.type
+                        end
+                end
+                if "error" == _val_0 and content ~= nil then
+                        _match_1 = true
+                        print("failed", content)
+                end
+        end
+        if not _match_1 then
+                print("invalid")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local fourth = _exp_0[4]
+        local _val_0
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.a
+                end
+        end
+        local _val_1
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_1 = _obj_0.b
+                end
+        end
+        local _val_2
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_2 = _obj_0.a
+                end
+        end
+        local _val_3
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_3 = _obj_0.b
+                end
+        end
+        local _val_4
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_4 = _obj_0.a
+                end
+        end
+        local _val_5
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_5 = _obj_0.b
+                end
+        end
+        if 1 == _val_0 and 2 == _val_1 and 3 == _val_2 and 4 == _val_3 and 5 == _val_4 and 6 == _val_5 and fourth ~= nil then
+                print("matched", fourth)
+        end
+end
+local segments = {
+        "admin",
+        "users",
+        "logs",
+        "view"
+}
+local _type_0 = type(segments)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local groups
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #segments + -3 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = segments[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                groups = _accum_0
+        end
+        local resource = segments[#segments - 1]
+        local action = segments[#segments]
+        if resource ~= nil and action ~= nil then
+                print("Group:", groups)
+                print("Resource:", resource)
+                print("Action:", action)
+        end
+end
 local Inventory
 local _class_0
 local _base_0 = {
@@ -1936,6 +2456,10 @@ do
        _with_1["key-name"] = value
 end
 _with_0[#_with_0 + 1] = "abc"
+local _with_0 = obj
+if _with_0 ~= nil then
+        print(obj.name)
+end
 do
        local var = "hello"
        print(var)
@@ -2026,6 +2550,38 @@ local inventory = {
                }
        }
 }
+local map
+map = function(arr, action)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                _accum_0[_len_0] = action(item)
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end
+local filter
+filter = function(arr, cond)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                if cond(item) then
+                        _accum_0[_len_0] = item
+                        _len_0 = _len_0 + 1
+                end
+        end
+        return _accum_0
+end
+local reduce
+reduce = function(arr, init, action)
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                init = action(init, item)
+        end
+        return init
+end
 print(reduce(filter(map({
        1,
        2,
@@ -2047,8 +2603,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
        p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
+local _u1f31b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('hello world')
@@ -2083,6 +2639,12 @@ end
 print("yuescript")
 print(3)
 print("Valid enum type:", "Static")
+do
+        print(123, "hello")
+end
+do
+        print(123, "hello")
+end
 if tb ~= nil then
        tb:func()
 end
@@ -2115,6 +2677,21 @@ print((function()
 end)())
 local tab = { }
 tab[#tab + 1] = "Value"
+local tbA = {
+        1,
+        2,
+        3
+}
+local tbB = {
+        4,
+        5,
+        6
+}
+local _len_0 = #tbA + 1
+for _index_0 = 1, #tbB do
+        local _elm_0 = tbB[_index_0]
+        tbA[_len_0], _len_0 = _elm_0, _len_0 + 1
+end
 local parts = {
        "shoulders",
        "knees"
@@ -2183,6 +2760,18 @@ for _key_0, _value_0 in pairs(b) do
        end
 end
 merge = _tab_0
+local last
+do
+        local _item_0 = data.items
+        last = _item_0[#_item_0]
+end
+local second_last
+do
+        local _item_0 = data.items
+        second_last = _item_0[#_item_0 - 1]
+end
+local _obj_0 = data.items
+_obj_0[#_obj_0] = 1
 local mt = { }
 local add
 add = function(self, right)
@@ -2313,6 +2902,14 @@ func({
        2,
        3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
        name = "abc",
        values = {
@@ -2374,6 +2971,25 @@ do
        local _obj_0 = require("export")
        one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1]
 end
+do
+        local tostring <const> = tostring
+        local concat <const> = table.concat
+        print(concat({
+                "a",
+                tostring(1)
+        }))
+end
+do
+        local print <const> = print
+        local math <const> = math
+        print("hello")
+        math.random(3)
+end
+do
+        local print <const> = print
+        print(FLAG)
+        FLAG = 123
+end
 local _module_0 = { }
 local a, b, c = 1, 2, 3
 _module_0["a"], _module_0["b"], _module_0["c"] = a, b, c
@@ -2553,6 +3169,59 @@ end
 local two, four
 local _obj_0 = items
 two, four = _obj_0[2], _obj_0[4]
+local orders = {
+        "first",
+        "second",
+        "third",
+        "fourth",
+        "last"
+}
+local first, bulk, last = orders[1], (function()
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _max_0 = #orders + -2 + 1
+        for _index_0 = 2, _max_0 do
+                local _item_0 = orders[_index_0]
+                _accum_0[_len_0] = _item_0
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end)(), orders[#orders]
+print(first)
+print(bulk)
+print(last)
+local first, rest
+do
+        local _obj_0 = orders
+        first, rest = _obj_0[1], (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0
+                for _index_0 = 2, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)()
+end
+local start, last
+do
+        local _obj_0 = orders
+        start, last = (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0 + -2 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)(), _obj_0[#_obj_0]
+end
+local _obj_0 = orders
+first, last = _obj_0[1], _obj_0[#_obj_0]
 local tuples = {
        {
                "hello",
@@ -2617,6 +3286,9 @@ end
        local first = select(1, ...)
        return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
        return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -2654,6 +3326,56 @@ end)
 if success then
        print(result)
 end
+local a, b, c
+do
+        local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                return func()
+        end)
+        if _ok_0 then
+                a, b, c = _ret_0, _ret_1, _ret_2
+        end
+end
+do
+        local _exp_0 = ((function()
+                return (function(_arg_0, ...)
+                        local _ok_0 = _arg_0
+                        if _ok_0 then
+                                return ...
+                        end
+                end)(pcall(function()
+                        return func()
+                end))
+        end)())
+        if _exp_0 ~= nil then
+                a = _exp_0
+        else
+                a = "default"
+        end
+end
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(pcall(function()
+                return func()
+        end))
+end)())
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(xpcall(function()
+                print(123)
+                return func()
+        end, function(e)
+                print(e)
+                return e
+        end))
+end)())
 local a <const> = 123
 local _ <close> = setmetatable({ }, {
        __close = function()
@@ -2663,10 +3385,19 @@ local _ <close> = setmetatable({ }, {
 local a, b, c, d
 local _obj_0 = tb
 a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2]
+Constant = 123
 local some_string = "Here is a string\n  that has a line break in it."
 print("I am " .. tostring(math.random() * 100) .. "% sure.")
 local integer = 1000000
 local hex = 0xEFBBBF
+local binary = 19
+local str = "key: value\nlist:\n  - item1\n  - " .. tostring(expr)
+local fn
+fn = function()
+        local str = "foo:\n  bar: baz"
+        return str
+end
+local str = "path: \"C:\\Program Files\\App\"\nnote: 'He said: \"" .. tostring(Hello) .. "!\"'"
 local my_function
 my_function = function() end
 my_function()
@@ -2761,6 +3492,96 @@ if func(1, 2, 3, "hello", "world") then
        print("hello")
        print("I am inside if")
 end
+local f1
+f1 = function(_arg_0)
+        local a, b, c
+        a, b, c = _arg_0.a, _arg_0.b, _arg_0.c
+        return print(a, b, c)
+end
+f1({
+        a = 1,
+        b = "2",
+        c = { }
+})
+local f2
+f2 = function(_arg_0, c)
+        local a1, b
+        a1, b = _arg_0.a, _arg_0.b
+        if a1 == nil then
+                a1 = 123
+        end
+        if b == nil then
+                b = 'abc'
+        end
+        if c == nil then
+                c = { }
+        end
+end
+print(a1, b, c)
+local arg1 = {
+        a = 0
+}
+f2(arg1, arg2)
+local findFirstEven
+findFirstEven = function(list)
+        for _index_0 = 1, #list do
+                local item = list[_index_0]
+                if type(item) == "table" then
+                        for _index_1 = 1, #item do
+                                local sub = item[_index_1]
+                                if sub % 2 == 0 then
+                                        return sub
+                                end
+                        end
+                end
+        end
+        return nil
+end
+local findFirstEven
+findFirstEven = function(list)
+        for _index_0 = 1, #list do
+                local item = list[_index_0]
+                if type(item) == "table" then
+                        for _index_1 = 1, #item do
+                                local sub = item[_index_1]
+                                if sub % 2 == 0 then
+                                        return sub
+                                end
+                        end
+                end
+        end
+        return nil
+end
+local f
+f = function(...)
+        local t = {
+                n = select("#", ...),
+                ...
+        }
+        print("argument count:", t.n)
+        print("table length:", #t)
+        for i = 1, t.n do
+                print(t[i])
+        end
+end
+f(1, 2, 3)
+f("a", "b", "c", "d")
+f()
+local process
+process = function(...)
+        local args = {
+                n = select("#", ...),
+                ...
+        }
+        local sum = 0
+        for i = 1, args.n do
+                if args[i] ~= nil and type(args[i]) == "number" then
+                        sum = sum + args[i]
+                end
+        end
+        return sum
+end
+process(1, nil, 3, nil, 5)
 f(function()
        return print("hello")
 end)
@@ -2886,6 +3707,28 @@ for _index_0 = 1, #_list_0 do
        _len_0 = _len_0 + 1
 end
 doubled = _accum_0
+local data = {
+        a = {
+                1,
+                2,
+                3
+        },
+        b = {
+                4,
+                5,
+                6
+        }
+}
+local flat
+local _accum_0 = { }
+for k, v in pairs(data) do
+        local _len_0 = #_accum_0 + 1
+        for _index_0 = 1, #v do
+                local _elm_0 = v[_index_0]
+                _accum_0[_len_0], _len_0 = _elm_0, _len_0 + 1
+        end
+end
+flat = _accum_0
 local x_coords = {
        4,
        5,
@@ -2976,8 +3819,7 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
+for _index_0 = 1, 5 do
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -2987,7 +3829,8 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 2, #_list_0 do
+local _max_0 = #_list_0
+for _index_0 = 2, _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -2997,12 +3840,46 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 1, #_list_0, 2 do
+local _max_0 = #_list_0
+for _index_0 = 1, _max_0, 2 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
 end
 slice = _accum_0
+local slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _min_0 = #_list_0 + -4 + 1
+local _max_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, _max_0 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+slice = _accum_0
+local reverse_slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _min_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, 1, -1 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+reverse_slice = _accum_0
+local sub_list
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+for _index_0 = 2, 4 do
+        local _item_0 = _list_0[_index_0]
+        _accum_0[_len_0] = _item_0
+        _len_0 = _len_0 + 1
+end
+sub_list = _accum_0
 for i = 10, 20 do
        print(i)
 end
@@ -3013,8 +3890,7 @@ for key, value in pairs(object) do
        print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
+for _index_0 = 2, 4 do
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
        local item = _list_0[_index_0]
        print(item)
 end
@@ -3032,12 +3908,24 @@ local _len_0 = 1
 for i = 1, 20 do
        if i % 2 == 0 then
                _accum_0[_len_0] = i * 2
+                _len_0 = _len_0 + 1
        else
                _accum_0[_len_0] = i
+                _len_0 = _len_0 + 1
        end
-        _len_0 = _len_0 + 1
 end
 doubled_evens = _accum_0
+local first_large
+local _accum_0
+local _list_0 = numbers
+for _index_0 = 1, #_list_0 do
+        local n = _list_0[_index_0]
+        if n > 10 then
+                _accum_0 = n
+                break
+        end
+end
+first_large = _accum_0
 local func_a
 func_a = function()
        for i = 1, 10 do
@@ -3186,7 +4074,7 @@ if "Robert" == name then
 elseif "Dan" == name or "Daniel" == name then
        print("Your name, it's Dan")
 else
-        print("I don't know about your name")
+        print("I don't know about you with name " .. tostring(name))
 end
 local b = 1
 local next_number
@@ -3286,6 +4174,192 @@ if _tab_0 then
        end
        print("Vec2 " .. tostring(x) .. ", " .. tostring(y))
 end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        if 1 == _exp_0[1] and 2 == _exp_0[2] and 3 == _exp_0[3] then
+                _match_0 = true
+                print("1, 2, 3")
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local b = _exp_0[2]
+                if 1 == _exp_0[1] and b ~= nil and 3 == _exp_0[3] then
+                        _match_1 = true
+                        print("1, " .. tostring(b) .. ", 3")
+                end
+        end
+        if not _match_1 then
+                if _tab_0 then
+                        local b = _exp_0[3]
+                        if b == nil then
+                                b = 3
+                        end
+                        if 1 == _exp_0[1] and 2 == _exp_0[2] then
+                                print("1, 2, " .. tostring(b))
+                        end
+                end
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local result = _exp_0.result
+        if true == _exp_0.success and result ~= nil then
+                _match_0 = true
+                print("success", result)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                if false == _exp_0.success then
+                        _match_1 = true
+                        print("failed", result)
+                end
+        end
+        if not _match_1 then
+                print("invalid")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local content
+        do
+                local _obj_0 = _exp_0.data
+                local _type_1 = type(_obj_0)
+                if "table" == _type_1 or "userdata" == _type_1 then
+                        content = _obj_0.content
+                end
+        end
+        local _val_0
+        do
+                local _obj_0 = _exp_0.data
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.type
+                end
+        end
+        if "success" == _val_0 and content ~= nil then
+                _match_0 = true
+                print("success", content)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local content
+                do
+                        local _obj_0 = _exp_0.data
+                        local _type_1 = type(_obj_0)
+                        if "table" == _type_1 or "userdata" == _type_1 then
+                                content = _obj_0.content
+                        end
+                end
+                local _val_0
+                do
+                        local _obj_0 = _exp_0.data
+                        if _obj_0 ~= nil then
+                                _val_0 = _obj_0.type
+                        end
+                end
+                if "error" == _val_0 and content ~= nil then
+                        _match_1 = true
+                        print("failed", content)
+                end
+        end
+        if not _match_1 then
+                print("invalid")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local fourth = _exp_0[4]
+        local _val_0
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.a
+                end
+        end
+        local _val_1
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_1 = _obj_0.b
+                end
+        end
+        local _val_2
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_2 = _obj_0.a
+                end
+        end
+        local _val_3
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_3 = _obj_0.b
+                end
+        end
+        local _val_4
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_4 = _obj_0.a
+                end
+        end
+        local _val_5
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_5 = _obj_0.b
+                end
+        end
+        if 1 == _val_0 and 2 == _val_1 and 3 == _val_2 and 4 == _val_3 and 5 == _val_4 and 6 == _val_5 and fourth ~= nil then
+                print("matched", fourth)
+        end
+end
+local segments = {
+        "admin",
+        "users",
+        "logs",
+        "view"
+}
+local _type_0 = type(segments)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local groups
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #segments + -3 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = segments[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                groups = _accum_0
+        end
+        local resource = segments[#segments - 1]
+        local action = segments[#segments]
+        if resource ~= nil and action ~= nil then
+                print("Group:", groups)
+                print("Resource:", resource)
+                print("Action:", action)
+        end
+end
 local Inventory
 local _class_0
 local _base_0 = {
@@ -3942,6 +5016,10 @@ do
        _with_1["key-name"] = value
 end
 _with_0[#_with_0 + 1] = "abc"
+local _with_0 = obj
+if _with_0 ~= nil then
+        print(obj.name)
+end
 do
        local var = "hello"
        print(var)
diff --git a/spec/outputs/codes_from_doc_zh.lua b/spec/outputs/codes_from_doc_zh.lua
index acd41a0..89335c9 100644
--- a/spec/outputs/codes_from_doc_zh.lua
+++ b/spec/outputs/codes_from_doc_zh.lua
@@ -20,6 +20,38 @@ local inventory = {
                }
        }
 }
+local map
+map = function(arr, action)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                _accum_0[_len_0] = action(item)
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end
+local filter
+filter = function(arr, cond)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                if cond(item) then
+                        _accum_0[_len_0] = item
+                        _len_0 = _len_0 + 1
+                end
+        end
+        return _accum_0
+end
+local reduce
+reduce = function(arr, init, action)
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                init = action(init, item)
+        end
+        return init
+end
 print(reduce(filter(map({
        1,
        2,
@@ -41,8 +73,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
        p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
+local _u1f31b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('你好 世界')
@@ -77,6 +109,12 @@ end
 print("yuescript")
 print(3)
 print("有效的枚举类型:", "Static")
+do
+        print(123, "hello")
+end
+do
+        print(123, "hello")
+end
 if tb ~= nil then
        tb:func()
 end
@@ -109,6 +147,21 @@ print((function()
 end)())
 local tab = { }
 tab[#tab + 1] = "Value"
+local tbA = {
+        1,
+        2,
+        3
+}
+local tbB = {
+        4,
+        5,
+        6
+}
+local _len_0 = #tbA + 1
+for _index_0 = 1, #tbB do
+        local _elm_0 = tbB[_index_0]
+        tbA[_len_0], _len_0 = _elm_0, _len_0 + 1
+end
 local parts = {
        "shoulders",
        "knees"
@@ -177,6 +230,18 @@ for _key_0, _value_0 in pairs(b) do
        end
 end
 merge = _tab_0
+local last
+do
+        local _item_0 = data.items
+        last = _item_0[#_item_0]
+end
+local second_last
+do
+        local _item_0 = data.items
+        second_last = _item_0[#_item_0 - 1]
+end
+local _obj_0 = data.items
+_obj_0[#_obj_0] = 1
 local mt = { }
 local add
 add = function(self, right)
@@ -307,6 +372,14 @@ func({
        2,
        3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
        name = "abc",
        values = {
@@ -368,6 +441,25 @@ do
        local _obj_0 = require("export")
        one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1]
 end
+do
+        local tostring <const> = tostring
+        local concat <const> = table.concat
+        print(concat({
+                "a",
+                tostring(1)
+        }))
+end
+do
+        local print <const> = print
+        local math <const> = math
+        print("hello")
+        math.random(3)
+end
+do
+        local print <const> = print
+        print(FLAG)
+        FLAG = 123
+end
 local _module_0 = { }
 local a, b, c = 1, 2, 3
 _module_0["a"], _module_0["b"], _module_0["c"] = a, b, c
@@ -547,6 +639,59 @@ end
 local two, four
 local _obj_0 = items
 two, four = _obj_0[2], _obj_0[4]
+local orders = {
+        "first",
+        "second",
+        "third",
+        "fourth",
+        "last"
+}
+local first, bulk, last = orders[1], (function()
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _max_0 = #orders + -2 + 1
+        for _index_0 = 2, _max_0 do
+                local _item_0 = orders[_index_0]
+                _accum_0[_len_0] = _item_0
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end)(), orders[#orders]
+print(first)
+print(bulk)
+print(last)
+local first, rest
+do
+        local _obj_0 = orders
+        first, rest = _obj_0[1], (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0
+                for _index_0 = 2, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)()
+end
+local start, last
+do
+        local _obj_0 = orders
+        start, last = (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0 + -2 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)(), _obj_0[#_obj_0]
+end
+local _obj_0 = orders
+first, last = _obj_0[1], _obj_0[#_obj_0]
 local tuples = {
        {
                "hello",
@@ -611,6 +756,9 @@ end
        local first = select(1, ...)
        return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
        return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -648,6 +796,56 @@ end)
 if success then
        print(result)
 end
+local a, b, c
+do
+        local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                return func()
+        end)
+        if _ok_0 then
+                a, b, c = _ret_0, _ret_1, _ret_2
+        end
+end
+do
+        local _exp_0 = ((function()
+                return (function(_arg_0, ...)
+                        local _ok_0 = _arg_0
+                        if _ok_0 then
+                                return ...
+                        end
+                end)(pcall(function()
+                        return func()
+                end))
+        end)())
+        if _exp_0 ~= nil then
+                a = _exp_0
+        else
+                a = "default"
+        end
+end
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(pcall(function()
+                return func()
+        end))
+end)())
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(xpcall(function()
+                print(123)
+                return func()
+        end, function(e)
+                print(e)
+                return e
+        end))
+end)())
 local a <const> = 123
 local _ <close> = setmetatable({ }, {
        __close = function()
@@ -657,10 +855,19 @@ local _ <close> = setmetatable({ }, {
 local a, b, c, d
 local _obj_0 = tb
 a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2]
+Constant = 123
 local some_string = "这是一个字符串\n  并包括一个换行。"
 print("我有" .. tostring(math.random() * 100) .. "%的把握。")
 local integer = 1000000
 local hex = 0xEFBBBF
+local binary = 19
+local str = "key: value\nlist:\n  - item1\n  - " .. tostring(expr)
+local fn
+fn = function()
+        local str = "foo:\n  bar: baz"
+        return str
+end
+local str = "path: \"C:\\Program Files\\App\"\nnote: 'He said: \"" .. tostring(Hello) .. "!\"'"
 local my_function
 my_function = function() end
 my_function()
@@ -749,6 +956,66 @@ if func(1, 2, 3, "你好", "世界") then
        print("hello")
        print("我在if内部")
 end
+local f1
+f1 = function(_arg_0)
+        local a, b, c
+        a, b, c = _arg_0.a, _arg_0.b, _arg_0.c
+        return print(a, b, c)
+end
+f1({
+        a = 1,
+        b = "2",
+        c = { }
+})
+local f2
+f2 = function(_arg_0, c)
+        local a1, b
+        a1, b = _arg_0.a, _arg_0.b
+        if a1 == nil then
+                a1 = 123
+        end
+        if b == nil then
+                b = 'abc'
+        end
+        if c == nil then
+                c = { }
+        end
+        return print(a1, b, c)
+end
+local arg1 = {
+        a = 0
+}
+f2(arg1, arg2)
+local f
+f = function(...)
+        local t = {
+                n = select("#", ...),
+                ...
+        }
+        print("参数个数:", t.n)
+        print("表长度:", #t)
+        for i = 1, t.n do
+                print(t[i])
+        end
+end
+f(1, 2, 3)
+f("a", "b", "c", "d")
+f()
+local process
+process = function(...)
+        local args = {
+                n = select("#", ...),
+                ...
+        }
+        local sum = 0
+        for i = 1, args.n do
+                if args[i] ~= nil and type(args[i]) == "number" then
+                        sum = sum + args[i]
+                end
+        end
+        return sum
+end
+process(1, nil, 3, nil, 5)
 f(function()
        return print("hello")
 end)
@@ -874,6 +1141,28 @@ for _index_0 = 1, #_list_0 do
        _len_0 = _len_0 + 1
 end
 doubled = _accum_0
+local data = {
+        a = {
+                1,
+                2,
+                3
+        },
+        b = {
+                4,
+                5,
+                6
+        }
+}
+local flat
+local _accum_0 = { }
+for k, v in pairs(data) do
+        local _len_0 = #_accum_0 + 1
+        for _index_0 = 1, #v do
+                local _elm_0 = v[_index_0]
+                _accum_0[_len_0], _len_0 = _elm_0, _len_0 + 1
+        end
+end
+flat = _accum_0
 local x_coords = {
        4,
        5,
@@ -964,8 +1253,18 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
+for _index_0 = 1, 5 do
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+slice = _accum_0
+local slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _max_0 = #_list_0
+for _index_0 = 2, _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -975,7 +1274,8 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 2, #_list_0 do
+local _max_0 = #_list_0
+for _index_0 = 1, _max_0, 2 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -985,12 +1285,35 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 1, #_list_0, 2 do
+local _min_0 = #_list_0 + -4 + 1
+local _max_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
 end
 slice = _accum_0
+local reverse_slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _min_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, 1, -1 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+reverse_slice = _accum_0
+local sub_list
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+for _index_0 = 2, 4 do
+        local _item_0 = _list_0[_index_0]
+        _accum_0[_len_0] = _item_0
+        _len_0 = _len_0 + 1
+end
+sub_list = _accum_0
 for i = 10, 20 do
        print(i)
 end
@@ -1001,8 +1324,7 @@ for key, value in pairs(object) do
        print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
+for _index_0 = 2, 4 do
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
        local item = _list_0[_index_0]
        print(item)
 end
@@ -1020,12 +1342,24 @@ local _len_0 = 1
 for i = 1, 20 do
        if i % 2 == 0 then
                _accum_0[_len_0] = i * 2
+                _len_0 = _len_0 + 1
        else
                _accum_0[_len_0] = i
+                _len_0 = _len_0 + 1
        end
-        _len_0 = _len_0 + 1
 end
 doubled_evens = _accum_0
+local first_large
+local _accum_0
+local _list_0 = numbers
+for _index_0 = 1, #_list_0 do
+        local n = _list_0[_index_0]
+        if n > 10 then
+                _accum_0 = n
+                break
+        end
+end
+first_large = _accum_0
 local func_a
 func_a = function()
        for i = 1, 10 do
@@ -1174,7 +1508,7 @@ if "Robert" == name then
 elseif "Dan" == name or "Daniel" == name then
        print("你的名字是Dan")
 else
-        print("我不知道你的名字")
+        print("我不认识你，你的名字是" .. tostring(name))
 end
 local b = 1
 local next_number
@@ -1274,6 +1608,192 @@ if _tab_0 then
        end
        print("Vec2 " .. tostring(x) .. ", " .. tostring(y))
 end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        if 1 == _exp_0[1] and 2 == _exp_0[2] and 3 == _exp_0[3] then
+                _match_0 = true
+                print("1, 2, 3")
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local b = _exp_0[2]
+                if 1 == _exp_0[1] and b ~= nil and 3 == _exp_0[3] then
+                        _match_1 = true
+                        print("1, " .. tostring(b) .. ", 3")
+                end
+        end
+        if not _match_1 then
+                if _tab_0 then
+                        local b = _exp_0[3]
+                        if b == nil then
+                                b = 3
+                        end
+                        if 1 == _exp_0[1] and 2 == _exp_0[2] then
+                                print("1, 2, " .. tostring(b))
+                        end
+                end
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local result = _exp_0.result
+        if true == _exp_0.success and result ~= nil then
+                _match_0 = true
+                print("成功", result)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                if false == _exp_0.success then
+                        _match_1 = true
+                        print("失败", result)
+                end
+        end
+        if not _match_1 then
+                print("无效值")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local content
+        do
+                local _obj_0 = _exp_0.data
+                local _type_1 = type(_obj_0)
+                if "table" == _type_1 or "userdata" == _type_1 then
+                        content = _obj_0.content
+                end
+        end
+        local _val_0
+        do
+                local _obj_0 = _exp_0.data
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.type
+                end
+        end
+        if "success" == _val_0 and content ~= nil then
+                _match_0 = true
+                print("成功", content)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local content
+                do
+                        local _obj_0 = _exp_0.data
+                        local _type_1 = type(_obj_0)
+                        if "table" == _type_1 or "userdata" == _type_1 then
+                                content = _obj_0.content
+                        end
+                end
+                local _val_0
+                do
+                        local _obj_0 = _exp_0.data
+                        if _obj_0 ~= nil then
+                                _val_0 = _obj_0.type
+                        end
+                end
+                if "error" == _val_0 and content ~= nil then
+                        _match_1 = true
+                        print("失败", content)
+                end
+        end
+        if not _match_1 then
+                print("无效值")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local fourth = _exp_0[4]
+        local _val_0
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.a
+                end
+        end
+        local _val_1
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_1 = _obj_0.b
+                end
+        end
+        local _val_2
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_2 = _obj_0.a
+                end
+        end
+        local _val_3
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_3 = _obj_0.b
+                end
+        end
+        local _val_4
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_4 = _obj_0.a
+                end
+        end
+        local _val_5
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_5 = _obj_0.b
+                end
+        end
+        if 1 == _val_0 and 2 == _val_1 and 3 == _val_2 and 4 == _val_3 and 5 == _val_4 and 6 == _val_5 and fourth ~= nil then
+                print("匹配成功", fourth)
+        end
+end
+local segments = {
+        "admin",
+        "users",
+        "logs",
+        "view"
+}
+local _type_0 = type(segments)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local groups
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #segments + -3 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = segments[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                groups = _accum_0
+        end
+        local resource = segments[#segments - 1]
+        local action = segments[#segments]
+        if resource ~= nil and action ~= nil then
+                print("Group:", groups)
+                print("Resource:", resource)
+                print("Action:", action)
+        end
+end
 local Inventory
 local _class_0
 local _base_0 = {
@@ -1930,6 +2450,10 @@ do
        _with_1["key-name"] = value
 end
 _with_0[#_with_0 + 1] = "abc"
+local _with_0 = obj
+if _with_0 ~= nil then
+        print(obj.name)
+end
 do
        local var = "hello"
        print(var)
@@ -2020,6 +2544,38 @@ local inventory = {
                }
        }
 }
+local map
+map = function(arr, action)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                _accum_0[_len_0] = action(item)
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end
+local filter
+filter = function(arr, cond)
+        local _accum_0 = { }
+        local _len_0 = 1
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                if cond(item) then
+                        _accum_0[_len_0] = item
+                        _len_0 = _len_0 + 1
+                end
+        end
+        return _accum_0
+end
+local reduce
+reduce = function(arr, init, action)
+        for _index_0 = 1, #arr do
+                local item = arr[_index_0]
+                init = action(init, item)
+        end
+        return init
+end
 print(reduce(filter(map({
        1,
        2,
@@ -2041,8 +2597,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
        p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
+local _u1f31b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('你好 世界')
@@ -2077,6 +2633,12 @@ end
 print("yuescript")
 print(3)
 print("有效的枚举类型:", "Static")
+do
+        print(123, "hello")
+end
+do
+        print(123, "hello")
+end
 if tb ~= nil then
        tb:func()
 end
@@ -2109,6 +2671,21 @@ print((function()
 end)())
 local tab = { }
 tab[#tab + 1] = "Value"
+local tbA = {
+        1,
+        2,
+        3
+}
+local tbB = {
+        4,
+        5,
+        6
+}
+local _len_0 = #tbA + 1
+for _index_0 = 1, #tbB do
+        local _elm_0 = tbB[_index_0]
+        tbA[_len_0], _len_0 = _elm_0, _len_0 + 1
+end
 local parts = {
        "shoulders",
        "knees"
@@ -2177,6 +2754,18 @@ for _key_0, _value_0 in pairs(b) do
        end
 end
 merge = _tab_0
+local last
+do
+        local _item_0 = data.items
+        last = _item_0[#_item_0]
+end
+local second_last
+do
+        local _item_0 = data.items
+        second_last = _item_0[#_item_0 - 1]
+end
+local _obj_0 = data.items
+_obj_0[#_obj_0] = 1
 local mt = { }
 local add
 add = function(self, right)
@@ -2307,6 +2896,14 @@ func({
        2,
        3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
        name = "abc",
        values = {
@@ -2368,6 +2965,25 @@ do
        local _obj_0 = require("export")
        one, two, ch = _obj_0[1], _obj_0[2], _obj_0.Something.umm[1]
 end
+do
+        local tostring <const> = tostring
+        local concat <const> = table.concat
+        print(concat({
+                "a",
+                tostring(1)
+        }))
+end
+do
+        local print <const> = print
+        local math <const> = math
+        print("hello")
+        math.random(3)
+end
+do
+        local print <const> = print
+        print(FLAG)
+        FLAG = 123
+end
 local _module_0 = { }
 local a, b, c = 1, 2, 3
 _module_0["a"], _module_0["b"], _module_0["c"] = a, b, c
@@ -2547,6 +3163,59 @@ end
 local two, four
 local _obj_0 = items
 two, four = _obj_0[2], _obj_0[4]
+local orders = {
+        "first",
+        "second",
+        "third",
+        "fourth",
+        "last"
+}
+local first, bulk, last = orders[1], (function()
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _max_0 = #orders + -2 + 1
+        for _index_0 = 2, _max_0 do
+                local _item_0 = orders[_index_0]
+                _accum_0[_len_0] = _item_0
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end)(), orders[#orders]
+print(first)
+print(bulk)
+print(last)
+local first, rest
+do
+        local _obj_0 = orders
+        first, rest = _obj_0[1], (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0
+                for _index_0 = 2, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)()
+end
+local start, last
+do
+        local _obj_0 = orders
+        start, last = (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0 + -2 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)(), _obj_0[#_obj_0]
+end
+local _obj_0 = orders
+first, last = _obj_0[1], _obj_0[#_obj_0]
 local tuples = {
        {
                "hello",
@@ -2611,6 +3280,9 @@ end
        local first = select(1, ...)
        return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
        return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -2648,6 +3320,56 @@ end)
 if success then
        print(result)
 end
+local a, b, c
+do
+        local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                return func()
+        end)
+        if _ok_0 then
+                a, b, c = _ret_0, _ret_1, _ret_2
+        end
+end
+do
+        local _exp_0 = ((function()
+                return (function(_arg_0, ...)
+                        local _ok_0 = _arg_0
+                        if _ok_0 then
+                                return ...
+                        end
+                end)(pcall(function()
+                        return func()
+                end))
+        end)())
+        if _exp_0 ~= nil then
+                a = _exp_0
+        else
+                a = "default"
+        end
+end
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(pcall(function()
+                return func()
+        end))
+end)())
+f((function()
+        return (function(_arg_0, ...)
+                local _ok_0 = _arg_0
+                if _ok_0 then
+                        return ...
+                end
+        end)(xpcall(function()
+                print(123)
+                return func()
+        end, function(e)
+                print(e)
+                return e
+        end))
+end)())
 local a <const> = 123
 local _ <close> = setmetatable({ }, {
        __close = function()
@@ -2657,10 +3379,19 @@ local _ <close> = setmetatable({ }, {
 local a, b, c, d
 local _obj_0 = tb
 a, b, c, d = _obj_0.a, _obj_0.b, _obj_0[1], _obj_0[2]
+Constant = 123
 local some_string = "这是一个字符串\n  并包括一个换行。"
 print("我有" .. tostring(math.random() * 100) .. "%的把握。")
 local integer = 1000000
 local hex = 0xEFBBBF
+local binary = 19
+local str = "key: value\nlist:\n  - item1\n  - " .. tostring(expr)
+local fn
+fn = function()
+        local str = "foo:\n  bar: baz"
+        return str
+end
+local str = "path: \"C:\\Program Files\\App\"\nnote: 'He said: \"" .. tostring(Hello) .. "!\"'"
 local my_function
 my_function = function() end
 my_function()
@@ -2749,6 +3480,96 @@ if func(1, 2, 3, "你好", "世界") then
        print("你好")
        print("我在if内部")
 end
+local f1
+f1 = function(_arg_0)
+        local a, b, c
+        a, b, c = _arg_0.a, _arg_0.b, _arg_0.c
+        return print(a, b, c)
+end
+f1({
+        a = 1,
+        b = "2",
+        c = { }
+})
+local f2
+f2 = function(_arg_0, c)
+        local a1, b
+        a1, b = _arg_0.a, _arg_0.b
+        if a1 == nil then
+                a1 = 123
+        end
+        if b == nil then
+                b = 'abc'
+        end
+        if c == nil then
+                c = { }
+        end
+        return print(a1, b, c)
+end
+local arg1 = {
+        a = 0
+}
+f2(arg1, arg2)
+local findFirstEven
+findFirstEven = function(list)
+        for _index_0 = 1, #list do
+                local item = list[_index_0]
+                if type(item) == "table" then
+                        for _index_1 = 1, #item do
+                                local sub = item[_index_1]
+                                if sub % 2 == 0 then
+                                        return sub
+                                end
+                        end
+                end
+        end
+        return nil
+end
+local findFirstEven
+findFirstEven = function(list)
+        for _index_0 = 1, #list do
+                local item = list[_index_0]
+                if type(item) == "table" then
+                        for _index_1 = 1, #item do
+                                local sub = item[_index_1]
+                                if sub % 2 == 0 then
+                                        return sub
+                                end
+                        end
+                end
+        end
+        return nil
+end
+local f
+f = function(...)
+        local t = {
+                n = select("#", ...),
+                ...
+        }
+        print("参数个数:", t.n)
+        print("表长度:", #t)
+        for i = 1, t.n do
+                print(t[i])
+        end
+end
+f(1, 2, 3)
+f("a", "b", "c", "d")
+f()
+local process
+process = function(...)
+        local args = {
+                n = select("#", ...),
+                ...
+        }
+        local sum = 0
+        for i = 1, args.n do
+                if args[i] ~= nil and type(args[i]) == "number" then
+                        sum = sum + args[i]
+                end
+        end
+        return sum
+end
+process(1, nil, 3, nil, 5)
 f(function()
        return print("hello")
 end)
@@ -2874,6 +3695,28 @@ for _index_0 = 1, #_list_0 do
        _len_0 = _len_0 + 1
 end
 doubled = _accum_0
+local data = {
+        a = {
+                1,
+                2,
+                3
+        },
+        b = {
+                4,
+                5,
+                6
+        }
+}
+local flat
+local _accum_0 = { }
+for k, v in pairs(data) do
+        local _len_0 = #_accum_0 + 1
+        for _index_0 = 1, #v do
+                local _elm_0 = v[_index_0]
+                _accum_0[_len_0], _len_0 = _elm_0, _len_0 + 1
+        end
+end
+flat = _accum_0
 local x_coords = {
        4,
        5,
@@ -2964,8 +3807,7 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
+for _index_0 = 1, 5 do
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -2975,7 +3817,8 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 2, #_list_0 do
+local _max_0 = #_list_0
+for _index_0 = 2, _max_0 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
@@ -2985,12 +3828,46 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-for _index_0 = 1, #_list_0, 2 do
+local _max_0 = #_list_0
+for _index_0 = 1, _max_0, 2 do
        local item = _list_0[_index_0]
        _accum_0[_len_0] = item
        _len_0 = _len_0 + 1
 end
 slice = _accum_0
+local slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _min_0 = #_list_0 + -4 + 1
+local _max_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, _max_0 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+slice = _accum_0
+local reverse_slice
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+local _min_0 = #_list_0 + -1 + 1
+for _index_0 = _min_0, 1, -1 do
+        local item = _list_0[_index_0]
+        _accum_0[_len_0] = item
+        _len_0 = _len_0 + 1
+end
+reverse_slice = _accum_0
+local sub_list
+local _accum_0 = { }
+local _len_0 = 1
+local _list_0 = items
+for _index_0 = 2, 4 do
+        local _item_0 = _list_0[_index_0]
+        _accum_0[_len_0] = _item_0
+        _len_0 = _len_0 + 1
+end
+sub_list = _accum_0
 for i = 10, 20 do
        print(i)
 end
@@ -3001,8 +3878,7 @@ for key, value in pairs(object) do
        print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
+for _index_0 = 2, 4 do
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
        local item = _list_0[_index_0]
        print(item)
 end
@@ -3020,12 +3896,24 @@ local _len_0 = 1
 for i = 1, 20 do
        if i % 2 == 0 then
                _accum_0[_len_0] = i * 2
+                _len_0 = _len_0 + 1
        else
                _accum_0[_len_0] = i
+                _len_0 = _len_0 + 1
        end
-        _len_0 = _len_0 + 1
 end
 doubled_evens = _accum_0
+local first_large
+local _accum_0
+local _list_0 = numbers
+for _index_0 = 1, #_list_0 do
+        local n = _list_0[_index_0]
+        if n > 10 then
+                _accum_0 = n
+                break
+        end
+end
+first_large = _accum_0
 local func_a
 func_a = function()
        for i = 1, 10 do
@@ -3174,7 +4062,7 @@ if "Robert" == name then
 elseif "Dan" == name or "Daniel" == name then
        print("你的名字是Dan")
 else
-        print("我不知道你的名字")
+        print("我不认识你，你的名字是" .. tostring(name))
 end
 local b = 1
 local next_number
@@ -3274,6 +4162,192 @@ if _tab_0 then
        end
        print("Vec2 " .. tostring(x) .. ", " .. tostring(y))
 end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        if 1 == _exp_0[1] and 2 == _exp_0[2] and 3 == _exp_0[3] then
+                _match_0 = true
+                print("1, 2, 3")
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local b = _exp_0[2]
+                if 1 == _exp_0[1] and b ~= nil and 3 == _exp_0[3] then
+                        _match_1 = true
+                        print("1, " .. tostring(b) .. ", 3")
+                end
+        end
+        if not _match_1 then
+                if _tab_0 then
+                        local b = _exp_0[3]
+                        if b == nil then
+                                b = 3
+                        end
+                        if 1 == _exp_0[1] and 2 == _exp_0[2] then
+                                print("1, 2, " .. tostring(b))
+                        end
+                end
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local result = _exp_0.result
+        if true == _exp_0.success and result ~= nil then
+                _match_0 = true
+                print("成功", result)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                if false == _exp_0.success then
+                        _match_1 = true
+                        print("失败", result)
+                end
+        end
+        if not _match_1 then
+                print("无效值")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+local _match_0 = false
+if _tab_0 then
+        local content
+        do
+                local _obj_0 = _exp_0.data
+                local _type_1 = type(_obj_0)
+                if "table" == _type_1 or "userdata" == _type_1 then
+                        content = _obj_0.content
+                end
+        end
+        local _val_0
+        do
+                local _obj_0 = _exp_0.data
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.type
+                end
+        end
+        if "success" == _val_0 and content ~= nil then
+                _match_0 = true
+                print("成功", content)
+        end
+end
+if not _match_0 then
+        local _match_1 = false
+        if _tab_0 then
+                local content
+                do
+                        local _obj_0 = _exp_0.data
+                        local _type_1 = type(_obj_0)
+                        if "table" == _type_1 or "userdata" == _type_1 then
+                                content = _obj_0.content
+                        end
+                end
+                local _val_0
+                do
+                        local _obj_0 = _exp_0.data
+                        if _obj_0 ~= nil then
+                                _val_0 = _obj_0.type
+                        end
+                end
+                if "error" == _val_0 and content ~= nil then
+                        _match_1 = true
+                        print("失败", content)
+                end
+        end
+        if not _match_1 then
+                print("无效值")
+        end
+end
+local _exp_0 = tb
+local _type_0 = type(_exp_0)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local fourth = _exp_0[4]
+        local _val_0
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_0 = _obj_0.a
+                end
+        end
+        local _val_1
+        do
+                local _obj_0 = _exp_0[1]
+                if _obj_0 ~= nil then
+                        _val_1 = _obj_0.b
+                end
+        end
+        local _val_2
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_2 = _obj_0.a
+                end
+        end
+        local _val_3
+        do
+                local _obj_0 = _exp_0[2]
+                if _obj_0 ~= nil then
+                        _val_3 = _obj_0.b
+                end
+        end
+        local _val_4
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_4 = _obj_0.a
+                end
+        end
+        local _val_5
+        do
+                local _obj_0 = _exp_0[3]
+                if _obj_0 ~= nil then
+                        _val_5 = _obj_0.b
+                end
+        end
+        if 1 == _val_0 and 2 == _val_1 and 3 == _val_2 and 4 == _val_3 and 5 == _val_4 and 6 == _val_5 and fourth ~= nil then
+                print("匹配成功", fourth)
+        end
+end
+local segments = {
+        "admin",
+        "users",
+        "logs",
+        "view"
+}
+local _type_0 = type(segments)
+local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+if _tab_0 then
+        local groups
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #segments + -3 + 1
+                for _index_0 = 1, _max_0 do
+                        local _item_0 = segments[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                groups = _accum_0
+        end
+        local resource = segments[#segments - 1]
+        local action = segments[#segments]
+        if resource ~= nil and action ~= nil then
+                print("Group:", groups)
+                print("Resource:", resource)
+                print("Action:", action)
+        end
+end
 local Inventory
 local _class_0
 local _base_0 = {
@@ -3930,6 +5004,10 @@ do
        _with_1["key-name"] = value
 end
 _with_0[#_with_0 + 1] = "abc"
+local _with_0 = obj
+if _with_0 ~= nil then
+        print(obj.name)
+end
 do
        local var = "hello"
        print(var)
diff --git a/spec/outputs/comprehension.lua b/spec/outputs/comprehension.lua
index 9a7c478..663bd44 100644
--- a/spec/outputs/comprehension.lua
+++ b/spec/outputs/comprehension.lua
@@ -243,8 +243,11 @@ end
 do
        local _accum_0 = { }
        local _len_0 = 1
+        local _min_0 = 1 + 2
        local _max_0 = 3 + 4
-        for _index_0 = 1 + 2, _max_0 < 0 and #items + _max_0 or _max_0 do
+        _min_0 = _min_0 < 0 and #items + _min_0 + 1 or _min_0
+        _max_0 = _max_0 < 0 and #items + _max_0 + 1 or _max_0
+        for _index_0 = _min_0, _max_0 do
                local item = items[_index_0]
                _accum_0[_len_0] = item
                _len_0 = _len_0 + 1
@@ -254,8 +257,11 @@ end
 do
        local _accum_0 = { }
        local _len_0 = 1
+        local _min_0 = hello() * 4
        local _max_0 = 2 - thing[4]
-        for _index_0 = hello() * 4, _max_0 < 0 and #items + _max_0 or _max_0 do
+        _min_0 = _min_0 < 0 and #items + _min_0 + 1 or _min_0
+        _max_0 = _max_0 < 0 and #items + _max_0 + 1 or _max_0
+        for _index_0 = _min_0, _max_0 do
                local item = items[_index_0]
                _accum_0[_len_0] = item
                _len_0 = _len_0 + 1
diff --git a/spec/outputs/destructure.lua b/spec/outputs/destructure.lua
index 44da58b..4e19aca 100644
--- a/spec/outputs/destructure.lua
+++ b/spec/outputs/destructure.lua
@@ -621,4 +621,114 @@ do
                print(meta_field, abc, def)
        end
 end
+do
+        local clients = {
+                "VIP_Alice",
+                "User_Bob",
+                "User_Clara",
+                "VIP_Eva"
+        }
+        local vipStart, regulars, vipEnd = clients[1], (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #clients + -2 + 1
+                for _index_0 = 2, _max_0 do
+                        local _item_0 = clients[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)(), clients[#clients]
+        print(vipStart)
+        print(regulars)
+        print(vipEnd)
+end
+do
+        local setupMeeting
+        setupMeeting = function(participants)
+                local chair, secretary = participants[1], participants[#participants]
+                return print(chair, secretary)
+        end
+        setupMeeting({
+                "Alice",
+                "Bob",
+                "Charlie",
+                "David"
+        })
+end
+do
+        local getTransactions
+        getTransactions = function()
+                return {
+                        {
+                                id = "T1",
+                                amount = 100
+                        },
+                        {
+                                id = "T2",
+                                amount = 200
+                        },
+                        {
+                                id = "T3",
+                                amount = 300
+                        }
+                }
+        end
+        local id, amount
+        do
+                local _item_0 = getTransactions()
+                local _obj_0 = _item_0[#_item_0]
+                id, amount = _obj_0.id, _obj_0.amount
+        end
+        assert(id == "T3")
+        assert(amount == 300)
+end
+do
+        local middle
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _list_0 = tb
+        local _max_0 = #_list_0 + -2 + 1
+        for _index_0 = 2, _max_0 do
+                local _item_0 = _list_0[_index_0]
+                _accum_0[_len_0] = _item_0
+                _len_0 = _len_0 + 1
+        end
+        middle = _accum_0
+end
+do
+        local a, abc, b, def, sub, d, e
+        local _obj_0 = tb
+        a, abc, b, def, sub, d, e = _obj_0[1], _obj_0.abc, _obj_0[2], _obj_0.def, (function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_0 = #_obj_0 + -3 + 1
+                for _index_0 = 3, _max_0 do
+                        local _item_0 = _obj_0[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end)(), _obj_0[#_obj_0 - 1], _obj_0[#_obj_0]
+end
+do
+        local _list_0 = items
+        for _index_0 = 1, #_list_0 do
+                local _des_0 = _list_0[_index_0]
+                local a, b = _des_0.a, _des_0.b
+                print(a, b)
+        end
+        local _list_1 = items
+        for _index_0 = 1, #_list_1 do
+                local _des_0 = _list_1[_index_0]
+                local a, b = _des_0.a, _des_0.b
+                print(a, b)
+        end
+        for _des_0 in pairs(data) do
+                local body = _des_0.body
+                if body then
+                        print(body)
+                end
+        end
+end
 return nil
diff --git a/spec/outputs/funcs.lua b/spec/outputs/funcs.lua
index c1735c4..db7ed67 100644
--- a/spec/outputs/funcs.lua
+++ b/spec/outputs/funcs.lua
@@ -283,4 +283,157 @@ do
        end
        print(func())
 end
+local _anon_func_0 = function(_arg_0)
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _max_0 = #_arg_0
+        for _index_0 = 1, _max_0 do
+                local _item_0 = _arg_0[_index_0]
+                _accum_0[_len_0] = _item_0
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end
+do
+        local f
+        f = function(_arg_0)
+                local a, b, c
+                a, b, c = _arg_0.a, _arg_0.b, _arg_0.c
+                return print(a, b, c)
+        end
+        f = function(_arg_0)
+                local a, b, c
+                a, b, c = _arg_0.a, _arg_0.b, _arg_0.c
+                return print(a, b, c)
+        end
+        local g
+        g = function(x, _arg_0)
+                local y
+                y = _arg_0.y
+                return print(x, y)
+        end
+        local i
+        i = function(_arg_0)
+                local ax, by
+                ax, by = _arg_0.a, _arg_0.b
+                if ax == nil then
+                        ax = 0
+                end
+                if by == nil then
+                        by = 0
+                end
+                return print(ax, by)
+        end
+        j = function(name, _arg_0)
+                local uid, role
+                uid, role = _arg_0.id, _arg_0.role
+                if uid == nil then
+                        uid = "n/a"
+                end
+                if role == nil then
+                        role = "guest"
+                end
+                return print(name, uid, role)
+        end
+        local m
+        m = function(_arg_0)
+                local name, age, ver
+                name, age, ver = _arg_0.user.name, _arg_0.user.age, _arg_0.meta.ver
+                if ver == nil then
+                        ver = 1
+                end
+                return print(name, age, ver)
+        end
+        local m1
+        m1 = function(_arg_0)
+                local name, age, meta
+                name, age, meta = _arg_0.user.name, _arg_0.user.age, _arg_0.meta
+                if meta == nil then
+                        meta = { }
+                end
+                return print(name, age, meta and meta.ver or "nil")
+        end
+        local new
+        new = function(self, _arg_0)
+                local name, age
+                name, age = _arg_0.name, _arg_0.age
+                if name == nil then
+                        name = "anon"
+                end
+                if age == nil then
+                        age = 0
+                end
+                self.name = name
+                self.age = age
+        end
+        local set
+        set = function(self, _arg_0)
+                local name, age
+                name, age = _arg_0.name, _arg_0.age
+                if name == nil then
+                        name = self.name
+                end
+                if age == nil then
+                        age = self.age
+                end
+                self.name = name
+                self.age = age
+        end
+        local logKV
+        logKV = function(_arg_0, ...)
+                local k, v
+                k, v = _arg_0.k, _arg_0.v
+                print("kv:", k, v)
+                return print("rest count:", select("#", ...))
+        end
+        do
+                local foo
+                foo = function(_arg_0)
+                        local a, b
+                        a, b = _arg_0.a, _arg_0.b
+                        if b == nil then
+                                b = 0
+                        end
+                        return print(a, b)
+                end
+        end
+        local t1
+        t1 = function(_arg_0, x)
+                local a
+                a = _arg_0.a
+                return print(a, x)
+        end
+        local t2
+        t2 = function(_arg_0)
+                local a
+                a = _arg_0.a
+                return print(a)
+        end
+        local w
+        w = function(id, _arg_0, _arg_1)
+                local x, y
+                x, y = _arg_0.x, _arg_0.y
+                if x == nil then
+                        x = 0
+                end
+                if y == nil then
+                        y = 0
+                end
+                local flag
+                flag = _arg_1.flag
+                return print(id, x, y, flag)
+        end
+        local g1
+        g1 = function(_arg_0)
+                local a, ax
+                a, ax = _arg_0.a, _arg_0.a
+                return print(a, ax)
+        end
+        local g4
+        g4 = function(_arg_0)
+                local a, b, rest
+                a, b, rest = _arg_0.a, _arg_0.b, _anon_func_0(_arg_0)
+                return print(a, b)
+        end
+end
 return nil
diff --git a/spec/outputs/global.lua b/spec/outputs/global.lua
index 54a21a9..3918f85 100644
--- a/spec/outputs/global.lua
+++ b/spec/outputs/global.lua
@@ -93,3 +93,28 @@ do
        FooBar = "pascal case"
        FOOBAR = "all uppercase"
 end
+do
+        do
+                local _class_0
+                local _base_0 = { }
+                if _base_0.__index == nil then
+                        _base_0.__index = _base_0
+                end
+                _class_0 = setmetatable({
+                        __init = function() end,
+                        __base = _base_0,
+                        __name = "A"
+                }, {
+                        __index = _base_0,
+                        __call = function(cls, ...)
+                                local _self_0 = setmetatable({ }, _base_0)
+                                cls.__init(_self_0, ...)
+                                return _self_0
+                        end
+                })
+                _base_0.__class = _class_0
+                A = _class_0
+        end
+        Flag = 1
+        const, x, y = "const", 1, 2
+end
diff --git a/spec/outputs/import.lua b/spec/outputs/import.lua
index 83c99e2..7aa130f 100644
--- a/spec/outputs/import.lua
+++ b/spec/outputs/import.lua
@@ -166,3 +166,13 @@ do
        local _obj_1 = require("m")
        g, i = _obj_1[1], getmetatable(_obj_1[2]).__close
 end
+do
+        local require <const> = require
+        local stringlib <const> = string
+        local format <const> = string.format
+        local io_read <const> = io.read
+        local type
+        type = function() end
+        local tp <const> = _G.type
+        local yue <const> = _G["月"]
+end
diff --git a/spec/outputs/import_global.lua b/spec/outputs/import_global.lua
new file mode 100644
index 0000000..895daf9
--- /dev/null
+++ b/spec/outputs/import_global.lua
@@ -0,0 +1,131 @@
+do
+        local print <const> = print
+        local math <const> = math
+        print("hello")
+        math.random(10)
+end
+do
+        local print <const> = print
+        local value = 1
+        value = value + 2
+        print(value)
+end
+do
+        local print
+        print = function(msg)
+                return msg
+        end
+        do
+                local math <const> = math
+                print("local")
+                math.random(1)
+        end
+end
+do
+        local print <const> = print
+        local tostring
+        tostring = function(v)
+                return "local"
+        end
+        tostring("value")
+        print(tostring(123))
+end
+do
+        local func
+        func = function(x, y)
+                local type <const> = type
+                local tostring <const> = tostring
+                local print <const> = print
+                return type(x, tostring(y, print))
+        end
+        func(1, 2)
+end
+do
+        local xpcall <const> = xpcall
+        local func <const> = func
+        local world <const> = world
+        local tostring <const> = tostring
+        local print <const> = print
+        xpcall(function()
+                return func("hello " .. tostring(world))
+        end, function(err)
+                return print(err)
+        end)
+end
+do
+        local print <const> = print
+        print(FLAG)
+        FLAG = 123
+end
+do
+        local print <const> = print
+        Foo = 10
+        print(Foo)
+        Foo = Foo + 2
+end
+do
+        local print <const> = print
+        Bar = 1
+        Baz = 2
+        print(Bar, Baz)
+end
+do
+        local y <const> = y
+        x = 3434
+        if y then
+                x = 10
+        end
+end
+do
+        local lowercase <const> = lowercase
+        local tostring <const> = tostring
+        local Uppercase <const> = Uppercase
+        local foobar = "all " .. tostring(lowercase)
+        FooBar = "pascal case"
+        FOOBAR = "all " .. tostring(Uppercase)
+end
+do
+        local setmetatable <const> = setmetatable
+        local print <const> = print
+        do
+                local _class_0
+                local _base_0 = { }
+                if _base_0.__index == nil then
+                        _base_0.__index = _base_0
+                end
+                _class_0 = setmetatable({
+                        __init = function() end,
+                        __base = _base_0,
+                        __name = "A"
+                }, {
+                        __index = _base_0,
+                        __call = function(cls, ...)
+                                local _self_0 = setmetatable({ }, _base_0)
+                                cls.__init(_self_0, ...)
+                                return _self_0
+                        end
+                })
+                _base_0.__class = _class_0
+                A = _class_0
+        end
+        Flag = 1
+        const, x, y = "const", 1, 2
+        print(math, table)
+end
+do
+        local X <const> = X
+        X:func(1, 2, 3)
+        X.tag = "abc"
+end
+local _anon_func_0 = function(func)
+        return func
+end
+do
+        local func <const> = func
+        local pcall <const> = pcall
+        local f
+        f = function()
+                func()
+                return pcall(_anon_func_0, func)
+        end
+end
diff --git a/spec/outputs/lists.lua b/spec/outputs/lists.lua
index 48ec9c8..75f04fa 100644
--- a/spec/outputs/lists.lua
+++ b/spec/outputs/lists.lua
@@ -230,31 +230,36 @@ x = {
        6,
        7
 }
-local _max_0 = -5
+local _max_0 = #x + -5 + 1
-for _index_0 = 2, _max_0 < 0 and #x + _max_0 or _max_0, 2 do
+for _index_0 = 2, _max_0, 2 do
        local y = x[_index_0]
        print(y)
 end
-local _max_1 = 3
+for _index_0 = 1, 3 do
-for _index_0 = 1, _max_1 < 0 and #x + _max_1 or _max_1 do
        local y = x[_index_0]
        print(y)
 end
-for _index_0 = 2, #x do
+local _max_1 = #x
+for _index_0 = 2, _max_1 do
        local y = x[_index_0]
        print(y)
 end
-for _index_0 = 1, #x, 2 do
+local _max_2 = #x
+for _index_0 = 1, _max_2, 2 do
        local y = x[_index_0]
        print(y)
 end
-for _index_0 = 2, #x, 2 do
+local _max_3 = #x
+for _index_0 = 2, _max_3, 2 do
        local y = x[_index_0]
        print(y)
 end
 local a, b, c = 1, 5, 2
-local _max_2 = b
+local _min_0 = a
-for _index_0 = a, _max_2 < 0 and #x + _max_2 or _max_2, c do
+local _max_4 = b
+_min_0 = _min_0 < 0 and #x + _min_0 + 1 or _min_0
+_max_4 = _max_4 < 0 and #x + _max_4 + 1 or _max_4
+for _index_0 = _min_0, _max_4, c do
        local y = x[_index_0]
        print(y)
 end
@@ -287,7 +292,10 @@ do
                a
        })
        local _list_0 = f
-        for _index_0 = a, #_list_0 do
+        local _min_1 = a
+        local _max_5 = #_list_0
+        _min_1 = _min_1 < 0 and #_list_0 + _min_1 + 1 or _min_1
+        for _index_0 = _min_1, _max_5 do
                local v = _list_0[_index_0]
                print(v)
        end
@@ -327,4 +335,570 @@ do
                job = "jobless"
        end
 end
+do
+        local transactions = {
+                "T001",
+                "T002",
+                "T003",
+                "T004",
+                "T005"
+        }
+        local middleTransactions
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_5 = #transactions + -2 + 1
+                for _index_0 = 2, _max_5 do
+                        local _item_0 = transactions[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                middleTransactions = _accum_0
+        end
+        print(middleTransactions)
+end
+do
+        local logs = {
+                {
+                        start = 0,
+                        ["end"] = 100
+                },
+                {
+                        start = 100,
+                        ["end"] = 200
+                },
+                {
+                        start = 200,
+                        ["end"] = 123
+                }
+        }
+        print(logs[#logs]["end"])
+end
+do
+        local pendingOrders = {
+                "O001",
+                "O002",
+                "O003",
+                "O004"
+        }
+        print(pendingOrders[#pendingOrders - 1])
+end
+do
+        local getOrders
+        getOrders = function()
+                return {
+                        {
+                                id = "O1001",
+                                status = "pending"
+                        },
+                        {
+                                id = "O1002",
+                                status = "processing"
+                        },
+                        {
+                                id = "O1003",
+                                status = "done"
+                        }
+                }
+        end
+        local lastStatus
+        do
+                local _item_0 = getOrders()
+                lastStatus = _item_0[#_item_0].status
+        end
+        assert(lastStatus == "done")
+end
+do
+        local cloneList1
+        cloneList1 = function(list)
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _max_5 = #list
+                for _index_0 = 1, _max_5 do
+                        local _item_0 = list[_index_0]
+                        _accum_0[_len_0] = _item_0
+                        _len_0 = _len_0 + 1
+                end
+                return _accum_0
+        end
+        local cloneList2
+        cloneList2 = function(list)
+                local _tab_0 = { }
+                local _idx_0 = #_tab_0 + 1
+                for _index_0 = 1, #list do
+                        local _value_0 = list[_index_0]
+                        _tab_0[_idx_0] = _value_0
+                        _idx_0 = _idx_0 + 1
+                end
+                return _tab_0
+        end
+        local cloneTable
+        cloneTable = function(tb)
+                local _tab_0 = { }
+                local _idx_0 = 1
+                for _key_0, _value_0 in pairs(tb) do
+                        if _idx_0 == _key_0 then
+                                _tab_0[#_tab_0 + 1] = _value_0
+                                _idx_0 = _idx_0 + 1
+                        else
+                                _tab_0[_key_0] = _value_0
+                        end
+                end
+                return _tab_0
+        end
+end
+do
+        print((function()
+                local _item_0 = globalTB
+                return _item_0[#_item_0]
+        end)(), (function()
+                local _item_0 = a.b.c
+                return _item_0[#_item_0 - 2]
+        end)(), (function()
+                if x ~= nil then
+                        local _obj_0 = x.y
+                        if _obj_0 ~= nil then
+                                local _obj_1 = _obj_0(x).z
+                                if _obj_1 ~= nil then
+                                        return _obj_1[#_obj_1 - 3]
+                                end
+                                return nil
+                        end
+                        return nil
+                end
+                return nil
+        end)())
+end
+local _anon_func_0 = function(globalTB)
+        local _call_0
+        do
+                local _item_0 = globalTB
+                _call_0 = _item_0[#_item_0]
+        end
+        return _call_0["end"](_call_0, 123)
+end
+local _anon_func_1 = function(a)
+        local _item_0
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                local _list_0 = a.b.c
+                local _max_5 = #_list_0 + -5 + 1
+                for _index_0 = 5, _max_5 do
+                        local _item_1 = _list_0[_index_0]
+                        _accum_0[_len_0] = _item_1
+                        _len_0 = _len_0 + 1
+                end
+                _item_0 = _accum_0
+        end
+        return _item_0[#_item_0 - 2]
+end
+local _anon_func_2 = function(x)
+        if x ~= nil then
+                local _obj_0 = x.y
+                if _obj_0 ~= nil then
+                        local _obj_1 = _obj_0(x).z
+                        if _obj_1 ~= nil then
+                                local _obj_2 = _obj_1[#_obj_1 - 3]
+                                if _obj_2 ~= nil then
+                                        local _accum_0 = { }
+                                        local _len_0 = 1
+                                        local _max_5 = #_obj_2 + -3 + 1
+                                        for _index_0 = 1, _max_5 do
+                                                local _item_0 = _obj_2[_index_0]
+                                                _accum_0[_len_0] = _item_0
+                                                _len_0 = _len_0 + 1
+                                        end
+                                        return _accum_0
+                                end
+                                return nil
+                        end
+                        return nil
+                end
+                return nil
+        end
+        return nil
+end
+do
+        local f
+        f = function()
+                return print(_anon_func_0(globalTB), _anon_func_1(a), _anon_func_2(x))
+        end
+end
+do
+        local tb = {
+                1,
+                2,
+                3
+        }
+        tb[#tb] = 40
+        tb[#tb - 1] = 20
+end
+do
+        a = "x"
+        b = a
+        c = a
+        local lst = { }
+        lst[#lst] = a
+        lst[#lst - 1] = b
+end
+do
+        local y, z
+        x, y, z = 1, 2, 3
+        local arr = { }
+        local head
+        arr[#arr], head = x, y
+        arr[#arr] = z
+end
+do
+        local triple = {
+                "keep",
+                "skip",
+                "tail"
+        }
+        local head, tailv = triple[1], triple[3]
+        local buf = { }
+        buf[#buf] = head
+        buf[#buf] = tailv
+end
+do
+        local src = {
+                "a",
+                "",
+                "c",
+                nil,
+                "d"
+        }
+        local collected = { }
+        for _index_0 = 1, #src do
+                local item = src[_index_0]
+                if item and #item > 0 then
+                        collected[#collected] = item
+                end
+        end
+end
+do
+        local nums = {
+                1,
+                2,
+                3,
+                4,
+                5
+        }
+        local last_two
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                for _index_0 = 1, #nums do
+                        local v = nums[_index_0]
+                        if v > 3 then
+                                _accum_0[_len_0] = v
+                                _len_0 = _len_0 + 1
+                        end
+                end
+                last_two = _accum_0
+        end
+        nums[#nums] = last_two[1]
+        nums[#nums] = last_two[2]
+end
+do
+        local store = { }
+        store[#store] = {
+                meta = {
+                        id = 1,
+                        ok = true
+                },
+                payload = {
+                        10,
+                        20
+                }
+        }
+        store[#store] = {
+                meta = {
+                        id = 1,
+                        ok = false
+                },
+                payload = {
+                        10,
+                        20,
+                        30
+                }
+        }
+end
+local _anon_func_3 = function(tb)
+        local _item_0 = tb.tmp
+        return _item_0[#_item_0]
+end
+do
+        local f
+        f = function()
+                local q = { }
+                do
+                        local _accum_0 = { }
+                        local _len_0 = 1
+                        for n = 1, 4 do
+                                _accum_0[_len_0] = n
+                                _len_0 = _len_0 + 1
+                        end
+                        tb.tmp = _accum_0
+                end
+                if #tb.tmp >= 3 then
+                        q[#q] = {
+                                head = tb.tmp[1],
+                                tail = _anon_func_3(tb)
+                        }
+                end
+        end
+end
+do
+        local make_pair
+        make_pair = function(a, b)
+                return {
+                        a,
+                        b
+                }
+        end
+        local pairs = { }
+        local p1 = make_pair(7, 8)
+        pairs[#pairs] = p1
+        local k, v = "key", 42
+        pairs[#pairs] = {
+                k = k,
+                v = v
+        }
+end
+do
+        local cfg = {
+                mode = "safe",
+                tags = { }
+        }
+        if cfg.mode == "safe" then
+                cfg.mode = "fast"
+                local _obj_0 = cfg.tags
+                _obj_0[#_obj_0] = "newbie"
+        end
+end
+do
+        local mat = {
+                {
+                        1,
+                        2
+                },
+                {
+                        3,
+                        4
+                },
+                {
+                        5,
+                        6
+                }
+        }
+        local last_row = mat[#mat]
+        local rows = { }
+        rows[#rows] = last_row[1]
+end
+do
+        local kv = { }
+        kv[#kv] = {
+                k = "a",
+                v = 1
+        }
+        kv[#kv] = {
+                k = "b",
+                v = 2
+        }
+        local pair_last = kv[#kv]
+        local dict = { }
+        dict[pair_last.k] = pair_last.v
+        dict[pair_last.k] = 3
+end
+do
+        local base
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                for i = 1, 4 do
+                        _accum_0[_len_0] = i
+                        _len_0 = _len_0 + 1
+                end
+                base = _accum_0
+        end
+        local pack = { }
+        pack[#pack] = {
+                base[1],
+                base[#base]
+        }
+        pack[#pack] = {
+                first = base[1],
+                last = base[#base]
+        }
+end
+do
+        local opts = {
+                limit = 10
+        }
+        local limit, offset = opts.limit, opts.offset
+        if offset == nil then
+                offset = 0
+        end
+        local pages = { }
+        pages[#pages] = {
+                limit = limit,
+                offset = offset
+        }
+end
+do
+        local chain = {
+                a = {
+                        b = {
+                                c = 0
+                        }
+                },
+                list = {
+                        {
+                                x = 0
+                        },
+                        {
+                                x = 0
+                        }
+                }
+        }
+        chain.a.b.c = 1
+        chain.list[1].x = 10;
+        ((function()
+                local _item_0 = chain.list
+                return _item_0[#_item_0]
+        end)()).x = 20
+        local _obj_0 = chain.list
+        _obj_0[#_obj_0 - 1] = {
+                x = 30
+        }
+end
+do
+        local node = {
+                left = {
+                        v = 0
+                },
+                right = {
+                        v = 0
+                }
+        }
+        local bag = { }
+        local left, right = node.left, node.right
+        bag[#bag], left.v, right.v = "k", 1, 2
+end
+do
+        local a1, a2, a3 = 100, 200, 300
+        local mix = { }
+        local meta
+        mix[#mix], mix[#mix], meta = a1, a2, {
+                tag = "ok"
+        }
+end
+do
+        local cfg2 = {
+                limit = 5,
+                opts = {
+                        flag = false
+                }
+        }
+        local lim, opt2 = cfg2.limit, cfg2.opts
+        local bucket = {
+                xs = { }
+        }
+        local _obj_0 = bucket.xs
+        _obj_0[#_obj_0] = lim
+        bucket.flag = true
+        local _obj_1 = opt2.flags
+        _obj_1[#_obj_1 + 1] = 123
+end
+do
+        local ret2
+        ret2 = function()
+                return 7, 8
+        end
+        local box = { }
+        local x1
+        box[#box], x1 = ret2()
+end
+do
+        local q = {
+                1,
+                2
+        }
+        local lastq = q[#q]
+        q[#q - 1] = lastq * 10
+end
+do
+        local mat2 = [[9,8], [7,6]]
+        local t = {
+                hold = nil
+        }
+        t.hold = mat2[#mat2][1]
+end
+do
+        local f
+        f = function()
+                local _obj_0
+                do
+                        local _item_0 = globalTB
+                        _obj_0 = _item_0[#_item_0]
+                end
+                _obj_0[#_obj_0] = 1
+        end
+        local f1
+        f1 = function()
+                do
+                        local _item_0 = globalTB
+                        do
+                                local _item_1 = _item_0[#_item_0]
+                                return _item_1[#_item_1 - 1]
+                        end
+                end
+        end
+end
+do
+        do
+                local _obj_0 = tbA
+                local _len_0 = #_obj_0 + 1
+                local _list_0 = tbB
+                for _index_0 = 1, #_list_0 do
+                        local _elm_0 = _list_0[_index_0]
+                        _obj_0[_len_0], _len_0 = _elm_0, _len_0 + 1
+                end
+        end
+        a = 1
+        do
+                local _obj_0 = tb
+                local _len_0 = #_obj_0 + 1
+                for _index_0 = 1, #x do
+                        local _elm_0 = x[_index_0]
+                        _obj_0[_len_0], _len_0 = _elm_0, _len_0 + 1
+                end
+        end
+        b[#b + 1] = 3
+        c = 4
+        local data = {
+                a = {
+                        1,
+                        2,
+                        3
+                },
+                b = {
+                        4,
+                        5,
+                        6
+                }
+        }
+        local flat
+        local _accum_0 = { }
+        for k, v in pairs(data) do
+                local _len_0 = #_accum_0 + 1
+                for _index_0 = 1, #v do
+                        local _elm_0 = v[_index_0]
+                        _accum_0[_len_0], _len_0 = _elm_0, _len_0 + 1
+                end
+        end
+        flat = _accum_0
+end
 return nil
diff --git a/spec/outputs/loops.lua b/spec/outputs/loops.lua
index 8624d49..6ab4bbb 100644
--- a/spec/outputs/loops.lua
+++ b/spec/outputs/loops.lua
@@ -60,8 +60,8 @@ do
                local y = hello[_index_0]
                if y % 2 == 0 then
                        _accum_0[_len_0] = y
+                        _len_0 = _len_0 + 1
                end
-                _len_0 = _len_0 + 1
        end
        x = _accum_0
 end
@@ -132,13 +132,11 @@ do
 end
 do
        local _accum_0 = { }
-        local _len_0 = 1
        local _list_2 = 3
        for _index_0 = 1, #_list_2 do
                local thing = _list_2[_index_0]
                y = "hello"
                break
-                _len_0 = _len_0 + 1
        end
        x = _accum_0
 end
@@ -370,3 +368,131 @@ do
                end
        until false
 end
+local _anon_func_0 = function(i, tb)
+        local _accum_0 = { }
+        local _len_0 = 1
+        while tb[i] do
+                i = i + 1
+                _accum_0[_len_0] = i - 1
+                _len_0 = _len_0 + 1
+        end
+        return _accum_0
+end
+do
+        local index
+        do
+                local _accum_0
+                for i = 1, #tb do
+                        if tb[i] then
+                                _accum_0 = i
+                                break
+                        end
+                end
+                index = _accum_0
+        end
+        f((function()
+                local _accum_0
+                for i = 1, #tb do
+                        if tb[i] then
+                                _accum_0 = i
+                                break
+                        end
+                end
+                return _accum_0
+        end)())
+        f((function()
+                local _accum_0 = { }
+                local _len_0 = 1
+                for i = 1, #tb do
+                        if tb[i] then
+                                _accum_0[_len_0] = i
+                                _len_0 = _len_0 + 1
+                        end
+                end
+                return _accum_0
+        end)())
+        i = 1
+        local ids
+        do
+                local _accum_0 = { }
+                local _len_0 = 1
+                while tb[i] do
+                        i = i + 1
+                        _accum_0[_len_0] = i - 1
+                        _len_0 = _len_0 + 1
+                end
+                ids = _accum_0
+        end
+        i = 1
+        local idx
+        do
+                local _accum_0
+                while tb[i] do
+                        i = i + 1
+                        _accum_0 = i - 1
+                        break
+                end
+                idx = _accum_0
+        end
+        local f1
+        f1 = function()
+                i = 1
+                return f(_anon_func_0(i, tb))
+        end
+        i = 1
+        f((function()
+                local _accum_0
+                while tb[i] do
+                        i = i + 1
+                        _accum_0 = i - 1
+                        break
+                end
+                return _accum_0
+        end)())
+        local _accum_0 = { }
+        local _len_0 = 1
+        local _list_3 = items
+        for _index_0 = 1, #_list_3 do
+                local item = _list_3[_index_0]
+                local _type_0 = type(item)
+                local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+                if _tab_0 then
+                        local value = item.value
+                        if "A" == item.type and value ~= nil then
+                                if value > 5 then
+                                        _accum_0[_len_0] = item
+                                        _len_0 = _len_0 + 1
+                                end
+                        end
+                end
+        end
+        list = _accum_0
+end
+do
+        repeat
+                print(1)
+        until true
+        do
+                local _accum_0
+                repeat
+                        a = func()
+                        _accum_0 = a.x
+                        break
+                until a.v
+                x = _accum_0
+        end
+        local items
+        local _accum_0 = { }
+        local _len_0 = 1
+        repeat
+                local item = getItem()
+                if not item then
+                        break
+                end
+                if item.value > 0 then
+                        _accum_0[_len_0] = item
+                        _len_0 = _len_0 + 1
+                end
+        until false
+        items = _accum_0
+end
diff --git a/spec/outputs/macro.lua b/spec/outputs/macro.lua
index 4d31574..89c6e63 100644
--- a/spec/outputs/macro.lua
+++ b/spec/outputs/macro.lua
@@ -26,6 +26,10 @@ print({
        123,
        'xyz'
 })
+print({
+        456,
+        'abc'
+})
 do
        assert(item == nil)
 end
@@ -213,6 +217,13 @@ function tb:func()
 end
 end
 print(x)
+local yue = require("yue")
+do
+local function f2(a)
+        return a + 1
+end
+x = x + f2(3)
+end
 local sel
 sel = function(a, b, c)
        if a then
@@ -317,7 +328,7 @@ print((setmetatable({
                return 998
        end
 }))
-print("current line: " .. tostring(323))
+print("current line: " .. tostring(349))
 do
        do
 -- TODO
@@ -330,10 +341,8 @@ local _1
 _1 = function()
        print(1)
        local _accum_0 = { }
-        local _len_0 = 1
        while false do
                break
-                _len_0 = _len_0 + 1
        end
        return _accum_0
 end
diff --git a/spec/outputs/props.lua b/spec/outputs/props.lua
new file mode 100644
index 0000000..2c282e0
--- /dev/null
+++ b/spec/outputs/props.lua
@@ -0,0 +1,240 @@
+local Props
+do
+        local _class_0
+        local assignReadOnly
+        local _base_0 = {
+                __index = function(self, name)
+                        local cls = getmetatable(self)
+                        do
+                                local item
+                                do
+                                        local _obj_0 = cls.__getter
+                                        if _obj_0 ~= nil then
+                                                item = _obj_0[name]
+                                        end
+                                end
+                                if item then
+                                        return item(self)
+                                else
+                                        item = rawget(cls, name)
+                                        if item then
+                                                return item
+                                        else
+                                                local c = cls
+                                                repeat
+                                                        c = getmetatable(c)
+                                                        if c then
+                                                                local _obj_0 = c.__getter
+                                                                if _obj_0 ~= nil then
+                                                                        item = _obj_0[name]
+                                                                end
+                                                                if item then
+                                                                        if cls.__getter == nil then
+                                                                                cls.__getter = { }
+                                                                        end
+                                                                        cls.__getter[name] = item
+                                                                        return item(self)
+                                                                else
+                                                                        item = rawget(c, name)
+                                                                        if item then
+                                                                                rawset(cls, name, item)
+                                                                                return item
+                                                                        end
+                                                                end
+                                                        else
+                                                                break
+                                                        end
+                                                until false
+                                        end
+                                end
+                        end
+                        return nil
+                end,
+                __newindex = function(self, name, value)
+                        local cls = getmetatable(self)
+                        local item
+                        local _obj_0 = cls.__setter
+                        if _obj_0 ~= nil then
+                                item = _obj_0[name]
+                        end
+                        if item then
+                                return item(self, value)
+                        else
+                                local c = cls
+                                repeat
+                                        c = getmetatable(c)
+                                        if c then
+                                                local _obj_1 = c.__setter
+                                                if _obj_1 ~= nil then
+                                                        item = _obj_1[name]
+                                                end
+                                                if item then
+                                                        if cls.__setter == nil then
+                                                                cls.__setter = { }
+                                                        end
+                                                        cls.__setter[name] = item
+                                                        item(self, value)
+                                                        return
+                                                end
+                                        else
+                                                break
+                                        end
+                                until false
+                                return rawset(self, name, value)
+                        end
+                end,
+                prop = function(self, name, props)
+                        local get, set = props.get, props.set
+                        if set == nil then
+                                set = assignReadOnly
+                        end
+                        do
+                                local getter = rawget(self.__base, "__getter")
+                                if getter then
+                                        getter[name] = get
+                                else
+                                        rawset(self.__base, "__getter", {
+                                                [name] = get
+                                        })
+                                end
+                        end
+                        local setter = rawget(self.__base, "__setter")
+                        if setter then
+                                setter[name] = set
+                        else
+                                return rawset(self.__base, "__setter", {
+                                        [name] = set
+                                })
+                        end
+                end
+        }
+        if _base_0.__index == nil then
+                _base_0.__index = _base_0
+        end
+        _class_0 = setmetatable({
+                __init = function() end,
+                __base = _base_0,
+                __name = "Props"
+        }, {
+                __index = _base_0,
+                __call = function(cls, ...)
+                        local _self_0 = setmetatable({ }, _base_0)
+                        cls.__init(_self_0, ...)
+                        return _self_0
+                end
+        })
+        _base_0.__class = _class_0
+        local self = _class_0;
+        assignReadOnly = function()
+                return error("assigning a readonly property")
+        end
+        Props = _class_0
+end
+local A
+do
+        local _class_0
+        local _parent_0 = Props
+        local _base_0 = { }
+        for _key_0, _val_0 in pairs(_parent_0.__base) do
+                if _base_0[_key_0] == nil and _key_0:match("^__") and not (_key_0 == "__index" and _val_0 == _parent_0.__base) then
+                        _base_0[_key_0] = _val_0
+                end
+        end
+        if _base_0.__index == nil then
+                _base_0.__index = _base_0
+        end
+        setmetatable(_base_0, _parent_0.__base)
+        _class_0 = setmetatable({
+                __init = function(self)
+                        self._x = 0
+                end,
+                __base = _base_0,
+                __name = "A",
+                __parent = _parent_0
+        }, {
+                __index = function(cls, name)
+                        local val = rawget(_base_0, name)
+                        if val == nil then
+                                local parent = rawget(cls, "__parent")
+                                if parent then
+                                        return parent[name]
+                                end
+                        else
+                                return val
+                        end
+                end,
+                __call = function(cls, ...)
+                        local _self_0 = setmetatable({ }, _base_0)
+                        cls.__init(_self_0, ...)
+                        return _self_0
+                end
+        })
+        _base_0.__class = _class_0
+        local self = _class_0;
+        self:prop('x', {
+                get = function(self)
+                        return self._x + 1000
+                end,
+                set = function(self, v)
+                        self._x = v
+                end
+        })
+        if _parent_0.__inherited then
+                _parent_0.__inherited(_parent_0, _class_0)
+        end
+        A = _class_0
+end
+local B
+do
+        local _class_0
+        local _parent_0 = A
+        local _base_0 = { }
+        for _key_0, _val_0 in pairs(_parent_0.__base) do
+                if _base_0[_key_0] == nil and _key_0:match("^__") and not (_key_0 == "__index" and _val_0 == _parent_0.__base) then
+                        _base_0[_key_0] = _val_0
+                end
+        end
+        if _base_0.__index == nil then
+                _base_0.__index = _base_0
+        end
+        setmetatable(_base_0, _parent_0.__base)
+        _class_0 = setmetatable({
+                __init = function(self, ...)
+                        return _class_0.__parent.__init(self, ...)
+                end,
+                __base = _base_0,
+                __name = "B",
+                __parent = _parent_0
+        }, {
+                __index = function(cls, name)
+                        local val = rawget(_base_0, name)
+                        if val == nil then
+                                local parent = rawget(cls, "__parent")
+                                if parent then
+                                        return parent[name]
+                                end
+                        else
+                                return val
+                        end
+                end,
+                __call = function(cls, ...)
+                        local _self_0 = setmetatable({ }, _base_0)
+                        cls.__init(_self_0, ...)
+                        return _self_0
+                end
+        })
+        _base_0.__class = _class_0
+        local self = _class_0;
+        self:prop('abc', {
+                get = function(self)
+                        return "hello"
+                end
+        })
+        if _parent_0.__inherited then
+                _parent_0.__inherited(_parent_0, _class_0)
+        end
+        B = _class_0
+end
+local b = B()
+b.x = 999
+return print(b.x, b.abc)
diff --git a/spec/outputs/string.lua b/spec/outputs/string.lua
index febea62..bdfd676 100644
--- a/spec/outputs/string.lua
+++ b/spec/outputs/string.lua
@@ -1,3 +1,4 @@
+local _module_0 = { }
 local hi = "hello"
 local hello = "what the heckyes"
 print(hi)
@@ -41,4 +42,42 @@ local _ = "hello";
 ("hello"):format().hello(1, 2, 3);
 ("hello"):format(1, 2, 3)
 something("hello"):world()
-return something(("hello"):world())
+something(("hello"):world())
+do
+        local str = "key: value"
+        str = "config:\n\tenabled: true\n\tlevel: 5"
+        str = "header: start\nfooter: end"
+        str = "name: " .. tostring(username)
+        str = "count: " .. tostring(total) .. " items"
+        str = "user: " .. tostring(name) .. "\nid: " .. tostring(id)
+        str = "path: \"C:\\\\Program Files\\\\App\"\ndesc: 'single \"quote\" test'"
+        str = "key: value   \nnext: 123   "
+        str = "list:\n\t- \"one\"\n\t- \"two\""
+        str = "-- comment\ncontent text\n-- comment"
+        str = tostring(1 + 2) .. '\n' .. tostring(2 + 3) .. '\n' .. tostring("a" .. "b")
+        local obj = {
+                settings = "mode: " .. tostring(mode) .. "\nflags:\n\t- " .. tostring(flag1) .. "\n\t- default"
+        }
+        local fn
+        fn = function()
+                return "Hello\nname: " .. tostring(userName)
+        end
+        str = "result:\n\tstatus: " .. tostring((function()
+                if ok then
+                        return "pass"
+                else
+                        return "fail"
+                end
+        end)()) .. "\n\tcode: " .. tostring(code)
+        local summary = "date: " .. tostring(os.date()) .. "\nvalues:\n\t-\n\t\ta: " .. tostring(aVal) .. "\n\t\tb: " .. tostring(bVal or defaultB)
+        local msg = send("Hello, " .. tostring(user) .. "!\nToday is " .. tostring(os.date("%A")) .. ".")
+        local desc
+        do
+                local prefix = "Result"
+                desc = tostring(prefix) .. ":\nvalue: " .. tostring(compute())
+        end
+        print(("1\n2\n3"))
+end
+local yaml = "version: " .. tostring(ver) .. "\nok: true"
+_module_0["yaml"] = yaml
+return _module_0
diff --git a/spec/outputs/switch.lua b/spec/outputs/switch.lua
index e4dedc9..7c1004b 100644
--- a/spec/outputs/switch.lua
+++ b/spec/outputs/switch.lua
@@ -415,4 +415,366 @@ do
                end
        end
 end
+do
+        local _exp_0 = tb
+        local _type_0 = type(_exp_0)
+        local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+        local _match_0 = false
+        if _tab_0 then
+                if 1 == _exp_0[1] and 2 == _exp_0[2] and 3 == _exp_0[3] then
+                        _match_0 = true
+                        print("1, 2, 3")
+                end
+        end
+        if not _match_0 then
+                local _match_1 = false
+                if _tab_0 then
+                        local b = _exp_0[2]
+                        if 1 == _exp_0[1] and b ~= nil and 3 == _exp_0[3] then
+                                _match_1 = true
+                                print("1, " .. tostring(b) .. ", 3")
+                        end
+                end
+                if not _match_1 then
+                        if _tab_0 then
+                                local b = _exp_0[3]
+                                if b == nil then
+                                        b = 3
+                                end
+                                if 1 == _exp_0[1] and 2 == _exp_0[2] then
+                                        print("1, 2, " .. tostring(b))
+                                end
+                        end
+                end
+        end
+end
+do
+        local _exp_0 = tb
+        local _type_0 = type(_exp_0)
+        local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+        local _match_0 = false
+        if _tab_0 then
+                local result = _exp_0.result
+                if true == _exp_0.success and result ~= nil then
+                        _match_0 = true
+                        print("success", result)
+                end
+        end
+        if not _match_0 then
+                local _match_1 = false
+                if _tab_0 then
+                        if false == _exp_0.success then
+                                _match_1 = true
+                                print("failed", result)
+                        end
+                end
+                if not _match_1 then
+                        print("invalid")
+                end
+        end
+end
+do
+        local _exp_0 = tb
+        local _type_0 = type(_exp_0)
+        local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+        local _match_0 = false
+        if _tab_0 then
+                local content = _exp_0.content
+                if "success" == _exp_0.type and content ~= nil then
+                        _match_0 = true
+                        print("success", content)
+                end
+        end
+        if not _match_0 then
+                local _match_1 = false
+                if _tab_0 then
+                        local content = _exp_0.content
+                        if "error" == _exp_0.type and content ~= nil then
+                                _match_1 = true
+                                print("failed", content)
+                        end
+                end
+                if not _match_1 then
+                        print("invalid")
+                end
+        end
+end
+do
+        do
+                local _exp_0 = tb
+                local _type_0 = type(_exp_0)
+                local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+                if _tab_0 then
+                        local fourth = _exp_0[4]
+                        local _val_0
+                        do
+                                local _obj_0 = _exp_0[1]
+                                if _obj_0 ~= nil then
+                                        _val_0 = _obj_0.a
+                                end
+                        end
+                        local _val_1
+                        do
+                                local _obj_0 = _exp_0[1]
+                                if _obj_0 ~= nil then
+                                        _val_1 = _obj_0.b
+                                end
+                        end
+                        local _val_2
+                        do
+                                local _obj_0 = _exp_0[2]
+                                if _obj_0 ~= nil then
+                                        _val_2 = _obj_0.a
+                                end
+                        end
+                        local _val_3
+                        do
+                                local _obj_0 = _exp_0[2]
+                                if _obj_0 ~= nil then
+                                        _val_3 = _obj_0.b
+                                end
+                        end
+                        local _val_4
+                        do
+                                local _obj_0 = _exp_0[3]
+                                if _obj_0 ~= nil then
+                                        _val_4 = _obj_0.a
+                                end
+                        end
+                        local _val_5
+                        do
+                                local _obj_0 = _exp_0[3]
+                                if _obj_0 ~= nil then
+                                        _val_5 = _obj_0.b
+                                end
+                        end
+                        if 1 == _val_0 and 2 == _val_1 and 3 == _val_2 and 4 == _val_3 and 5 == _val_4 and 6 == _val_5 and fourth ~= nil then
+                                print("matched", fourth)
+                        end
+                end
+        end
+        local _exp_0 = tb
+        local _type_0 = type(_exp_0)
+        local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+        local _match_0 = false
+        if _tab_0 then
+                local _val_0
+                do
+                        local _obj_0 = _exp_0[1]
+                        if _obj_0 ~= nil then
+                                _val_0 = _obj_0.c
+                        end
+                end
+                local _val_1
+                do
+                        local _obj_0 = _exp_0[1]
+                        if _obj_0 ~= nil then
+                                _val_1 = _obj_0.d
+                        end
+                end
+                local _val_2
+                do
+                        local _obj_0 = _exp_0[2]
+                        if _obj_0 ~= nil then
+                                _val_2 = _obj_0.c
+                        end
+                end
+                local _val_3
+                do
+                        local _obj_0 = _exp_0[2]
+                        if _obj_0 ~= nil then
+                                _val_3 = _obj_0.d
+                        end
+                end
+                local _val_4
+                do
+                        local _obj_0 = _exp_0[3]
+                        if _obj_0 ~= nil then
+                                _val_4 = _obj_0.c
+                        end
+                end
+                local _val_5
+                do
+                        local _obj_0 = _exp_0[3]
+                        if _obj_0 ~= nil then
+                                _val_5 = _obj_0.d
+                        end
+                end
+                if 1 == _val_0 and 2 == _val_1 and 3 == _val_2 and 4 == _val_3 and 5 == _val_4 and 6 == _val_5 then
+                        _match_0 = true
+                        print("OK")
+                end
+        end
+        if not _match_0 then
+                if _tab_0 then
+                        local sixth = _exp_0[6]
+                        local _val_0
+                        do
+                                local _obj_0 = _exp_0[3]
+                                if _obj_0 ~= nil then
+                                        _val_0 = _obj_0.a
+                                end
+                        end
+                        local _val_1
+                        do
+                                local _obj_0 = _exp_0[3]
+                                if _obj_0 ~= nil then
+                                        _val_1 = _obj_0.b
+                                end
+                        end
+                        local _val_2
+                        do
+                                local _obj_0 = _exp_0[4]
+                                if _obj_0 ~= nil then
+                                        _val_2 = _obj_0.a
+                                end
+                        end
+                        local _val_3
+                        do
+                                local _obj_0 = _exp_0[4]
+                                if _obj_0 ~= nil then
+                                        _val_3 = _obj_0.b
+                                end
+                        end
+                        local _val_4
+                        do
+                                local _obj_0 = _exp_0[5]
+                                if _obj_0 ~= nil then
+                                        _val_4 = _obj_0.a
+                                end
+                        end
+                        local _val_5
+                        do
+                                local _obj_0 = _exp_0[5]
+                                if _obj_0 ~= nil then
+                                        _val_5 = _obj_0.b
+                                end
+                        end
+                        if 1 == _val_0 and 2 == _val_1 and 3 == _val_2 and 4 == _val_3 and 5 == _val_4 and 6 == _val_5 and sixth ~= nil then
+                                print("matched", sixth)
+                        end
+                end
+        end
+end
+do
+        local v = "hello"
+        if "hello" == v then
+                print("matched hello")
+        else
+                print("not matched")
+        end
+end
+do
+        local f
+        f = function()
+                return "ok"
+        end
+        local val = f()
+        if "ok" == val then
+                print("it's ok")
+        end
+end
+do
+        local g
+        g = function()
+                return 42
+        end
+        local result = g()
+        if 1 == result or 2 == result then
+                print("small")
+        elseif 42 == result then
+                print("life universe everything")
+        else
+                print("other " .. tostring(result))
+        end
+end
+do
+        local check
+        check = function()
+                if true then
+                        return "yes"
+                else
+                        return "no"
+                end
+        end
+        local x = check()
+        if "yes" == x then
+                print("affirmative")
+        else
+                print("negative")
+        end
+end
+do
+        local t
+        t = function()
+                local tb = {
+                        a = 1
+                }
+                tb.a = 2
+                return tb
+        end
+        local data = t()
+        local _type_0 = type(data)
+        local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+        local _match_0 = false
+        if _tab_0 then
+                if 2 == data.a then
+                        _match_0 = true
+                        print("matched")
+                end
+        end
+        if not _match_0 then
+                print("not matched")
+        end
+end
+do
+        local clientData = {
+                "Meta",
+                "CUST_1001",
+                "CHK123"
+        }
+        local _type_0 = type(clientData)
+        local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+        if _tab_0 then
+                local metadata
+                do
+                        local _accum_0 = { }
+                        local _len_0 = 1
+                        local _max_0 = #clientData + -3 + 1
+                        for _index_0 = 1, _max_0 do
+                                local _item_0 = clientData[_index_0]
+                                _accum_0[_len_0] = _item_0
+                                _len_0 = _len_0 + 1
+                        end
+                        metadata = _accum_0
+                end
+                local customerId = clientData[#clientData - 1]
+                local checksum = clientData[#clientData]
+                if customerId ~= nil and checksum ~= nil then
+                        print(metadata)
+                        print(customerId)
+                        print(checksum)
+                end
+        end
+end
+do
+        local handlePath
+        handlePath = function(segments)
+                local _type_0 = type(segments)
+                local _tab_0 = "table" == _type_0 or "userdata" == _type_0
+                if _tab_0 then
+                        local resource = segments[#segments - 1]
+                        local action = segments[#segments]
+                        if resource ~= nil and action ~= nil then
+                                print("Resource:", resource)
+                                return print("Action:", action)
+                        end
+                end
+        end
+        handlePath({
+                "admin",
+                "logs",
+                "view"
+        })
+end
 return nil
diff --git a/spec/outputs/syntax.lua b/spec/outputs/syntax.lua
index 040a325..eb4543c 100644
--- a/spec/outputs/syntax.lua
+++ b/spec/outputs/syntax.lua
@@ -5,9 +5,9 @@ func(arg1, arg2, another, arg3)
 local we
 here, we = function() end, yeah
 local the, different
-the, different = function()
+the, different = (function()
        return approach
-end, yeah
+end), yeah
 dad()
 dad(lord)
 hello(one, two)();
@@ -430,4 +430,94 @@ do
        local f2
        f2 = function() end
 end
+do
+        if res ~= "" then
+                return res
+        end
+end
+do
+        return res((function()
+                if res ~= "" then
+                end
+        end)())
+end
+do
+        x = 1
+        y = 2
+        i = i + 1
+        j = j + 1
+        if condition then
+                setup()
+                run()
+                cleanup()
+        end
+        a = 1
+        local b = 2
+        local c = a + b
+        print(a)
+        print(b)
+        print(c)
+        f = function()
+                a = 1
+                b = 2
+                return a + b
+        end
+        a = 1
+        b = 2
+        local success, result = pcall(function()
+                return func()
+        end)
+        if success then
+                print(result)
+        end
+        local value = "foo"
+        print(value)
+        value = value .. "bar"
+        print(value)
+        do
+                if ok then
+                        print("ok!")
+                end
+                return 42
+        end
+        for i = 1, 3 do
+                print(i)
+                goto _continue_0
+                ::_continue_0::
+        end
+        local n = 0
+        while n < 2 do
+                print("n=", n)
+                n = n + 1
+        end
+        local obj = { }
+        obj:set(10)
+        obj:get()
+        print("done")
+        do
+                local _with_0 = tbl
+                _with_0:push(1)
+                print("push")
+        end
+        a = 5
+        if a > 3 then
+                print("big")
+                b = a * 2
+                print(b)
+        else
+                print("small")
+                b = a
+        end
+        xpcall(function()
+                x = 1
+                y = 2
+                return print(x + y)
+        end, function(err)
+                return print("error:", err)
+        end)
+end
+local q = 1
+local w = 2
+local e = 3
+print(q, w, e)
 return nil
diff --git a/spec/outputs/tables.lua b/spec/outputs/tables.lua
index f358811..3f851de 100644
--- a/spec/outputs/tables.lua
+++ b/spec/outputs/tables.lua
@@ -366,6 +366,28 @@ local menus = {
                }
        }
 }
+_ = {
+        boolean = {
+                true,
+                false
+        },
+        float = {
+                3.14,
+                -6.8523015e+5
+        },
+        int = {
+                123,
+                -685230
+        },
+        null = {
+                nodeName = 'node',
+                parent = nil
+        },
+        string = {
+                'Hello world',
+                "newline\nnewline2"
+        }
+}
 local tb
 do
        local _tab_0 = { }
diff --git a/spec/outputs/test/format_spec.lua b/spec/outputs/test/format_spec.lua
index ed0fbee..7aa85cd 100644
--- a/spec/outputs/test/format_spec.lua
+++ b/spec/outputs/test/format_spec.lua
@@ -122,7 +122,7 @@ return describe("format", function()
                        local original_ast = yue.to_ast(code)
                        assert.is_not_nil(original_ast)
                        rewriteLineCol(original_ast)
-                        local formated = yue.format(code)
+                        local formated = yue.format(code, 0, false)
                        local ast = yue.to_ast(formated)
                        assert.is_not_nil(ast)
                        rewriteLineCol(ast)
diff --git a/spec/outputs/try_catch.lua b/spec/outputs/try_catch.lua
index efd92c6..edb2341 100644
--- a/spec/outputs/try_catch.lua
+++ b/spec/outputs/try_catch.lua
@@ -22,6 +22,44 @@ end
 local _anon_func_7 = function(a, b, c, tb)
        return tb.f(a, b, c)
 end
+local _anon_func_8 = function(_arg_0, ...)
+        local ok = _arg_0
+        return ...
+end
+local _anon_func_10 = function(_arg_0, ...)
+        local _ok_0 = _arg_0
+        if _ok_0 then
+                return ...
+        end
+end
+local _anon_func_9 = function(func, pcall)
+        return _anon_func_10(pcall(func))
+end
+local _anon_func_12 = function(_arg_0, ...)
+        local _ok_0 = _arg_0
+        if _ok_0 then
+                return ...
+        end
+end
+local _anon_func_11 = function(func, pcall)
+        return _anon_func_12(pcall(func))
+end
+local _anon_func_14 = function(_arg_0, ...)
+        local _ok_0 = _arg_0
+        if _ok_0 then
+                return ...
+        end
+end
+local _anon_func_15 = function(func, print)
+        print(123)
+        return func()
+end
+local _anon_func_13 = function(func, print, xpcall)
+        return _anon_func_14(xpcall(_anon_func_15, function(e)
+                print(e)
+                return e
+        end, func, print))
+end
 local f
 f = function()
        xpcall(function()
@@ -104,10 +142,236 @@ f = function()
        do
                x(function()
                        local tb, a, b, c
-                        f = function()
+                        local f1
+                        f1 = function()
                                return pcall(_anon_func_7, a, b, c, tb)
                        end
                end)
        end
+        do
+                local f1
+                f1 = function()
+                        do
+                                return _anon_func_8(pcall(function()
+                                        return func()
+                                end))
+                        end
+                end
+        end
+        do
+                local func
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                        return func()
+                end)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a
+                local _exp_0 = (_anon_func_9(func, pcall))
+                if _exp_0 ~= nil then
+                        a = _exp_0
+                else
+                        a = "default"
+                end
+        end
+        do
+                f(_anon_func_11(func, pcall))
+        end
+        do
+                f(_anon_func_13(func, print, xpcall))
+        end
        return nil
 end
+local _anon_func_16 = function(a, b, c, tb)
+        return tb.f(a, b, c)
+end
+local _anon_func_17 = function(_arg_0, ...)
+        local ok = _arg_0
+        return ...
+end
+do
+        xpcall(function()
+                return func(1, 2, 3)
+        end, function(err)
+                return print(err)
+        end)
+        xpcall(function()
+                return func(1, 2, 3)
+        end, function(err)
+                return print(err)
+        end)
+        pcall(function()
+                print("trying")
+                return func(1, 2, 3)
+        end)
+        do
+                local success, result = xpcall(function()
+                        return func(1, 2, 3)
+                end, function(err)
+                        return print(err)
+                end)
+                success, result = pcall(function()
+                        return func(1, 2, 3)
+                end)
+        end
+        local tb = { }
+        pcall(function()
+                return tb.func
+        end)
+        pcall(function()
+                return tb.func()
+        end)
+        pcall(function()
+                return tb.func()
+        end)
+        pcall(function()
+                return (tb.func())
+        end)
+        pcall(function()
+                return (tb:func(1, 2, 3))
+        end)
+        pcall(function()
+                return tb.func(1)
+        end)
+        pcall(function()
+                return tb.func(1)
+        end)
+        if (xpcall(function()
+                return func(1)
+        end, function(err)
+                return print(err)
+        end)) then
+                print("OK")
+        end
+        if xpcall(function()
+                return (func(1))
+        end, function(err)
+                return print(err)
+        end) then
+                print("OK")
+        end
+        do
+                do
+                        local success, result = pcall(function()
+                                return func("abc", 123)
+                        end)
+                        if success then
+                                print(result)
+                        end
+                end
+                local success, result = xpcall(function()
+                        return func("abc", 123)
+                end, function(err)
+                        return print(err)
+                end)
+                success, result = xpcall(function()
+                        return func("abc", 123)
+                end, function(err)
+                        return print(err)
+                end)
+                if success then
+                        print(result)
+                end
+        end
+        do
+                pcall(function()
+                        return func(1, 2, 3)
+                end)
+                pcall(function()
+                        return func(1, 2, 3)
+                end)
+        end
+        do
+                x(function()
+                        local tb, a, b, c
+                        local f1
+                        f1 = function()
+                                return pcall(_anon_func_16, a, b, c, tb)
+                        end
+                end)
+        end
+        do
+                local f1
+                f1 = function()
+                        do
+                                return _anon_func_17(pcall(function()
+                                        return func()
+                                end))
+                        end
+                end
+        end
+        do
+                local func
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(func)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a, b, c
+                local _ok_0, _ret_0, _ret_1, _ret_2 = pcall(function()
+                        return func()
+                end)
+                if _ok_0 then
+                        a, b, c = _ret_0, _ret_1, _ret_2
+                end
+        end
+        do
+                local a
+                local _exp_0 = ((function()
+                        return (function(_arg_0, ...)
+                                local _ok_0 = _arg_0
+                                if _ok_0 then
+                                        return ...
+                                end
+                        end)(pcall(function()
+                                return func()
+                        end))
+                end)())
+                if _exp_0 ~= nil then
+                        a = _exp_0
+                else
+                        a = "default"
+                end
+        end
+        do
+                f((function()
+                        return (function(_arg_0, ...)
+                                local _ok_0 = _arg_0
+                                if _ok_0 then
+                                        return ...
+                                end
+                        end)(pcall(function()
+                                return func()
+                        end))
+                end)())
+        end
+        do
+                f((function()
+                        return (function(_arg_0, ...)
+                                local _ok_0 = _arg_0
+                                if _ok_0 then
+                                        return ...
+                                end
+                        end)(xpcall(function()
+                                print(123)
+                                return func()
+                        end, function(e)
+                                print(e)
+                                return e
+                        end))
+                end)())
+        end
+end
+return nil
diff --git a/spec/outputs/unicode/assign.lua b/spec/outputs/unicode/assign.lua
index d4ad56a..e00d016 100644
--- a/spec/outputs/unicode/assign.lua
+++ b/spec/outputs/unicode/assign.lua
@@ -43,10 +43,8 @@ do
        end
 end
 local _anon_func_0 = function(_u6253_u5370)
-        do
+        _u6253_u5370(123)
-                _u6253_u5370(123)
+        return { }
-                return { }
-        end
 end
 return __u65e0_u6548_u53d8_u91cf(function()
        setmetatable(a_u53d8_u91cf, _anon_func_0(_u6253_u5370))
diff --git a/spec/outputs/unicode/comprehension.lua b/spec/outputs/unicode/comprehension.lua
index 60e490f..92bce69 100644
--- a/spec/outputs/unicode/comprehension.lua
+++ b/spec/outputs/unicode/comprehension.lua
@@ -243,8 +243,11 @@ end
 do
        local _accum_0 = { }
        local _len_0 = 1
+        local _min_0 = 1 + 2
        local _max_0 = 3 + 4
-        for _index_0 = 1 + 2, _max_0 < 0 and #_u5217_u8868 + _max_0 or _max_0 do
+        _min_0 = _min_0 < 0 and #_u5217_u8868 + _min_0 + 1 or _min_0
+        _max_0 = _max_0 < 0 and #_u5217_u8868 + _max_0 + 1 or _max_0
+        for _index_0 = _min_0, _max_0 do
                local _u9879_u76ee = _u5217_u8868[_index_0]
                _accum_0[_len_0] = _u9879_u76ee
                _len_0 = _len_0 + 1
@@ -254,8 +257,11 @@ end
 do
        local _accum_0 = { }
        local _len_0 = 1
+        local _min_0 = _u4f60_u597d() * 4
        local _max_0 = 2 - _u4e1c_u897f[4]
-        for _index_0 = _u4f60_u597d() * 4, _max_0 < 0 and #_u5217_u8868 + _max_0 or _max_0 do
+        _min_0 = _min_0 < 0 and #_u5217_u8868 + _min_0 + 1 or _min_0
+        _max_0 = _max_0 < 0 and #_u5217_u8868 + _max_0 + 1 or _max_0
+        for _index_0 = _min_0, _max_0 do
                local _u9879_u76ee = _u5217_u8868[_index_0]
                _accum_0[_len_0] = _u9879_u76ee
                _len_0 = _len_0 + 1
diff --git a/spec/outputs/unicode/funcs.lua b/spec/outputs/unicode/funcs.lua
index 6e94587..06b24b1 100644
--- a/spec/outputs/unicode/funcs.lua
+++ b/spec/outputs/unicode/funcs.lua
@@ -24,7 +24,7 @@ _u5f00(function()
 end)
 local _u53d8_u91cfh
 _u53d8_u91cfh = function()
-        return _ud83d_udc4b
+        return _u1f44b
 end
 _u5403(function() end, _u4e16_u754c);
 (function() end)()
diff --git a/spec/outputs/unicode/import.lua b/spec/outputs/unicode/import.lua
index 7c31ceb..e055c81 100644
--- a/spec/outputs/unicode/import.lua
+++ b/spec/outputs/unicode/import.lua
@@ -11,10 +11,10 @@ local _u5b57_u6bb5x, _u5b57_u6bb5y, _u5b57_u6bb5z = _u9053_u5177_u7ec4["字段x"
                return _fn_0(_base_0, ...)
        end
 end)(), _u9053_u5177_u7ec4["字段z"]
-local _u9886_u4e3b, _ud83d_udc7b
+local _u9886_u4e3b, _u1f47b
 do
        local _obj_1 = _u627e_u5230("我的表")
-        _u9886_u4e3b, _ud83d_udc7b = _obj_1["领主"], (function()
+        _u9886_u4e3b, _u1f47b = _obj_1["领主"], (function()
                local _base_0 = _obj_1
                local _fn_0 = _base_0["👻"]
                return _fn_0 and function(...)
diff --git a/spec/outputs/unicode/lists.lua b/spec/outputs/unicode/lists.lua
index aafd516..3bf6f50 100644
--- a/spec/outputs/unicode/lists.lua
+++ b/spec/outputs/unicode/lists.lua
@@ -229,31 +229,36 @@ _u53d8_u91cfx = {
        6,
        7
 }
-local _max_0 = -5
+local _max_0 = #_u53d8_u91cfx + -5 + 1
-for _index_0 = 2, _max_0 < 0 and #_u53d8_u91cfx + _max_0 or _max_0, 2 do
+for _index_0 = 2, _max_0, 2 do
        local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
        _u6253_u5370(_u53d8_u91cfy)
 end
-local _max_1 = 3
+for _index_0 = 1, 3 do
-for _index_0 = 1, _max_1 < 0 and #_u53d8_u91cfx + _max_1 or _max_1 do
        local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
        _u6253_u5370(_u53d8_u91cfy)
 end
-for _index_0 = 2, #_u53d8_u91cfx do
+local _max_1 = #_u53d8_u91cfx
+for _index_0 = 2, _max_1 do
        local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
        _u6253_u5370(_u53d8_u91cfy)
 end
-for _index_0 = 1, #_u53d8_u91cfx, 2 do
+local _max_2 = #_u53d8_u91cfx
+for _index_0 = 1, _max_2, 2 do
        local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
        _u6253_u5370(_u53d8_u91cfy)
 end
-for _index_0 = 2, #_u53d8_u91cfx, 2 do
+local _max_3 = #_u53d8_u91cfx
+for _index_0 = 2, _max_3, 2 do
        local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
        _u6253_u5370(_u53d8_u91cfy)
 end
 local _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc = 1, 5, 2
-local _max_2 = _u53d8_u91cfb
+local _min_0 = _u53d8_u91cfa
-for _index_0 = _u53d8_u91cfa, _max_2 < 0 and #_u53d8_u91cfx + _max_2 or _max_2, _u53d8_u91cfc do
+local _max_4 = _u53d8_u91cfb
+_min_0 = _min_0 < 0 and #_u53d8_u91cfx + _min_0 + 1 or _min_0
+_max_4 = _max_4 < 0 and #_u53d8_u91cfx + _max_4 + 1 or _max_4
+for _index_0 = _min_0, _max_4, _u53d8_u91cfc do
        local _u53d8_u91cfy = _u53d8_u91cfx[_index_0]
        _u6253_u5370(_u53d8_u91cfy)
 end
diff --git a/spec/outputs/unicode/loops.lua b/spec/outputs/unicode/loops.lua
index 8379993..27bbe2e 100644
--- a/spec/outputs/unicode/loops.lua
+++ b/spec/outputs/unicode/loops.lua
@@ -60,8 +60,8 @@ do
                local _u53d8_u91cfy = _u4f60_u597d[_index_0]
                if _u53d8_u91cfy % 2 == 0 then
                        _accum_0[_len_0] = _u53d8_u91cfy
+                        _len_0 = _len_0 + 1
                end
-                _len_0 = _len_0 + 1
        end
        _u53d8_u91cfx = _accum_0
 end
@@ -132,13 +132,11 @@ do
 end
 do
        local _accum_0 = { }
-        local _len_0 = 1
        local _list_2 = 3
        for _index_0 = 1, #_list_2 do
                local _u4e1c_u897f = _list_2[_index_0]
                _u53d8_u91cfy = "你好"
                break
-                _len_0 = _len_0 + 1
        end
        _u53d8_u91cfx = _accum_0
 end
diff --git a/spec/outputs/unicode/macro.lua b/spec/outputs/unicode/macro.lua
index b14f571..b4e78cd 100644
--- a/spec/outputs/unicode/macro.lua
+++ b/spec/outputs/unicode/macro.lua
@@ -216,17 +216,15 @@ do
 end
 local _ = require('下划线')
 local _anon_func_0 = function(_)
-        do
+        local _call_0 = (_({
-                local _call_0 = (_({
+                1,
-                        1,
+                2,
-                        2,
+                3,
-                        3,
+                4,
-                        4,
+                -2,
-                        -2,
+                3
-                        3
+        }))
-                }))
+        return _call_0["链"](_call_0)
-                return _call_0["链"](_call_0)
-        end
 end
 local _call_0 = ((function()
        local _call_0 = ((function()
@@ -241,17 +239,15 @@ local _call_0 = ((function()
 end)())
 local _u7ed3_u679ca = _call_0["取值"](_call_0)
 local _anon_func_1 = function(_)
-        do
+        local _call_1 = (_({
-                local _call_1 = (_({
+                1,
-                        1,
+                2,
-                        2,
+                3,
-                        3,
+                4,
-                        4,
+                -2,
-                        -2,
+                3
-                        3
+        }))
-                }))
+        return _call_1["链"](_call_1)
-                return _call_1["链"](_call_1)
-        end
 end
 do
        local _call_1 = ((function()
@@ -270,10 +266,8 @@ do
        end)
 end
 local _anon_func_2 = function(_u539f_u70b9)
-        do
+        local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
-                local _call_1 = _u539f_u70b9["变换"]["根节点"]["游戏对象"]
+        return _call_1["父节点"](_call_1)
-                return _call_1["父节点"](_call_1)
-        end
 end
 local _call_1 = ((function()
        local _call_1 = ((function()
@@ -365,10 +359,8 @@ local _1
 _1 = function()
        _u6253_u5370(1)
        local _accum_0 = { }
-        local _len_0 = 1
        while false do
                break
-                _len_0 = _len_0 + 1
        end
        return _accum_0
 end
diff --git a/spec/outputs/unicode/multiline_chain.lua b/spec/outputs/unicode/multiline_chain.lua
index c1da13f..61e7057 100644
--- a/spec/outputs/unicode/multiline_chain.lua
+++ b/spec/outputs/unicode/multiline_chain.lua
@@ -59,10 +59,8 @@ _u51fd_u6570 = function()
        return _accum_0
 end
 local _anon_func_0 = function(_u53d8_u91cfa)
-        do
+        local _call_1 = _u53d8_u91cfa
-                local _call_1 = _u53d8_u91cfa
+        return (_call_1["变量b"](_call_1, 123))["变量c"]("abc")
-                return (_call_1["变量b"](_call_1, 123))["变量c"]("abc")
-        end
 end
 local _u51fd_u65701
 _u51fd_u65701 = function()
diff --git a/spec/outputs/unicode/syntax.lua b/spec/outputs/unicode/syntax.lua
index 1984f40..f5d5d8a 100644
--- a/spec/outputs/unicode/syntax.lua
+++ b/spec/outputs/unicode/syntax.lua
@@ -5,9 +5,9 @@ _u51fd_u6570(_u53c2_u65701, _u53c2_u65702, _u53e6_u5916, _u53c2_u65703)
 local _u6211_u4eec
 _u8fd9_u91cc, _u6211_u4eec = function() end, _u662f_u7684
 local _u8fd9_u4e2a, _u4e0d_u540c
-_u8fd9_u4e2a, _u4e0d_u540c = function()
+_u8fd9_u4e2a, _u4e0d_u540c = (function()
        return _u65b9_u6cd5
-end, _u662f_u7684
+end), _u662f_u7684
 _u7238_u7238()
 _u7238_u7238(_u4e3b)
 _u4f60_u597d(_u4e00, _u4e8c)();
@@ -286,10 +286,8 @@ _ = 5 - _u4ec0_u4e48(_u65e0_u804a)
 _u4ec0_u4e48(_u65e0_u804a - 5)
 _u53d8_u91cfx = _u4f60_u597d - _u4e16_u754c - _u67d0_u7269
 local _anon_func_0 = function(_u4ec0_u4e48)
-        do
+        local _call_8 = _u4ec0_u4e48
-                local _call_8 = _u4ec0_u4e48
+        return _call_8["酷"](_call_8, 100)
-                return _call_8["酷"](_call_8, 100)
-        end
 end
 (function(_u67d0_u7269)
        if _u67d0_u7269 == nil then
diff --git a/spec/outputs/unicode/vararg.lua b/spec/outputs/unicode/vararg.lua
index b837006..fc894ff 100644
--- a/spec/outputs/unicode/vararg.lua
+++ b/spec/outputs/unicode/vararg.lua
@@ -125,14 +125,10 @@ local _anon_func_11 = function(_u9879_u76ee, ...)
        return _tbl_0
 end
 local _anon_func_12 = function(_u51fd_u6570)
-        do
+        return _u51fd_u6570()
-                return _u51fd_u6570()
-        end
 end
 local _anon_func_13 = function(_u51fd_u6570, ...)
-        do
+        return _u51fd_u6570(...)
-                return _u51fd_u6570(...)
-        end
 end
 local _anon_func_14 = function(_u51fd_u6570)
        local _accum_0 = { }
@@ -195,15 +191,11 @@ local _anon_func_23 = function(_u51fd_u6570, ...)
        return nil
 end
 local _anon_func_24 = function(_u6253_u5370, select, ...)
-        do
+        _u6253_u5370(select("#", ...))
-                _u6253_u5370(select("#", ...))
+        return _u6253_u5370(...)
-                return _u6253_u5370(...)
-        end
 end
 local _anon_func_25 = function(_u6253_u5370, ...)
-        do
+        return _u6253_u5370(...)
-                return _u6253_u5370(...)
-        end
 end
 local _anon_func_26 = function(_u53d8_u91cfx, _u8868, _u88682)
        if 1 == _u53d8_u91cfx then
@@ -214,9 +206,7 @@ local _anon_func_26 = function(_u53d8_u91cfx, _u8868, _u88682)
        end
 end
 local _anon_func_27 = function(_u6253_u5370, ...)
-        do
+        return _u6253_u5370(...)
-                return _u6253_u5370(...)
-        end
 end
 local _anon_func_28 = function(_u6761_u4ef6)
        if _u6761_u4ef6 then
@@ -224,10 +214,8 @@ local _anon_func_28 = function(_u6761_u4ef6)
        end
 end
 local _anon_func_29 = function(_u6253_u5370, _arg_0, ...)
-        do
+        local _u8868 = _arg_0
-                local _u8868 = _arg_0
+        return _u6253_u5370(...)
-                return _u6253_u5370(...)
-        end
 end
 local _u8fde_u63a5
 _u8fde_u63a5 = function(...)
diff --git a/spec/outputs/unicode/whitespace.lua b/spec/outputs/unicode/whitespace.lua
index d026abb..7a83d9f 100644
--- a/spec/outputs/unicode/whitespace.lua
+++ b/spec/outputs/unicode/whitespace.lua
@@ -82,12 +82,12 @@ v = function()
        return _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc
 end
 local v1, v2, v3
-v1, v2, v3 = function()
+v1, v2, v3 = (function()
        return _u53d8_u91cfa
-end, _u53d8_u91cfb, _u53d8_u91cfc
+end), _u53d8_u91cfb, _u53d8_u91cfc
-local _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc, _u53d8_u91cfd, _u53d8_u91cfe, _u53d8_u91cff = 1, f2({
+local _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc, _u53d8_u91cfd, _u53d8_u91cfe, _u53d8_u91cff = 1, (f2({
        abc = abc
-}), 3, 4, _u51fd_u65705(abc), 6
+})), 3, 4, _u51fd_u65705(abc), 6
 for _u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc in pairs(_u5bf9_u8c61tb) do
        _u6253_u5370(_u53d8_u91cfa, _u53d8_u91cfb, _u53d8_u91cfc)
 end
diff --git a/spec/outputs/upvalue_func.lua b/spec/outputs/upvalue_func.lua
index 3181adf..3e088be 100644
--- a/spec/outputs/upvalue_func.lua
+++ b/spec/outputs/upvalue_func.lua
@@ -214,10 +214,8 @@ local _anon_func_1 = function(valueB)
        end
 end
 local _anon_func_2 = function(print, select, _arg_0, ...)
-        do
+        local ok = _arg_0
-                local ok = _arg_0
+        return print(select(3, ...))
-                return print(select(3, ...))
-        end
 end
 local _anon_func_3 = function(tb)
        if tb ~= nil then
@@ -242,11 +240,9 @@ local _anon_func_5 = function(getmetatable, tb)
        return _obj_0[1 + 1](_obj_0, "abc")
 end
 local _anon_func_6 = function(tb)
-        do
+        local _call_0 = tb
-                local _call_0 = tb
+        local _call_1 = _call_0["end"](_call_0)
-                local _call_1 = _call_0["end"](_call_0)
+        return _call_1["🤣"](_call_1, 123)
-                return _call_1["🤣"](_call_1, 123)
-        end
 end
 local _anon_func_7 = function(itemA, listA)
        for _index_0 = 1, #listA do
@@ -354,17 +350,13 @@ local _anon_func_16 = function(pairs, tb, tostring)
        return _tbl_0
 end
 local _anon_func_17 = function(print)
-        do
+        print(123)
-                print(123)
+        return "abc"
-                return "abc"
-        end
 end
 local _anon_func_18 = function(print, select, _arg_0, ...)
-        do
+        local success = _arg_0
-                local success = _arg_0
+        if success then
-                if success then
+                return print(select('#', ...))
-                        return print(select('#', ...))
-                end
        end
 end
 local _anon_func_19 = function(cond, i)
@@ -459,11 +451,9 @@ local _anon_func_25 = function(itemA, listA)
        return false
 end
 local _anon_func_24 = function(itemA, listA, tb)
-        do
+        local _call_0 = tb
-                local _call_0 = tb
+        local _call_1 = _call_0["end"](_call_0)
-                local _call_1 = _call_0["end"](_call_0)
+        return _call_1["🤣"](_call_1, 123 and (#listA > 0 and _anon_func_25(itemA, listA)))
-                return _call_1["🤣"](_call_1, 123 and (#listA > 0 and _anon_func_25(itemA, listA)))
-        end
 end
 GameEngine:onEvent("SomeEvent", function()
        return func(value + (_anon_func_21(cond)) + (_anon_func_22(valueB)) > _anon_func_23(tb) + _anon_func_24(itemA, listA, tb))
@@ -503,13 +493,11 @@ local _anon_func_27 = function(char)
        return nil
 end
 local _anon_func_28 = function(os, _arg_0, ...)
-        do
+        local ok = _arg_0
-                local ok = _arg_0
+        if ok then
-                if ok then
+                return ...
-                        return ...
+        else
-                else
+                return os.exit(1)
-                        return os.exit(1)
-                end
        end
 end
 local _anon_func_29 = function(debug_env_after, debug_env_before, env, func)
diff --git a/spec/outputs/vararg.lua b/spec/outputs/vararg.lua
index dabba44..9f97681 100644
--- a/spec/outputs/vararg.lua
+++ b/spec/outputs/vararg.lua
@@ -125,14 +125,10 @@ local _anon_func_11 = function(items, ...)
        return _tbl_0
 end
 local _anon_func_12 = function(func)
-        do
+        return func()
-                return func()
-        end
 end
 local _anon_func_13 = function(func, ...)
-        do
+        return func(...)
-                return func(...)
-        end
 end
 local _anon_func_14 = function(func)
        local _accum_0 = { }
@@ -195,15 +191,11 @@ local _anon_func_23 = function(func, ...)
        return nil
 end
 local _anon_func_24 = function(print, select, ...)
-        do
+        print(select("#", ...))
-                print(select("#", ...))
+        return print(...)
-                return print(...)
-        end
 end
 local _anon_func_25 = function(print, ...)
-        do
+        return print(...)
-                return print(...)
-        end
 end
 local _anon_func_26 = function(tb, tb2, x)
        if 1 == x then
@@ -214,9 +206,7 @@ local _anon_func_26 = function(tb, tb2, x)
        end
 end
 local _anon_func_27 = function(print, ...)
-        do
+        return print(...)
-                return print(...)
-        end
 end
 local _anon_func_28 = function(cond)
        if cond then
@@ -224,10 +214,8 @@ local _anon_func_28 = function(cond)
        end
 end
 local _anon_func_29 = function(print, _arg_0, ...)
-        do
+        local tb = _arg_0
-                local tb = _arg_0
+        return print(...)
-                return print(...)
-        end
 end
 local join
 join = function(...)
@@ -306,3 +294,75 @@ join = function(...)
        end
        return nil
 end
+do
+        local f1
+        f1 = function(...)
+                local t = {
+                        n = select("#", ...),
+                        ...
+                }
+                print(t.n)
+                print(#t)
+                for i = 1, t.n do
+                        print(t[i])
+                end
+        end
+        f1(1, 2, 3)
+        f1("a", "b", "c", "d")
+        f1()
+        local f2
+        f2 = function(...)
+                local args = {
+                        n = select("#", ...),
+                        ...
+                }
+                print("args count:", args.n)
+                print("args length:", #args)
+                for i = 1, args.n do
+                        if args[i] == nil then
+                                print("position", i, "is nil")
+                        else
+                                print("position", i, ":", args[i])
+                        end
+                end
+        end
+        f2(1, nil, 3, nil, 5)
+        local f3
+        f3 = function(prefix, ...)
+                local items = {
+                        n = select("#", ...),
+                        ...
+                }
+                local result = { }
+                for i = 1, items.n do
+                        result[i] = prefix .. tostring(items[i])
+                end
+                return result
+        end
+        f3("item_", 1, 2, 3)
+        local f4
+        f4 = function(...)
+                local empty = {
+                        n = select("#", ...),
+                        ...
+                }
+                print("empty count:", empty.n)
+                return print("empty length:", #empty)
+        end
+        f4()
+        local process
+        process = function(...)
+                local data = {
+                        n = select("#", ...),
+                        ...
+                }
+                local sum = 0
+                for i = 1, data.n do
+                        if type(data[i]) == "number" then
+                                sum = sum + data[i]
+                        end
+                end
+                return sum
+        end
+        return process(1, 2, 3, "skip", 5)
+end
diff --git a/spec/outputs/whitespace.lua b/spec/outputs/whitespace.lua
index 0251968..864f085 100644
--- a/spec/outputs/whitespace.lua
+++ b/spec/outputs/whitespace.lua
@@ -94,12 +94,12 @@ v = function()
        return a, b, c
 end
 local v1, v2, v3
-v1, v2, v3 = function()
+v1, v2, v3 = (function()
        return a
-end, b, c
+end), b, c
-local a, b, c, d, e, f = 1, f2({
+local a, b, c, d, e, f = 1, (f2({
        abc = abc
-}), 3, 4, f5(abc), 6
+})), 3, 4, f5(abc), 6
 for a, b, c in pairs(tb) do
        print(a, b, c)
 end
diff --git a/spec/outputs/with.lua b/spec/outputs/with.lua
index 1a795c1..530915e 100644
--- a/spec/outputs/with.lua
+++ b/spec/outputs/with.lua
@@ -187,4 +187,66 @@ do
                return _with_0[123]
        end
 end
+do
+        f((function()
+                local _with_0 = item
+                do
+                        local _accum_0
+                        repeat
+                                if _with_0.id > 0 then
+                                        _accum_0 = _with_0.content
+                                        break
+                                end
+                        until true
+                        _with_0 = _accum_0
+                end
+                return _with_0
+        end)())
+        local a
+        do
+                local _with_0 = tb
+                do
+                        local _accum_0
+                        repeat
+                                if _with_0.v then
+                                        _accum_0 = _with_0.a
+                                        break
+                                end
+                        until true
+                        _with_0 = _accum_0
+                end
+                a = _with_0
+        end
+        local _accum_0
+        while true do
+                local _with_0 = tb
+                local _accum_1
+                repeat
+                        if _with_0 ~= nil then
+                                _accum_1 = 1
+                                break
+                        end
+                until true
+                _with_0 = _accum_1
+                _accum_0 = _with_0
+                break
+        end
+        a = _accum_0
+end
+do
+        local a
+        local _accum_0
+        for i = 1, 100 do
+                local x = tb[i]
+                if x ~= nil then
+                        local _des_0 = 1
+                        if _des_0 then
+                                x.id = _des_0
+                                _accum_0 = x
+                                break
+                        end
+                end
+        end
+        a = _accum_0
+end
 return nil
diff --git a/src/3rdParty/colib/LICENSE b/src/3rdParty/colib/LICENSE
new file mode 100755
index 0000000..e0eddeb
--- /dev/null
+++ b/src/3rdParty/colib/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+Copyright (c) 2020 colin
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/3rdParty/colib/ljson.c b/src/3rdParty/colib/ljson.c
new file mode 100644
index 0000000..4daba07
--- /dev/null
+++ b/src/3rdParty/colib/ljson.c
@@ -0,0 +1,925 @@
+/**
+ * json解析器：只支持utf-8格式，Lua只支持64位的数字
+ */
+#define LUA_LIB
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <assert.h>
+#include <errno.h>
+#include <setjmp.h>
+#include <ctype.h>
+#include <limits.h>
+#include <float.h>
+#include <math.h>
+#include "lua.h"
+#include "lauxlib.h"
+#if LUA_VERSION_NUM > 501
+#ifndef LUA_COMPAT_5_1
+#ifndef lua_objlen
+#define lua_objlen lua_rawlen
+#endif // lua_objlen
+#endif // LUA_COMPAT_5_1
+#endif // LUA_VERSION_NUM
+// 内存分配函数，方便替换
+#define co_malloc malloc
+#define co_free free
+#define co_realloc realloc
+#define co_calloc calloc
+#if !defined(likely)
+#if defined(__GNUC__)
+#define likely(x)       (__builtin_expect(((x) != 0), 1))
+#define unlikely(x)     (__builtin_expect(((x) != 0), 0))
+#else
+#define likely(x)       (x)
+#define unlikely(x)     (x)
+#endif
+#endif
+//-----------------------------------------------------------------------------
+// membuffer
+#define STACK_BUFF_SIZE 512
+typedef struct membuffer {
+        char *b;                // 内存buffer
+        size_t sz;              // buffer已用长度
+        size_t cap;             // buffer实际大小
+        char s[STACK_BUFF_SIZE];
+} membuffer_t;
+// 初始化buffer
+static inline void membuffer_init(membuffer_t *buff) {
+        buff->b = buff->s;
+        buff->cap = STACK_BUFF_SIZE;
+        buff->sz = 0;
+}
+static inline void membuffer_add_size(membuffer_t *buff, size_t sz) {
+        buff->sz += sz;
+}
+static inline void membuffer_reset(membuffer_t *buff) {
+        buff->sz = 0;
+}
+static inline void membuffer_free(membuffer_t *buff) {
+        if (buff->b && buff->b != buff->s) {
+                co_free(buff->b);
+                buff->b = NULL;
+        }
+}
+static inline void _membuffer_grow(membuffer_t *buff, size_t needsz) {
+        if (buff->cap < needsz) {
+                size_t newcap = buff->cap * 2;
+                if (newcap < needsz)
+                        newcap = needsz;
+                if (buff->b == buff->s) {
+                        buff->b = (char*)co_malloc(newcap);
+                        memcpy(buff->b, buff->s, buff->sz);
+                } else {
+                        buff->b = (char*)co_realloc(buff->b, newcap);
+                }
+                buff->cap = newcap;
+        }
+}
+// 确保缓存中还有sz的可用空间
+static inline void membuffer_ensure_space(membuffer_t *buff, size_t sz) {
+        if (buff->sz + sz > buff->cap) {
+                _membuffer_grow(buff, buff->sz+sz);
+        }
+}
+// 压入一个字符
+static inline void membuffer_putc(membuffer_t *buff, char c) {
+        membuffer_ensure_space(buff, 1);
+        buff->b[buff->sz++] = c;
+}
+// 写入一段内存
+static inline void membuffer_putb(membuffer_t *buff, const void *b, size_t sz) {
+        membuffer_ensure_space(buff, sz);
+        memcpy(buff->b + buff->sz, b, sz);
+        buff->sz += sz;
+}
+// 压入一个字符：不检查空间(不安全版本)
+static inline void membuffer_putc_unsafe(membuffer_t *buff, char c) {
+        buff->b[buff->sz++] = c;
+}
+#if LUA_VERSION_NUM > 501
+// 写入一段内存：不检查空间(不安全版本)
+static inline void membuffer_putb_unsafe(membuffer_t *buff, const void *b, size_t sz) {
+        memcpy(buff->b + buff->sz, b, sz);
+        buff->sz += sz;
+}
+#endif
+// 取当前的指针
+static inline char* membuffer_getp(membuffer_t *buff) {
+        return buff->b + buff->sz;
+}
+//-----------------------------------------------------------------------------
+// parser
+//-------------------------------------
+// 与Lua相关的代码
+static inline void l_add_object(lua_State *L) {
+        luaL_checkstack(L, 6, NULL);
+        lua_createtable(L, 0, 4);
+}
+static inline void l_begin_pair(lua_State *L, const char *k, size_t sz) {
+        lua_pushlstring(L, k, sz);
+}
+static inline void l_end_pair(lua_State *L) {
+        lua_rawset(L, -3);
+}
+static inline void l_add_array(lua_State *L) {
+        luaL_checkstack(L, 6, NULL);
+        lua_createtable(L, 4, 0);
+}
+static inline void l_add_index(lua_State *L, int i) {
+        lua_rawseti(L, -2, i+1);
+}
+static inline void l_add_string(lua_State *L, const char *s, size_t sz) {
+        lua_pushlstring(L, s, sz);
+}
+static inline void l_add_float(lua_State *L, double f) {
+        lua_pushnumber(L, (lua_Number)f);
+}
+static inline void l_add_integer(lua_State *L, int64_t i) {
+        lua_pushinteger(L, (lua_Integer)i);
+}
+static inline void l_add_boolean(lua_State *L, int b) {
+        lua_pushboolean(L, b);
+}
+static inline void l_add_null(lua_State *L) {
+        lua_pushlightuserdata(L, NULL);
+}
+static inline void l_error(lua_State *L, const char *msg) {
+        luaL_error(L, msg);
+}
+// 解析事件
+#define ON_ADD_OBJECT(ud) l_add_object((lua_State*)(ud))
+#define ON_BEGIN_PAIR(ud, k, sz) l_begin_pair((lua_State*)(ud), k, sz)
+#define ON_END_PAIR(ud) l_end_pair((lua_State*)(ud))
+#define ON_ADD_ARRAY(ud) l_add_array((lua_State*)(ud))
+#define ON_ADD_INDEX(ud, i) l_add_index((lua_State*)(ud), i)
+#define ON_ADD_STRING(ud, s, sz) l_add_string((lua_State*)(ud), s, sz)
+#define ON_ADD_FLOAT(ud, f) l_add_float((lua_State*)(ud), f)
+#define ON_ADD_INTEGER(ud, i) l_add_integer((lua_State*)(ud), i)
+#define ON_ADD_BOOLEAN(ud, b) l_add_boolean((lua_State*)(ud), b)
+#define ON_ADD_NULL(ud) l_add_null((lua_State*)(ud))
+#define ON_ERROR(ud, msg) l_error((lua_State*)(ud), msg)
+//-------------------------------------
+// 解析json，这部分代码与Lua无关，是通用的解析器；如果要移植这部分代码，需要把 //>>> 开头的注释去掉
+// 错误消息的大小
+#define ERRMSG_SIZE 256
+// json解析器
+typedef struct {
+        const char *str;        // json字符串
+        const char *ptr;        // json字符串解析指针
+        void *ud;                       // 解析事件的用户数据
+        membuffer_t buff;       // 临时缓存
+        int curdepth;   // 当前层次
+        int maxdepth;   // 最大层次
+        int allowcomment; // 是否允许注释
+        char errmsg[ERRMSG_SIZE];       // 保存错误消息
+        //>>>jmp_buf jb;                        // 用于实现从解析中出错直接跳出
+} json_parser_t;
+static inline void parser_init(json_parser_t *parser, const char *str, size_t size, void *ud,
+        int maxdepth, int allowcomment) {
+        membuffer_init(&parser->buff);
+        membuffer_ensure_space(&parser->buff, size);
+        parser->str = str;
+        parser->ptr = str;
+        parser->ud = ud;
+        parser->maxdepth = maxdepth;
+        parser->curdepth = 0;
+        parser->allowcomment = allowcomment;
+}
+static inline void parser_free(json_parser_t *parser) {
+        membuffer_free(&parser->buff);
+}
+// 抛出错误
+static void parser_throw_error(json_parser_t *parser, const char *fmt, ...) {
+        membuffer_free(&parser->buff);
+        va_list arg;
+        va_start(arg, fmt);
+        vsnprintf(parser->errmsg, ERRMSG_SIZE, fmt, arg);
+        va_end(arg);
+        ON_ERROR(parser->ud, parser->errmsg);
+        // 直接跳出解析代码，由于Lua的lua_error也是用longjmp，所以下面的代码没有机会执行到。但其他语言就不一定。
+        //>>>longjmp(parser->jb, 1);
+}
+// 辅助宏
+#define peekchar(p) (*(p)->ptr)
+#define skipchar(p) (++(p)->ptr)
+#define get_and_next(p) (*(p)->ptr++)
+#define next_and_get(p) (*(++(p)->ptr))
+#define savechar(p, c) membuffer_putc_unsafe(&(p)->buff, (c))
+#define currpos(p) (size_t)((p)->ptr - (p)->str)
+// 取解析到的错误内容
+static const char* parser_error_content(json_parser_t *p) {
+        size_t n = currpos(p);
+        if (n > 50) n = 50;     // 调整这个数获得更长的内容
+        membuffer_reset(&p->buff);
+        membuffer_putb(&p->buff, p->ptr - n, n);
+        membuffer_putc(&p->buff, '\0');
+        return p->buff.b;
+}
+// 增加深度
+static inline void parser_add_depth(json_parser_t *p) {
+        p->curdepth++;
+        if (p->curdepth >= p->maxdepth)
+                parser_throw_error(p, "Too many nested data, max depth is %d, at: %s[:%lu]", p->maxdepth,
+                        parser_error_content(p), currpos(p));
+}
+static inline void parser_skip_whitespaces(json_parser_t *p) {
+        // colin: 要支持注释，请将下面注释去掉
+        // if (likely(!p->allowcomment)) {
+                char ch = peekchar(p);
+                while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')
+                        ch = next_and_get(p);
+        // } else {
+        //      char ch = peekchar(p);
+        //      for (;;) {
+        //              while (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r')
+        //                      ch = next_and_get(p);
+        //              if (ch == '/') {
+        //                      ch = next_and_get(p);
+        //                      if (ch == '/') {
+        //                              ch = next_and_get(p);
+        //                              while (ch != '\n' && ch != '\r' && ch != '\0')
+        //                                      ch = next_and_get(p);
+        //                              continue;
+        //                      } else {
+        //                              parser_throw_error(p, "Invalid comment, at: %s[:%lu]", parser_error_content(p), currpos(p));
+        //                      }
+        //              }
+        //              break;
+        //      }
+        // }
+}
+static inline void parser_expect_char(json_parser_t *p, char c) {
+        if (likely(peekchar(p) == c))
+                skipchar(p);
+        else
+                parser_throw_error(p, "Expect '%c' at: %s[:%lu]", c, parser_error_content(p), currpos(p));
+}
+static inline void parser_process_false(json_parser_t *p) {
+        if (likely(p->ptr[0] == 'a' && p->ptr[1] == 'l' && p->ptr[2] == 's' && p->ptr[3] == 'e')) {
+                p->ptr += 4;
+                ON_ADD_BOOLEAN(p->ud, 0);
+        } else {
+                parser_throw_error(p, "Invalid boolean, at: %s[:%lu]", parser_error_content(p), currpos(p));
+        }
+}
+static inline void parser_process_true(json_parser_t *p) {
+        if (likely(p->ptr[0] == 'r' && p->ptr[1] == 'u' && p->ptr[2] == 'e')) {
+                p->ptr += 3;
+                ON_ADD_BOOLEAN(p->ud, 1);
+        } else {
+                parser_throw_error(p, "Invalid boolean, at: %s[:%lu]", parser_error_content(p), currpos(p));
+        }
+}
+static inline void parser_process_null(json_parser_t *p) {
+        if (likely(p->ptr[0] == 'u' && p->ptr[1] == 'l' && p->ptr[2] == 'l')) {
+                p->ptr += 3;
+                ON_ADD_NULL(p->ud);
+        } else {
+                parser_throw_error(p, "Invalid null, at: %s[:%lu]", parser_error_content(p), currpos(p));
+        }
+}
+static inline uint32_t parser_read_hex(json_parser_t *p) {
+        uint32_t cp = 0;
+        unsigned char ch;
+        int i = 4;
+        while (i--) {
+                ch = (unsigned char)get_and_next(p);
+                if ('0' <= ch && ch <= '9')
+                        ch -= '0';
+                else if (ch >= 'a' && ch <= 'f')
+                        ch = ch - 'a' + 10;
+                else if (ch >= 'A' && ch <= 'F')
+                        ch = ch - 'A' + 10;
+                else {
+                        parser_throw_error(p, "Invalid utf8 escape sequence, at: %s[:%lu]", parser_error_content(p), currpos(p));
+                        return cp;
+                }
+                cp = (cp << 4) + ch;
+        }
+        return cp;
+}
+static inline void parser_process_utf8esc(json_parser_t *p) {
+        uint32_t cp = parser_read_hex(p);
+        // UTF-16 surrogate pairs, see https://unicodebook.readthedocs.io/unicode_encodings.html#utf-16-surrogate-pairs
+        if (cp >= 0xD800 && cp <= 0xDBFF) {
+                char p0 = p->ptr[0];
+                char p1 = p->ptr[1];
+                if (p0 != '\\' || p1 != 'u')
+                        parser_throw_error(p, "Invalid utf8 escape sequence, at: %s[:%lu]", parser_error_content(p), currpos(p));
+                p->ptr += 2;
+                uint32_t cp2 = parser_read_hex(p);
+                if (cp2 < 0xDC00 || cp2 > 0xDFFF)
+                        parser_throw_error(p, "Invalid utf8 escape sequence, at: %s[:%lu]", parser_error_content(p), currpos(p));
+                cp = 0x10000 + (((cp & 0x03FF) << 10) | (cp2 & 0x03FF));
+        }
+        if (cp < 0x80) {
+                membuffer_putc_unsafe(&p->buff, (char)cp);
+        } else if (cp < 0x800) {
+                membuffer_putc_unsafe(&p->buff, 0xC0 | (cp >> 6));
+                membuffer_putc_unsafe(&p->buff, 0x80 | (cp & 0x3F));
+        } else if (cp < 0x10000) {
+                membuffer_putc_unsafe(&p->buff, 0xE0 | (cp >> 12));
+                membuffer_putc_unsafe(&p->buff, 0x80 | ((cp >> 6) & 0x3F));
+                membuffer_putc_unsafe(&p->buff, 0x80 | (cp & 0x3F));
+        } else {
+                membuffer_putc_unsafe(&p->buff, 0xF0 | (cp >> 18));
+                membuffer_putc_unsafe(&p->buff, 0x80 | ((cp >> 12) & 0x3F));
+                membuffer_putc_unsafe(&p->buff, 0x80 | ((cp >> 6) & 0x3F));
+                membuffer_putc_unsafe(&p->buff, 0x80 | (cp & 0x3F));
+        }
+}
+static const char escape2char[256] = {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 0~19
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0, '\"',0,  0,  0,  0,  0,  // 20~39
+        0,  0,  0,  0,  0,  0,  0, '/', 0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 40~59
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 60~79
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0, '\\',0,  0,  0,  0,  0, '\b',0,  // 80~99
+        0,  0, '\f',0,  0,  0,  0,  0,  0,  0,  '\n',0,  0,  0, '\r',0, '\t',0,  0,  0,  // 100~119
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 120~139
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 140~159
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 160~179
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 180~199
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 200~219
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 220~239
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,                  // 240~256
+};
+static inline void parser_process_string(json_parser_t *p) {
+        membuffer_reset(&p->buff);
+        char ch = get_and_next(p);
+        for (;;) {
+                if (ch == '\\') {
+                        unsigned char nch = (unsigned char)peekchar(p);
+                        if (likely(escape2char[nch])) {
+                                savechar(p, escape2char[nch]);
+                                skipchar(p);
+                        } else if (nch == 'u') {
+                                skipchar(p);
+                                parser_process_utf8esc(p);
+                        } else {
+                                parser_throw_error(p, "Invalid escape sequence, at: %s[:%lu]", parser_error_content(p), currpos(p));
+                        }
+                } else if (ch == '"') {
+                        break;
+                } else if ((unsigned char)ch < 0x20) {
+                        parser_throw_error(p, "Invalid string, at: %s[:%lu]", parser_error_content(p), currpos(p));
+                } else {
+                        savechar(p, ch);
+                }
+                ch = get_and_next(p);
+        }
+}
+#define invalid_number(p) parser_throw_error(p, "Invalid value, at: %s[:%lu]", parser_error_content(p), currpos(p))
+#define MAXBY10         (int64_t)(922337203685477580)
+#define MAXLASTD        (int)(7)
+static double powersOf10[] = {10., 100., 1.0e4, 1.0e8, 1.0e16, 1.0e32, 1.0e64, 1.0e128, 1.0e256};
+static inline void parser_process_number(json_parser_t *p, char ch) {
+        double db;                              // 浮点数
+        int64_t in = 0;                 // 整型值
+        int isdouble = 0;               // 是否是浮点数
+        int neg = 0;                    // 是否是负数
+        int exponent = 0;               // 指数位数
+        if (ch == '-') {        // 负值
+                neg = 1;
+                ch = get_and_next(p);
+        }
+        if (unlikely(ch == '0')) {      // 0开头的后面只能是：.eE或\0
+                ch = peekchar(p);
+        } else if (likely(ch >= '1' && ch <= '9')) {
+                in = ch - '0';
+                ch = peekchar(p);
+                while (ch >= '0' && ch <= '9') {
+                        if (unlikely(in >= MAXBY10 && (in > MAXBY10 || (ch - '0') > MAXLASTD + neg))) { // 更大的数字就用浮点数表示
+                                isdouble = 1;
+                                db = (double)in;
+                                do {
+                                        db = db * 10.0 + (ch - '0');
+                                        ch = next_and_get(p);
+                                } while (ch >= '0' && ch <= '9');
+                                break;
+                        }
+                        in = in * 10 + (ch - '0');
+                        ch = next_and_get(p);
+                }
+        } else {
+                invalid_number(p);
+        }
+        if (ch == '.') {        // 小数点部分
+                if (likely(!isdouble)) {
+                        isdouble = 1;
+                        db = (double)in;
+                }
+                ch = next_and_get(p);
+                if (unlikely(!(ch >= '0' && ch <= '9')))
+                        invalid_number(p);  // .后面一定是数字
+                do {
+                        db = db * 10. + (ch - '0');
+                        exponent--;
+                        ch = next_and_get(p);
+                } while (ch >= '0' && ch <= '9');
+        }
+        if (ch == 'e' || ch == 'E') {   // 指数部分
+                if (!isdouble) {                // 有e强制认为是浮点数
+                        isdouble = 1;
+                        db = (double)in;
+                }
+                ch = next_and_get(p);
+                int eneg = 0;
+                if (ch == '-') {
+                        eneg = 1;
+                        ch = next_and_get(p);
+                } else if (ch == '+') {
+                        ch = next_and_get(p);
+                }
+                if (unlikely(!(ch >= '0' && ch <= '9')))
+                        invalid_number(p);  // 后面一定是数字
+                int exp = 0;
+                do {
+                        exp = exp * 10. + (ch - '0');
+                        ch = next_and_get(p);
+                } while (ch >= '0' && ch <= '9');
+                exponent += eneg ? (-exp) : (exp);
+        }
+        if (isdouble) {
+                int n = exponent < 0 ? -exponent : exponent;
+                if (unlikely(n>511))
+                        n = 511;        // inf
+                double p10 = 1.0;
+                double *d;
+                for (d = powersOf10; n != 0; n >>= 1, d += 1) {
+                        if (n & 1) p10 *= *d;
+                }
+                if (exponent < 0)
+                        db /= p10;
+                else
+                        db *= p10;
+                if (neg) db = -db;
+                ON_ADD_FLOAT(p->ud, db);
+        } else {
+                if (neg) in = -in;
+                ON_ADD_INTEGER(p->ud, in);
+        }
+}
+static void parser_process_value(json_parser_t *p);
+static inline void parser_process_object(json_parser_t *p) {
+        parser_add_depth(p);
+        ON_ADD_OBJECT(p->ud);
+        parser_skip_whitespaces(p);
+        char ch = peekchar(p);
+        if (ch == '}') {
+                skipchar(p);
+                p->curdepth--;
+                return;
+        }
+        for (;;) {
+                parser_expect_char(p, '"');
+                parser_process_string(p);               // key
+                ON_BEGIN_PAIR(p->ud, p->buff.b, p->buff.sz);
+                parser_skip_whitespaces(p);
+                parser_expect_char(p, ':');
+                parser_process_value(p);                        // value
+                ON_END_PAIR(p->ud);
+                parser_skip_whitespaces(p);
+                if (peekchar(p) == '}') {
+                        skipchar(p);
+                        p->curdepth--;
+                        return;
+                }
+                else {
+                        parser_expect_char(p, ',');
+                        parser_skip_whitespaces(p);
+                }
+        }
+}
+static inline void parser_process_array(json_parser_t *p) {
+        parser_add_depth(p);
+        ON_ADD_ARRAY(p->ud);
+        parser_skip_whitespaces(p);
+        char ch = peekchar(p);
+        if (ch == ']') {
+                skipchar(p);
+                p->curdepth--;
+                return;
+        }
+        int i;
+        for (i = 0; ;++i) {
+                parser_process_value(p);
+                ON_ADD_INDEX(p->ud, i);
+                parser_skip_whitespaces(p);
+                if (peekchar(p) == ']') {
+                        skipchar(p);
+                        p->curdepth--;
+                        return;
+                }
+                else {
+                        parser_expect_char(p, ',');
+                }
+        }
+}
+static void parser_process_value(json_parser_t *p) {
+        parser_skip_whitespaces(p);
+        char ch = get_and_next(p);
+        switch (ch) {
+                case 'f':
+                        parser_process_false(p);
+                        break;
+                case 't':
+                        parser_process_true(p);
+                        break;
+                case 'n':
+                        parser_process_null(p);
+                        break;
+                case '"':
+                        parser_process_string(p);
+                        ON_ADD_STRING(p->ud, p->buff.b, p->buff.sz);
+                        break;
+                case '{':
+                        parser_process_object(p);
+                        break;
+                case '[':
+                        parser_process_array(p);
+                        break;
+                default:
+                        parser_process_number(p, ch);
+                        break;
+        }
+}
+// 解析json文本
+static void parser_do_parse(const char *str, size_t size, void *ud, int maxdepth, int allowcomment) {
+        json_parser_t p;
+        parser_init(&p, str, size, ud, maxdepth, allowcomment);
+        //>>>if (setjmp(p.jb) == 0) {
+                parser_process_value(&p);
+                parser_skip_whitespaces(&p);
+                if (peekchar(&p) != '\0') {
+                        parser_throw_error(&p, "Expect '<eof>' but got '%c', at: %s[:%lu]", peekchar(&p),
+                                parser_error_content(&p), currpos(&p));
+                }
+                parser_free(&p);
+        //>>>}
+}
+//-----------------------------------------------------------------------------
+// dumpper
+typedef struct {
+        membuffer_t buff;       // 临时缓存
+        int maxdepth;   // 最大层次
+        int format;                     // 是否格式化
+        int empty_as_array; // 空表是否当成数组
+        int num_as_str;         // 数字Key转为字符串
+        char errmsg[ERRMSG_SIZE];       // 保存错误消息
+} json_dumpper_t;
+// 足够转换数字的缓存大小
+#define NUMBER_BUFF_SZ 44
+#define INTEGER_BUFF_SZ 24
+// 抛出错误
+static void dumpper_throw_error(json_dumpper_t *d, lua_State *L, const char *fmt, ...) {
+        membuffer_free(&d->buff);
+        va_list arg;
+        va_start(arg, fmt);
+        vsnprintf(d->errmsg, ERRMSG_SIZE, fmt, arg);
+        va_end(arg);
+        luaL_error(L, d->errmsg);
+}
+#if LUA_VERSION_NUM > 501
+static void dumpper_process_integer(json_dumpper_t *d, lua_State *L, int idx) {
+        char nbuff[INTEGER_BUFF_SZ];
+        int i = INTEGER_BUFF_SZ;
+        membuffer_ensure_space(&d->buff, INTEGER_BUFF_SZ);
+        int64_t x = (int64_t)lua_tointeger(L, idx);
+        uint64_t ux = (uint64_t)x;
+        if (x < 0) {
+                membuffer_putc_unsafe(&d->buff, '-');
+                ux = ~ux + 1;
+        }
+        do {
+                nbuff[--i] = (ux % 10) + '0';
+        } while (ux /= 10);
+        membuffer_putb_unsafe(&d->buff, nbuff+i, INTEGER_BUFF_SZ-i);
+}
+#endif
+static void dumpper_process_number(json_dumpper_t *d, lua_State *L, int idx) {
+        lua_Number num = lua_tonumber(L, idx);
+         if (isinf(num) || isnan(num))
+                 dumpper_throw_error(d, L, "The number is NaN or Infinity");
+        membuffer_ensure_space(&d->buff, NUMBER_BUFF_SZ);
+        char *p = membuffer_getp(&d->buff);
+        int len = sprintf(p, LUA_NUMBER_FMT, num);
+        membuffer_add_size(&d->buff, len);
+}
+// 字符转义表
+static const char char2escape[256] = {
+        'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't',  'n', 'u', 'f', 'r', 'u', 'u', 'u', 'u', 'u', 'u', // 0~19
+        'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',  'u', 'u',  0,   0,  '"',   0,   0,   0,   0,   0, // 20~39
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 40~59
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 60~79
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,  '\\', 0,   0,   0,   0,   0,   0,   0,  // 80~99
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 100~119
+         0,   0,   0,   0,   0,   0,   0,  'u',  0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 120~139
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 140~159
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 160~179
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 180~199
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 200~219
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  // 220~239
+         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,                      // 240~256
+};
+static const char hex_digits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+static void dumpper_process_string(json_dumpper_t *d, lua_State *L, int idx) {
+        membuffer_t *buff = &d->buff;
+        size_t len, i;
+        const char *str = lua_tolstring(L, idx, &len);
+        membuffer_ensure_space(buff, len * 6 + 2);
+        membuffer_putc_unsafe(buff, '\"');
+        char esc;
+        unsigned char ch;
+        for (i = 0; i < len; ++i) {
+                ch = (unsigned char)str[i];
+                esc = char2escape[ch];
+                if (likely(!esc))
+                        membuffer_putc_unsafe(buff, (char)ch);
+                else {
+                        membuffer_putc_unsafe(buff, '\\');
+                        membuffer_putc_unsafe(buff, esc);
+                        if (esc == 'u') {
+                                membuffer_putc_unsafe(buff, '0');
+                                membuffer_putc_unsafe(buff, '0');
+                                membuffer_putc_unsafe(buff, hex_digits[(unsigned char)esc >> 4]);
+                                membuffer_putc_unsafe(buff, hex_digits[(unsigned char)esc & 0xF]);
+                        }
+                }
+        }
+        membuffer_putc_unsafe(buff, '\"');
+}
+static void dumpper_process_value(json_dumpper_t *d, lua_State *L, int depth);
+static int dumpper_check_array(json_dumpper_t *d, lua_State *L, int *len) {
+        int asize = lua_objlen(L, -1);
+        if (asize > 0) {
+                lua_pushinteger(L, asize);
+                if (lua_next(L, -2) == 0) {
+                        *len = asize;
+                        return 1;
+                } else {
+                        lua_pop(L, 2);
+                        return 0;
+                }
+        } else {
+                lua_pushnil(L);
+                if (lua_next(L, -2) == 0) {
+                        *len = asize;
+                        return d->empty_as_array;
+                } else {
+                        lua_pop(L, 2);
+                        return 0;
+                }
+        }
+}
+static inline void dumpper_add_indent(json_dumpper_t *d, int count) {
+        membuffer_ensure_space(&d->buff, count);
+        int i;
+        for (i = 0; i < count; ++i)
+                membuffer_putc_unsafe(&d->buff, '\t');
+}
+static void dumpper_process_array(json_dumpper_t *d, lua_State *L, int len, int depth) {
+        membuffer_t *buff = &d->buff;
+        membuffer_putc(buff, '[');
+        int i;
+        for (i = 1; i <= len; ++i) {
+                if (unlikely(d->format && i == 1)) membuffer_putc(buff, '\n');
+                lua_rawgeti(L, -1, i);
+                if (unlikely(d->format)) dumpper_add_indent(d, depth);
+                dumpper_process_value(d, L, depth);
+                lua_pop(L, 1);
+                if (i < len)
+                        membuffer_putc(buff, ',');
+                if (unlikely(d->format)) membuffer_putc(buff, '\n');
+        }
+        if (unlikely(d->format && i > 1))  dumpper_add_indent(d, depth-1);
+        membuffer_putc(buff, ']');
+}
+static void dumpper_process_object(json_dumpper_t *d, lua_State *L, int depth) {
+        membuffer_t *buff = &d->buff;
+        membuffer_putc(buff, '{');
+        int ktp;
+        int comma = 0;
+        lua_pushnil(L);         // t nil
+        while (lua_next(L, -2) != 0) {  // t k v
+                if (comma) {
+                        membuffer_putc(buff, ',');
+                        if (unlikely(d->format)) membuffer_putc(buff, '\n');
+                } else {
+                        comma = 1;
+                        if (unlikely(d->format)) membuffer_putc(buff, '\n');
+                }
+                // key
+                ktp = lua_type(L, -2);
+                if (ktp == LUA_TSTRING) {
+                        if (unlikely(d->format)) dumpper_add_indent(d, depth);
+                        dumpper_process_string(d, L, -2);
+                        if (likely(!d->format))
+                                membuffer_putc(buff, ':');
+                        else
+                                membuffer_putb(buff, " : ", 3);
+                } else if (ktp == LUA_TNUMBER && d->num_as_str) {
+                        if (unlikely(d->format)) dumpper_add_indent(d, depth);
+                        membuffer_putc(buff, '\"');
+#if LUA_VERSION_NUM > 501
+                        if (lua_isinteger(L, -2))
+                                dumpper_process_integer(d, L, -2);
+                        else
+#endif
+                                dumpper_process_number(d, L, -2);
+                        if (likely(!d->format))
+                                membuffer_putb(buff, "\":", 2);
+                        else
+                                membuffer_putb(buff, "\" : ", 4);
+                } else {
+                        dumpper_throw_error(d, L, "Table key must be a string");
+                }
+                // value
+                dumpper_process_value(d, L, depth);
+                lua_pop(L, 1);
+        }
+        if (unlikely(d->format && comma)) {
+                membuffer_putc(buff, '\n');
+                dumpper_add_indent(d, depth-1);
+        }
+        membuffer_putc(buff, '}');
+}
+static inline void dumpper_process_table(json_dumpper_t *d, lua_State *L, int depth) {
+        depth++;
+        if (depth > d->maxdepth)
+                dumpper_throw_error(d, L, "Too many nested data, max depth is %d", d->maxdepth);
+        luaL_checkstack(L, 6, NULL);
+        int len;
+        if (dumpper_check_array(d, L, &len))
+                dumpper_process_array(d, L, len, depth);
+        else
+                dumpper_process_object(d, L, depth);
+}
+static void dumpper_process_value(json_dumpper_t *d, lua_State *L, int depth) {
+        int tp = lua_type(L, -1);
+        switch (tp) {
+                case LUA_TSTRING:
+                        dumpper_process_string(d, L, -1);
+                        break;
+                case LUA_TNUMBER:
+#if LUA_VERSION_NUM > 501
+                        if (lua_isinteger(L, -1))
+                                dumpper_process_integer(d, L, -1);
+                        else
+#endif
+                                dumpper_process_number(d, L, -1);
+                        break;
+                case LUA_TBOOLEAN:
+                        if (lua_toboolean(L, -1))
+                                membuffer_putb(&d->buff, "true", 4);
+                        else
+                                membuffer_putb(&d->buff, "false", 5);
+                        break;
+                case LUA_TTABLE:
+                        dumpper_process_table(d, L, depth);
+                        break;
+                case LUA_TNIL:
+                        membuffer_putb(&d->buff, "null", 4);
+                        break;
+                case LUA_TLIGHTUSERDATA:
+                        if (lua_touserdata(L, -1) == NULL) {
+                                membuffer_putb(&d->buff, "null", 4);
+                                break;
+                        }
+                        goto error;
+                default:
+                error:
+                        dumpper_throw_error(d, L, "Unsupport type %s", lua_typename(L, tp));
+        }
+}
+//-----------------------------------------------------------------------------
+// 接口
+#define DEF_MAX_DEPTH 128
+// 从字符串加载：json.decode(str, maxdepth) -> obj
+// 要求字符串必须以0结尾
+int colibc_json_decode(lua_State *L) {
+        size_t size;
+        const char *str = luaL_checklstring(L, 1, &size);
+        int maxdepth = (int)luaL_optinteger(L, 2, DEF_MAX_DEPTH);
+        int allowcomment = lua_toboolean(L, 3);
+        parser_do_parse(str, size, L, maxdepth, allowcomment);
+        return 1;
+}
+// 保存到字符串: json.encode(obj) -> str
+int colibc_json_encode(lua_State *L) {
+        luaL_checkany(L, 1);
+        json_dumpper_t dumpper;
+        membuffer_init(&dumpper.buff);
+        dumpper.format = lua_toboolean(L, 2);
+        dumpper.empty_as_array = lua_toboolean(L, 3);
+        dumpper.num_as_str = lua_toboolean(L, 4);
+        dumpper.maxdepth = (int)luaL_optinteger(L, 5, DEF_MAX_DEPTH);
+        lua_settop(L, 1);
+        dumpper_process_value(&dumpper, L, 0);
+        lua_pushlstring(L, dumpper.buff.b, dumpper.buff.sz);
+        membuffer_free(&dumpper.buff);
+        return 1;
+}
+static const luaL_Reg lib[] = {
+        {"decode", colibc_json_decode},
+        {"encode", colibc_json_encode},
+        {NULL, NULL},
+};
+LUALIB_API int luaopen_colibc_json(lua_State* L) {
+#if LUA_VERSION_NUM > 501
+        luaL_newlib(L, lib); // json
+#else
+        lua_getglobal(L, "package"); // package
+        lua_getfield(L, -1, "loaded"); // package loaded
+        lua_createtable(L, 0, 0); // package loaded json
+        lua_pushvalue(L, -1); // package loaded json json
+        lua_setfield(L, -3, "cojson"); // loaded["cojson"] = json, package loaded json
+        luaL_register(L, NULL, lib); // package loaded json
+#endif
+        // json.null
+        lua_pushlightuserdata(L, NULL);
+        lua_setfield(L, -2, "null");
+        return 1;
+}
diff --git a/src/3rdParty/efsw/FileWatcherGeneric.cpp b/src/3rdParty/efsw/FileWatcherGeneric.cpp
index 3f3c52e..468d27c 100644
--- a/src/3rdParty/efsw/FileWatcherGeneric.cpp
+++ b/src/3rdParty/efsw/FileWatcherGeneric.cpp
@@ -25,7 +25,7 @@ FileWatcherGeneric::~FileWatcherGeneric() {
 }
 WatchID FileWatcherGeneric::addWatch( const std::string& directory, FileWatchListener* watcher,
-                                                                          bool recursive, const std::vector<WatcherOption>& options ) {
+                                                                          bool recursive, const std::vector<WatcherOption>& /*options*/ ) {
        std::string dir( directory );
        FileSystem::dirAddSlashAtEnd( dir );
diff --git a/src/3rdParty/utf8cpp.h b/src/3rdParty/utf8cpp.h
new file mode 100755
index 0000000..76f0fa1
--- /dev/null
+++ b/src/3rdParty/utf8cpp.h
@@ -0,0 +1,1277 @@
+// Copyright 2006 Nemanja Trifunovic
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+#ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
+/*
+To control the C++ language version used by the library, you can define UTF_CPP_CPLUSPLUS macro
+and set it to one of the values used by the __cplusplus predefined macro.
+For instance,
+    #define UTF_CPP_CPLUSPLUS 199711L
+will cause the UTF-8 CPP library to use only types and language features available in the C++ 98 standard.
+Some library features will be disabled.
+If you leave UTF_CPP_CPLUSPLUS undefined, it will be internally assigned to __cplusplus.
+*/
+#include <iterator>
+#include <cstring>
+#include <string>
+// Determine the C++ standard version.
+// If the user defines UTF_CPP_CPLUSPLUS, use that.
+// Otherwise, trust the unreliable predefined macro __cplusplus
+#if !defined UTF_CPP_CPLUSPLUS
+    #define UTF_CPP_CPLUSPLUS __cplusplus
+#endif
+#if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
+    #define UTF_CPP_OVERRIDE override
+    #define UTF_CPP_NOEXCEPT noexcept
+    #define UTF_CPP_STATIC_ASSERT(condition) static_assert(condition, "UTFCPP static assert");
+#else // C++ 98/03
+    #define UTF_CPP_OVERRIDE
+    #define UTF_CPP_NOEXCEPT throw()
+    // Simulate static_assert:
+    template<bool> struct UtfCppCompileTimeAssert;
+    template<> struct UtfCppCompileTimeAssert  <true> { };
+    #define UTF_CPP_STATIC_ASSERT(condition)  (UtfCppCompileTimeAssert <(condition) != 0>())
+#endif // C++ 11 or later
+namespace utf8
+{
+// The typedefs for 8-bit, 16-bit and 32-bit code units
+#if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
+    #if UTF_CPP_CPLUSPLUS >= 202002L // C++ 20 or later
+        typedef char8_t         utfchar8_t;
+    #else // C++ 11/14/17
+        typedef unsigned char   utfchar8_t;
+    #endif
+    typedef char16_t        utfchar16_t;
+    typedef char32_t        utfchar32_t;
+#else // C++ 98/03
+    typedef unsigned char   utfchar8_t;
+    typedef unsigned short  utfchar16_t;
+    typedef unsigned int    utfchar32_t;
+#endif // C++ 11 or later
+// Helper code - not intended to be directly called by the library users. May be changed at any time
+namespace internal
+{
+    // Unicode constants
+    // Leading (high) surrogates: 0xd800 - 0xdbff
+    // Trailing (low) surrogates: 0xdc00 - 0xdfff
+    const utfchar16_t LEAD_SURROGATE_MIN  = 0xd800u;
+    const utfchar16_t LEAD_SURROGATE_MAX  = 0xdbffu;
+    const utfchar16_t TRAIL_SURROGATE_MIN = 0xdc00u;
+    const utfchar16_t TRAIL_SURROGATE_MAX = 0xdfffu;
+    const utfchar16_t LEAD_OFFSET         = 0xd7c0u;       // LEAD_SURROGATE_MIN - (0x10000 >> 10)
+    const utfchar32_t SURROGATE_OFFSET    = 0xfca02400u;   // 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN
+    // Maximum valid value for a Unicode code point
+    const utfchar32_t CODE_POINT_MAX      = 0x0010ffffu;
+    template<typename octet_type>
+    inline utfchar8_t mask8(octet_type oc)
+    {
+        return static_cast<utfchar8_t>(0xff & oc);
+    }
+    template<typename u16_type>
+    inline utfchar16_t mask16(u16_type oc)
+    {
+        return static_cast<utfchar16_t>(0xffff & oc);
+    }
+    template<typename octet_type>
+    inline bool is_trail(octet_type oc)
+    {
+        return ((utf8::internal::mask8(oc) >> 6) == 0x2);
+    }
+    inline bool is_lead_surrogate(utfchar32_t cp)
+    {
+        return (cp >= static_cast<utfchar32_t>(LEAD_SURROGATE_MIN) && cp <= static_cast<utfchar32_t>(LEAD_SURROGATE_MAX));
+    }
+    inline bool is_trail_surrogate(utfchar32_t cp)
+    {
+        return (cp >= static_cast<utfchar32_t>(TRAIL_SURROGATE_MIN) && cp <= static_cast<utfchar32_t>(TRAIL_SURROGATE_MAX));
+    }
+    inline bool is_surrogate(utfchar32_t cp)
+    {
+        return (cp >= static_cast<utfchar32_t>(LEAD_SURROGATE_MIN) && cp <= static_cast<utfchar32_t>(TRAIL_SURROGATE_MAX));
+    }
+    inline bool is_code_point_valid(utfchar32_t cp)
+    {
+        return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
+    }
+    inline bool is_in_bmp(utfchar32_t cp)
+    {
+        return cp < utfchar32_t(0x10000);
+    }
+    template <typename octet_iterator>
+    int sequence_length(octet_iterator lead_it)
+    {
+        const utfchar8_t lead = utf8::internal::mask8(*lead_it);
+        if (lead < 0x80)
+            return 1;
+        else if ((lead >> 5) == 0x6)
+            return 2;
+        else if ((lead >> 4) == 0xe)
+            return 3;
+        else if ((lead >> 3) == 0x1e)
+            return 4;
+        else
+            return 0;
+    }
+    inline bool is_overlong_sequence(utfchar32_t cp, int length)
+    {
+        if (cp < 0x80) {
+            if (length != 1)
+                return true;
+        }
+        else if (cp < 0x800) {
+            if (length != 2)
+                return true;
+        }
+        else if (cp < 0x10000) {
+            if (length != 3)
+                return true;
+        }
+        return false;
+    }
+    enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
+    /// Helper for get_sequence_x
+    template <typename octet_iterator>
+    utf_error increase_safely(octet_iterator& it, const octet_iterator end)
+    {
+        if (++it == end)
+            return NOT_ENOUGH_ROOM;
+        if (!utf8::internal::is_trail(*it))
+            return INCOMPLETE_SEQUENCE;
+        return UTF8_OK;
+    }
+    #define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}
+    /// get_sequence_x functions decode utf-8 sequences of the length x
+    template <typename octet_iterator>
+    utf_error get_sequence_1(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
+    {
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+        code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
+        return UTF8_OK;
+    }
+    template <typename octet_iterator>
+    utf_error get_sequence_2(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
+    {
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+        code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+        code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
+        return UTF8_OK;
+    }
+    template <typename octet_iterator>
+    utf_error get_sequence_3(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
+    {
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+        code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+        code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+        code_point = static_cast<utfchar32_t>(code_point + ((*it) & 0x3f));
+        return UTF8_OK;
+    }
+    template <typename octet_iterator>
+    utf_error get_sequence_4(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
+    {
+        if (it == end)
+           return NOT_ENOUGH_ROOM;
+        code_point = static_cast<utfchar32_t>(utf8::internal::mask8(*it));
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+        code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+        code_point = static_cast<utfchar32_t>(code_point + ((utf8::internal::mask8(*it) << 6) & 0xfff));
+        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
+        code_point = static_cast<utfchar32_t>(code_point + ((*it) & 0x3f));
+        return UTF8_OK;
+    }
+    #undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
+    template <typename octet_iterator>
+    utf_error validate_next(octet_iterator& it, octet_iterator end, utfchar32_t& code_point)
+    {
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+        // Save the original value of it so we can go back in case of failure
+        // Of course, it does not make much sense with i.e. stream iterators
+        octet_iterator original_it = it;
+        utfchar32_t cp = 0;
+        // Determine the sequence length based on the lead octet
+        const int length = utf8::internal::sequence_length(it);
+        // Get trail octets and calculate the code point
+        utf_error err = UTF8_OK;
+        switch (length) {
+            case 0:
+                return INVALID_LEAD;
+            case 1:
+                err = utf8::internal::get_sequence_1(it, end, cp);
+                break;
+            case 2:
+                err = utf8::internal::get_sequence_2(it, end, cp);
+            break;
+            case 3:
+                err = utf8::internal::get_sequence_3(it, end, cp);
+            break;
+            case 4:
+                err = utf8::internal::get_sequence_4(it, end, cp);
+            break;
+        }
+        if (err == UTF8_OK) {
+            // Decoding succeeded. Now, security checks...
+            if (utf8::internal::is_code_point_valid(cp)) {
+                if (!utf8::internal::is_overlong_sequence(cp, length)){
+                    // Passed! Return here.
+                    code_point = cp;
+                    ++it;
+                    return UTF8_OK;
+                }
+                else
+                    err = OVERLONG_SEQUENCE;
+            }
+            else
+                err = INVALID_CODE_POINT;
+        }
+        // Failure branch - restore the original value of the iterator
+        it = original_it;
+        return err;
+    }
+    template <typename octet_iterator>
+    inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
+        utfchar32_t ignored;
+        return utf8::internal::validate_next(it, end, ignored);
+    }
+    template <typename word_iterator>
+    utf_error validate_next16(word_iterator& it, word_iterator end, utfchar32_t& code_point)
+    {
+        // Make sure the iterator dereferences a large enough type
+        typedef typename std::iterator_traits<word_iterator>::value_type word_type;
+        UTF_CPP_STATIC_ASSERT(sizeof(word_type) >= sizeof(utfchar16_t));
+        // Check the edge case:
+        if (it == end)
+            return NOT_ENOUGH_ROOM;
+        // Save the original value of it so we can go back in case of failure
+        // Of course, it does not make much sense with i.e. stream iterators
+        word_iterator original_it = it;
+        utf_error err = UTF8_OK;
+        const utfchar16_t first_word = *it++;
+        if (!is_surrogate(first_word)) {
+            code_point = first_word;
+            return UTF8_OK;
+        }
+        else {
+            if (it == end)
+                err = NOT_ENOUGH_ROOM;
+            else if (is_lead_surrogate(first_word)) {
+                const utfchar16_t second_word = *it++;
+                if (is_trail_surrogate(static_cast<utfchar32_t>(second_word))) {
+                    code_point = static_cast<utfchar32_t>(first_word << 10) +  static_cast<utfchar32_t>(second_word) + SURROGATE_OFFSET;
+                    return UTF8_OK;
+                } else
+                    err = INCOMPLETE_SEQUENCE;
+            } else {
+                err = INVALID_LEAD;
+            }
+        }
+        // error branch
+        it = original_it;
+        return err;
+    }
+    // Internal implementation of both checked and unchecked append() function
+    // This function will be invoked by the overloads below, as they will know
+    // the octet_type.
+    template <typename octet_iterator, typename octet_type>
+    octet_iterator append(utfchar32_t cp, octet_iterator result) {
+        if (cp < 0x80)                        // one octet
+            *(result++) = static_cast<octet_type>(cp);
+        else if (cp < 0x800) {                // two octets
+            *(result++) = static_cast<octet_type>((cp >> 6)          | 0xc0);
+            *(result++) = static_cast<octet_type>((cp & 0x3f)        | 0x80);
+        }
+        else if (cp < 0x10000) {              // three octets
+            *(result++) = static_cast<octet_type>((cp >> 12)         | 0xe0);
+            *(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
+            *(result++) = static_cast<octet_type>((cp & 0x3f)        | 0x80);
+        }
+        else {                                // four octets
+            *(result++) = static_cast<octet_type>((cp >> 18)         | 0xf0);
+            *(result++) = static_cast<octet_type>(((cp >> 12) & 0x3f)| 0x80);
+            *(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
+            *(result++) = static_cast<octet_type>((cp & 0x3f)        | 0x80);
+        }
+        return result;
+    }
+    // One of the following overloads will be invoked from the API calls
+    // A simple (but dangerous) case: the caller appends byte(s) to a char array
+    inline char* append(utfchar32_t cp, char* result) {
+        return append<char*, char>(cp, result);
+    }
+    // Hopefully, most common case: the caller uses back_inserter
+    // i.e. append(cp, std::back_inserter(str));
+    template<typename container_type>
+    std::back_insert_iterator<container_type> append
+            (utfchar32_t cp, std::back_insert_iterator<container_type> result) {
+        return append<std::back_insert_iterator<container_type>,
+            typename container_type::value_type>(cp, result);
+    }
+    // The caller uses some other kind of output operator - not covered above
+    // Note that in this case we are not able to determine octet_type
+    // so we assume it's utfchar8_t; that can cause a conversion warning if we are wrong.
+    template <typename octet_iterator>
+    octet_iterator append(utfchar32_t cp, octet_iterator result) {
+        return append<octet_iterator, utfchar8_t>(cp, result);
+    }
+    // Internal implementation of both checked and unchecked append16() function
+    // This function will be invoked by the overloads below, as they will know
+    // the word_type.
+    template <typename word_iterator, typename word_type>
+    word_iterator append16(utfchar32_t cp, word_iterator result) {
+        UTF_CPP_STATIC_ASSERT(sizeof(word_type) >= sizeof(utfchar16_t));
+        if (is_in_bmp(cp))
+            *(result++) = static_cast<word_type>(cp);
+        else {
+            // Code points from the supplementary planes are encoded via surrogate pairs
+            *(result++) = static_cast<word_type>(LEAD_OFFSET + (cp >> 10));
+            *(result++) = static_cast<word_type>(TRAIL_SURROGATE_MIN + (cp & 0x3FF));
+        }
+        return result;
+    }
+    // Hopefully, most common case: the caller uses back_inserter
+    // i.e. append16(cp, std::back_inserter(str));
+    template<typename container_type>
+    std::back_insert_iterator<container_type> append16
+            (utfchar32_t cp, std::back_insert_iterator<container_type> result) {
+        return append16<std::back_insert_iterator<container_type>,
+            typename container_type::value_type>(cp, result);
+    }
+    // The caller uses some other kind of output operator - not covered above
+    // Note that in this case we are not able to determine word_type
+    // so we assume it's utfchar16_t; that can cause a conversion warning if we are wrong.
+    template <typename word_iterator>
+    word_iterator append16(utfchar32_t cp, word_iterator result) {
+        return append16<word_iterator, utfchar16_t>(cp, result);
+    }
+} // namespace internal
+    /// The library API - functions intended to be called by the users
+    // Byte order mark
+    const utfchar8_t bom[] = {0xef, 0xbb, 0xbf};
+    template <typename octet_iterator>
+    octet_iterator find_invalid(octet_iterator start, octet_iterator end)
+    {
+        octet_iterator result = start;
+        while (result != end) {
+            utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
+            if (err_code != internal::UTF8_OK)
+                return result;
+        }
+        return result;
+    }
+    inline const char* find_invalid(const char* str)
+    {
+        const char* end = str + std::strlen(str);
+        return find_invalid(str, end);
+    }
+    inline std::size_t find_invalid(const std::string& s)
+    {
+        std::string::const_iterator invalid = find_invalid(s.begin(), s.end());
+        return (invalid == s.end()) ? std::string::npos : static_cast<std::size_t>(invalid - s.begin());
+    }
+    template <typename octet_iterator>
+    inline bool is_valid(octet_iterator start, octet_iterator end)
+    {
+        return (utf8::find_invalid(start, end) == end);
+    }
+    inline bool is_valid(const char* str)
+    {
+        return (*(utf8::find_invalid(str)) == '\0');
+    }
+    inline bool is_valid(const std::string& s)
+    {
+        return is_valid(s.begin(), s.end());
+    }
+    template <typename octet_iterator>
+    inline bool starts_with_bom (octet_iterator it, octet_iterator end)
+    {
+        return (
+            ((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
+            ((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
+            ((it != end) && (utf8::internal::mask8(*it))   == bom[2])
+           );
+    }
+    inline bool starts_with_bom(const std::string& s)
+    {
+        return starts_with_bom(s.begin(), s.end());
+    }
+} // namespace utf8
+#include <stdexcept>
+namespace utf8
+{
+    // Base for the exceptions that may be thrown from the library
+    class exception : public ::std::exception {
+    };
+    // Exceptions that may be thrown from the library functions.
+    class invalid_code_point : public exception {
+        utfchar32_t cp;
+    public:
+        invalid_code_point(utfchar32_t codepoint) : cp(codepoint) {}
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid code point"; }
+        utfchar32_t code_point() const {return cp;}
+    };
+    class invalid_utf8 : public exception {
+        utfchar8_t u8;
+    public:
+        invalid_utf8 (utfchar8_t u) : u8(u) {}
+        invalid_utf8 (char c) : u8(static_cast<utfchar8_t>(c)) {}
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-8"; }
+        utfchar8_t utf8_octet() const {return u8;}
+    };
+    class invalid_utf16 : public exception {
+        utfchar16_t u16;
+    public:
+        invalid_utf16 (utfchar16_t u) : u16(u) {}
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-16"; }
+        utfchar16_t utf16_word() const {return u16;}
+    };
+    class not_enough_room : public exception {
+    public:
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Not enough space"; }
+    };
+    /// The library API - functions intended to be called by the users
+    template <typename octet_iterator>
+    octet_iterator append(utfchar32_t cp, octet_iterator result)
+    {
+        if (!utf8::internal::is_code_point_valid(cp))
+            throw invalid_code_point(cp);
+        return internal::append(cp, result);
+    }
+    inline void append(utfchar32_t cp, std::string& s)
+    {
+        append(cp, std::back_inserter(s));
+    }
+    template <typename word_iterator>
+    word_iterator append16(utfchar32_t cp, word_iterator result)
+    {
+        if (!utf8::internal::is_code_point_valid(cp))
+            throw invalid_code_point(cp);
+        return internal::append16(cp, result);
+    }
+    template <typename octet_iterator, typename output_iterator>
+    output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, utfchar32_t replacement)
+    {
+        while (start != end) {
+            octet_iterator sequence_start = start;
+            internal::utf_error err_code = utf8::internal::validate_next(start, end);
+            switch (err_code) {
+                case internal::UTF8_OK :
+                    for (octet_iterator it = sequence_start; it != start; ++it)
+                        *out++ = *it;
+                    break;
+                case internal::NOT_ENOUGH_ROOM:
+                    out = utf8::append (replacement, out);
+                    start = end;
+                    break;
+                case internal::INVALID_LEAD:
+                    out = utf8::append (replacement, out);
+                    ++start;
+                    break;
+                case internal::INCOMPLETE_SEQUENCE:
+                case internal::OVERLONG_SEQUENCE:
+                case internal::INVALID_CODE_POINT:
+                    out = utf8::append (replacement, out);
+                    ++start;
+                    // just one replacement mark for the sequence
+                    while (start != end && utf8::internal::is_trail(*start))
+                        ++start;
+                    break;
+            }
+        }
+        return out;
+    }
+    template <typename octet_iterator, typename output_iterator>
+    inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
+    {
+        static const utfchar32_t replacement_marker = static_cast<utfchar32_t>(utf8::internal::mask16(0xfffd));
+        return utf8::replace_invalid(start, end, out, replacement_marker);
+    }
+    inline std::string replace_invalid(const std::string& s, utfchar32_t replacement)
+    {
+        std::string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
+        return result;
+    }
+    inline std::string replace_invalid(const std::string& s)
+    {
+        std::string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    template <typename octet_iterator>
+    utfchar32_t next(octet_iterator& it, octet_iterator end)
+    {
+        utfchar32_t cp = 0;
+        internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
+        switch (err_code) {
+            case internal::UTF8_OK :
+                break;
+            case internal::NOT_ENOUGH_ROOM :
+                throw not_enough_room();
+            case internal::INVALID_LEAD :
+            case internal::INCOMPLETE_SEQUENCE :
+            case internal::OVERLONG_SEQUENCE :
+                throw invalid_utf8(static_cast<utfchar8_t>(*it));
+            case internal::INVALID_CODE_POINT :
+                throw invalid_code_point(cp);
+        }
+        return cp;
+    }
+    template <typename word_iterator>
+    utfchar32_t next16(word_iterator& it, word_iterator end)
+    {
+        utfchar32_t cp = 0;
+        internal::utf_error err_code = utf8::internal::validate_next16(it, end, cp);
+        if (err_code == internal::NOT_ENOUGH_ROOM)
+            throw not_enough_room();
+        return cp;
+    }
+    template <typename octet_iterator>
+    utfchar32_t peek_next(octet_iterator it, octet_iterator end)
+    {
+        return utf8::next(it, end);
+    }
+    template <typename octet_iterator>
+    utfchar32_t prior(octet_iterator& it, octet_iterator start)
+    {
+        // can't do much if it == start
+        if (it == start)
+            throw not_enough_room();
+        octet_iterator end = it;
+        // Go back until we hit either a lead octet or start
+        while (utf8::internal::is_trail(*(--it)))
+            if (it == start)
+                throw invalid_utf8(*it); // error - no lead byte in the sequence
+        return utf8::peek_next(it, end);
+    }
+    template <typename octet_iterator, typename distance_type>
+    void advance (octet_iterator& it, distance_type n, octet_iterator end)
+    {
+        const distance_type zero(0);
+        if (n < zero) {
+            // backward
+            for (distance_type i = n; i < zero; ++i)
+                utf8::prior(it, end);
+        } else {
+            // forward
+            for (distance_type i = zero; i < n; ++i)
+                utf8::next(it, end);
+        }
+    }
+    template <typename octet_iterator>
+    typename std::iterator_traits<octet_iterator>::difference_type
+    distance (octet_iterator first, octet_iterator last)
+    {
+        typename std::iterator_traits<octet_iterator>::difference_type dist;
+        for (dist = 0; first < last; ++dist)
+            utf8::next(first, last);
+        return dist;
+    }
+    template <typename u16bit_iterator, typename octet_iterator>
+    octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+    {
+        while (start != end) {
+            utfchar32_t cp = static_cast<utfchar32_t>(utf8::internal::mask16(*start++));
+            // Take care of surrogate pairs first
+            if (utf8::internal::is_lead_surrogate(cp)) {
+                if (start != end) {
+                    const utfchar32_t trail_surrogate = static_cast<utfchar32_t>(utf8::internal::mask16(*start++));
+                    if (utf8::internal::is_trail_surrogate(trail_surrogate))
+                        cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
+                    else
+                        throw invalid_utf16(static_cast<utfchar16_t>(trail_surrogate));
+                }
+                else
+                    throw invalid_utf16(static_cast<utfchar16_t>(cp));
+            }
+            // Lone trail surrogate
+            else if (utf8::internal::is_trail_surrogate(cp))
+                throw invalid_utf16(static_cast<utfchar16_t>(cp));
+            result = utf8::append(cp, result);
+        }
+        return result;
+    }
+    template <typename u16bit_iterator, typename octet_iterator>
+    u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
+    {
+        while (start < end) {
+            const utfchar32_t cp = utf8::next(start, end);
+            if (cp > 0xffff) { //make a surrogate pair
+                *result++ = static_cast<utfchar16_t>((cp >> 10)   + internal::LEAD_OFFSET);
+                *result++ = static_cast<utfchar16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+            }
+            else
+                *result++ = static_cast<utfchar16_t>(cp);
+        }
+        return result;
+    }
+    template <typename octet_iterator, typename u32bit_iterator>
+    octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+    {
+        while (start != end)
+            result = utf8::append(*(start++), result);
+        return result;
+    }
+    template <typename octet_iterator, typename u32bit_iterator>
+    u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
+    {
+        while (start < end)
+            (*result++) = utf8::next(start, end);
+        return result;
+    }
+    // The iterator class
+    template <typename octet_iterator>
+    class iterator {
+      octet_iterator it;
+      octet_iterator range_start;
+      octet_iterator range_end;
+      public:
+      typedef utfchar32_t value_type;
+      typedef utfchar32_t* pointer;
+      typedef utfchar32_t& reference;
+      typedef std::ptrdiff_t difference_type;
+      typedef std::bidirectional_iterator_tag iterator_category;
+      iterator () {}
+      explicit iterator (const octet_iterator& octet_it,
+                         const octet_iterator& rangestart,
+                         const octet_iterator& rangeend) :
+               it(octet_it), range_start(rangestart), range_end(rangeend)
+      {
+          if (it < range_start || it > range_end)
+              throw std::out_of_range("Invalid utf-8 iterator position");
+      }
+      // the default "big three" are OK
+      octet_iterator base () const { return it; }
+      utfchar32_t operator * () const
+      {
+          octet_iterator temp = it;
+          return utf8::next(temp, range_end);
+      }
+      bool operator == (const iterator& rhs) const
+      {
+          if (range_start != rhs.range_start || range_end != rhs.range_end)
+              throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
+          return (it == rhs.it);
+      }
+      bool operator != (const iterator& rhs) const
+      {
+          return !(operator == (rhs));
+      }
+      iterator& operator ++ ()
+      {
+          utf8::next(it, range_end);
+          return *this;
+      }
+      iterator operator ++ (int)
+      {
+          iterator temp = *this;
+          utf8::next(it, range_end);
+          return temp;
+      }
+      iterator& operator -- ()
+      {
+          utf8::prior(it, range_start);
+          return *this;
+      }
+      iterator operator -- (int)
+      {
+          iterator temp = *this;
+          utf8::prior(it, range_start);
+          return temp;
+      }
+    }; // class iterator
+} // namespace utf8
+#if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
+namespace utf8
+{
+    inline void append16(utfchar32_t cp, std::u16string& s)
+    {
+        append16(cp, std::back_inserter(s));
+    }
+    inline std::string utf16to8(const std::u16string& s)
+    {
+        std::string result;
+        utf16to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u16string utf8to16(const std::string& s)
+    {
+        std::u16string result;
+        utf8to16(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::string utf32to8(const std::u32string& s)
+    {
+        std::string result;
+        utf32to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u32string utf8to32(const std::string& s)
+    {
+        std::u32string result;
+        utf8to32(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+} // namespace utf8
+#endif // C++ 11 or later
+#if UTF_CPP_CPLUSPLUS >= 201703L // C++ 17 or later
+namespace utf8
+{
+    inline std::string utf16to8(std::u16string_view s)
+    {
+        std::string result;
+        utf16to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u16string utf8to16(std::string_view s)
+    {
+        std::u16string result;
+        utf8to16(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::string utf32to8(std::u32string_view s)
+    {
+        std::string result;
+        utf32to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u32string utf8to32(std::string_view s)
+    {
+        std::u32string result;
+        utf8to32(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::size_t find_invalid(std::string_view s)
+    {
+        std::string_view::const_iterator invalid = find_invalid(s.begin(), s.end());
+        return (invalid == s.end()) ? std::string_view::npos : static_cast<std::size_t>(invalid - s.begin());
+    }
+    inline bool is_valid(std::string_view s)
+    {
+        return is_valid(s.begin(), s.end());
+    }
+    inline std::string replace_invalid(std::string_view s, char32_t replacement)
+    {
+        std::string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
+        return result;
+    }
+    inline std::string replace_invalid(std::string_view s)
+    {
+        std::string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline bool starts_with_bom(std::string_view s)
+    {
+        return starts_with_bom(s.begin(), s.end());
+    }
+} // namespace utf8
+#endif // C++ 17 or later
+#if UTF_CPP_CPLUSPLUS >= 202002L // C++ 20 or later
+namespace utf8
+{
+    inline std::u8string utf16tou8(const std::u16string& s)
+    {
+        std::u8string result;
+        utf16to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u8string utf16tou8(std::u16string_view s)
+    {
+        std::u8string result;
+        utf16to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u16string utf8to16(const std::u8string& s)
+    {
+        std::u16string result;
+        utf8to16(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u16string utf8to16(const std::u8string_view& s)
+    {
+        std::u16string result;
+        utf8to16(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u8string utf32tou8(const std::u32string& s)
+    {
+        std::u8string result;
+        utf32to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u8string utf32tou8(const std::u32string_view& s)
+    {
+        std::u8string result;
+        utf32to8(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u32string utf8to32(const std::u8string& s)
+    {
+        std::u32string result;
+        utf8to32(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::u32string utf8to32(const std::u8string_view& s)
+    {
+        std::u32string result;
+        utf8to32(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline std::size_t find_invalid(const std::u8string& s)
+    {
+        std::u8string::const_iterator invalid = find_invalid(s.begin(), s.end());
+        return (invalid == s.end()) ? std::string_view::npos : static_cast<std::size_t>(invalid - s.begin());
+    }
+    inline bool is_valid(const std::u8string& s)
+    {
+        return is_valid(s.begin(), s.end());
+    }
+    inline std::u8string replace_invalid(const std::u8string& s, char32_t replacement)
+    {
+        std::u8string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
+        return result;
+    }
+    inline std::u8string replace_invalid(const std::u8string& s)
+    {
+        std::u8string result;
+        replace_invalid(s.begin(), s.end(), std::back_inserter(result));
+        return result;
+    }
+    inline bool starts_with_bom(const std::u8string& s)
+    {
+        return starts_with_bom(s.begin(), s.end());
+    }
+ 
+} // namespace utf8
+#endif // C++ 20 or later
+namespace utf8
+{
+    namespace unchecked
+    {
+        template <typename octet_iterator>
+        octet_iterator append(utfchar32_t cp, octet_iterator result)
+        {
+            return internal::append(cp, result);
+        }
+        template <typename word_iterator>
+        word_iterator append16(utfchar32_t cp, word_iterator result)
+        {
+            return internal::append16(cp, result);
+        }
+        template <typename octet_iterator, typename output_iterator>
+        output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, utfchar32_t replacement)
+        {
+            while (start != end) {
+                octet_iterator sequence_start = start;
+                internal::utf_error err_code = utf8::internal::validate_next(start, end);
+                switch (err_code) {
+                    case internal::UTF8_OK :
+                        for (octet_iterator it = sequence_start; it != start; ++it)
+                            *out++ = *it;
+                        break;
+                    case internal::NOT_ENOUGH_ROOM:
+                        out = utf8::unchecked::append(replacement, out);
+                        start = end;
+                        break;
+                    case internal::INVALID_LEAD:
+                        out = utf8::unchecked::append(replacement, out);
+                        ++start;
+                        break;
+                    case internal::INCOMPLETE_SEQUENCE:
+                    case internal::OVERLONG_SEQUENCE:
+                    case internal::INVALID_CODE_POINT:
+                        out = utf8::unchecked::append(replacement, out);
+                        ++start;
+                        // just one replacement mark for the sequence
+                        while (start != end && utf8::internal::is_trail(*start))
+                            ++start;
+                        break;
+                }
+            }
+            return out;
+        }
+        template <typename octet_iterator, typename output_iterator>
+        inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
+        {
+            static const utfchar32_t replacement_marker = static_cast<utfchar32_t>(utf8::internal::mask16(0xfffd));
+            return utf8::unchecked::replace_invalid(start, end, out, replacement_marker);
+        }
+        inline std::string replace_invalid(const std::string& s, utfchar32_t replacement)
+        {
+            std::string result;
+            replace_invalid(s.begin(), s.end(), std::back_inserter(result), replacement);
+            return result;
+        }
+        inline std::string replace_invalid(const std::string& s)
+        {
+            std::string result;
+            replace_invalid(s.begin(), s.end(), std::back_inserter(result));
+            return result;
+        }
+        template <typename octet_iterator>
+        utfchar32_t next(octet_iterator& it)
+        {
+            utfchar32_t cp = utf8::internal::mask8(*it);
+            switch (utf8::internal::sequence_length(it)) {
+                case 1:
+                    break;
+                case 2:
+                    ++it;
+                    cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
+                    break;
+                case 3:
+                    ++it;
+                    cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
+                    ++it;
+                    cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
+                    break;
+                case 4:
+                    ++it;
+                    cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
+                    ++it;
+                    cp = static_cast<utfchar32_t>(cp + ((utf8::internal::mask8(*it) << 6) & 0xfff));
+                    ++it;
+                    cp = static_cast<utfchar32_t>(cp + ((*it) & 0x3f));
+                    break;
+            }
+            ++it;
+            return cp;
+        }
+        template <typename octet_iterator>
+        utfchar32_t peek_next(octet_iterator it)
+        {
+            return utf8::unchecked::next(it);
+        }
+        template <typename word_iterator>
+        utfchar32_t next16(word_iterator& it)
+        {
+            utfchar32_t cp = utf8::internal::mask16(*it++);
+            if (utf8::internal::is_lead_surrogate(cp))
+                return (cp << 10) + *it++ + utf8::internal::SURROGATE_OFFSET;
+            return cp;
+        }
+        template <typename octet_iterator>
+        utfchar32_t prior(octet_iterator& it)
+        {
+            while (utf8::internal::is_trail(*(--it))) ;
+            octet_iterator temp = it;
+            return utf8::unchecked::next(temp);
+        }
+        template <typename octet_iterator, typename distance_type>
+        void advance(octet_iterator& it, distance_type n)
+        {
+            const distance_type zero(0);
+            if (n < zero) {
+                // backward
+                for (distance_type i = n; i < zero; ++i)
+                    utf8::unchecked::prior(it);
+            } else {
+                // forward
+                for (distance_type i = zero; i < n; ++i)
+                    utf8::unchecked::next(it);
+            }
+        }
+        template <typename octet_iterator>
+        typename std::iterator_traits<octet_iterator>::difference_type
+        distance(octet_iterator first, octet_iterator last)
+        {
+            typename std::iterator_traits<octet_iterator>::difference_type dist;
+            for (dist = 0; first < last; ++dist)
+                utf8::unchecked::next(first);
+            return dist;
+        }
+        template <typename u16bit_iterator, typename octet_iterator>
+        octet_iterator utf16to8(u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+        {
+            while (start != end) {
+                utfchar32_t cp = utf8::internal::mask16(*start++);
+                // Take care of surrogate pairs first
+                if (utf8::internal::is_lead_surrogate(cp)) {
+                    if (start == end)
+                        return result;
+                    utfchar32_t trail_surrogate = utf8::internal::mask16(*start++);
+                    cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
+                }
+                result = utf8::unchecked::append(cp, result);
+            }
+            return result;
+        }
+        template <typename u16bit_iterator, typename octet_iterator>
+        u16bit_iterator utf8to16(octet_iterator start, octet_iterator end, u16bit_iterator result)
+        {
+            while (start < end) {
+                utfchar32_t cp = utf8::unchecked::next(start);
+                if (cp > 0xffff) { //make a surrogate pair
+                    *result++ = static_cast<utfchar16_t>((cp >> 10)   + internal::LEAD_OFFSET);
+                    *result++ = static_cast<utfchar16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+                }
+                else
+                    *result++ = static_cast<utfchar16_t>(cp);
+            }
+            return result;
+        }
+        template <typename octet_iterator, typename u32bit_iterator>
+        octet_iterator utf32to8(u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+        {
+            while (start != end)
+                result = utf8::unchecked::append(*(start++), result);
+            return result;
+        }
+        template <typename octet_iterator, typename u32bit_iterator>
+        u32bit_iterator utf8to32(octet_iterator start, octet_iterator end, u32bit_iterator result)
+        {
+            while (start < end)
+                (*result++) = utf8::unchecked::next(start);
+            return result;
+        }
+        // The iterator class
+        template <typename octet_iterator>
+          class iterator {
+            octet_iterator it;
+            public:
+            typedef utfchar32_t value_type;
+            typedef utfchar32_t* pointer;
+            typedef utfchar32_t& reference;
+            typedef std::ptrdiff_t difference_type;
+            typedef std::bidirectional_iterator_tag iterator_category;
+            iterator () {}
+            explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
+            // the default "big three" are OK
+            octet_iterator base () const { return it; }
+            utfchar32_t operator * () const
+            {
+                octet_iterator temp = it;
+                return utf8::unchecked::next(temp);
+            }
+            bool operator == (const iterator& rhs) const
+            {
+                return (it == rhs.it);
+            }
+            bool operator != (const iterator& rhs) const
+            {
+                return !(operator == (rhs));
+            }
+            iterator& operator ++ ()
+            {
+                ::std::advance(it, utf8::internal::sequence_length(it));
+                return *this;
+            }
+            iterator operator ++ (int)
+            {
+                iterator temp = *this;
+                ::std::advance(it, utf8::internal::sequence_length(it));
+                return temp;
+            }
+            iterator& operator -- ()
+            {
+                utf8::unchecked::prior(it);
+                return *this;
+            }
+            iterator operator -- (int)
+            {
+                iterator temp = *this;
+                utf8::unchecked::prior(it);
+                return temp;
+            }
+          }; // class iterator
+    } // namespace utf8::unchecked
+} // namespace utf8
+#endif // header guard
diff --git a/src/yue.cpp b/src/yue.cpp
index fc57767..2722c55 100644
--- a/src/yue.cpp
+++ b/src/yue.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -30,6 +30,38 @@ using namespace std::chrono_literals;
 #include "ghc/fs_std.hpp"
 #include "linenoise.hpp"
+#if __has_include(<pthread.h>)
+#include <pthread.h>
+template<class R>
+std::future<R> async(const std::function<R()>& f) {
+        using Fn = std::packaged_task<R()>;
+        auto task = new Fn(f);
+        std::future<R> fut = task->get_future();
+        pthread_attr_t attr;
+        pthread_attr_init(&attr);
+        pthread_attr_setstacksize(&attr, 8 * 1024 * 1024);
+        pthread_t th;
+        pthread_create(&th, &attr,
+                [](void* p)->void* {
+                        std::unique_ptr<Fn> fn(static_cast<Fn*>(p));
+                        (*fn)();
+                        return nullptr;
+                },
+        task);
+        pthread_attr_destroy(&attr);
+        pthread_detach(th);
+        return fut;
+}
+#else
+template<class R>
+std::future<R> async(const std::function<R()>& f) {
+    // fallback: ignore stack size
+    return std::async(std::launch::async, f);
+}
+#endif
 #if not(defined YUE_NO_MACRO && defined YUE_COMPILER_ONLY)
 #define _DEFER(code, line) std::shared_ptr<void> _defer_##line(nullptr, [&](auto) { \
        code; \
@@ -40,18 +72,23 @@ extern "C" {
 #include "lua.h"
 #include "lualib.h"
 int luaopen_yue(lua_State* L);
+int luaopen_colibc_json(lua_State* L);
 } // extern "C"
 static void openlibs(void* state) {
        lua_State* L = static_cast<lua_State*>(state);
+        int top = lua_gettop(L);
+        DEFER(lua_settop(L, top));
        luaL_openlibs(L);
 #if LUA_VERSION_NUM > 501
        luaL_requiref(L, "yue", luaopen_yue, 0);
+        luaL_requiref(L, "cojson", luaopen_colibc_json, 0);
 #else
        lua_pushcfunction(L, luaopen_yue);
        lua_call(L, 0, 0);
+        lua_pushcfunction(L, luaopen_colibc_json);
+        lua_call(L, 0, 0);
 #endif
-        lua_pop(L, 1);
 }
 void pushYue(lua_State* L, std::string_view name) {
@@ -304,7 +341,7 @@ int main(int narg, const char** args) {
                "   --       Read from standard in, print to standard out\n"
                "            (Must be first and only argument)\n\n"
                "   --target=version  Specify the Lua version that codes will be generated to\n"
-                "                     (version can only be 5.1, 5.2, 5.3 or 5.4)\n"
+                "                     (version can only be 5.1 to 5.5)\n"
                "   --path=path_str   Append an extra Lua search path string to package.path\n\n"
                "   Execute without options to enter REPL, type symbol '$'\n"
                "   in a single line to start/stop multi-line mode\n"
@@ -699,7 +736,7 @@ int main(int narg, const char** args) {
                }
                std::list<std::future<std::string>> results;
                for (const auto& file : files) {
-                        auto task = std::async(std::launch::async, [=]() {
+                        auto task = async<std::string>([=]() {
 #ifndef YUE_COMPILER_ONLY
                                return compileFile(fs::absolute(file.first), config, fullWorkPath, fullTargetPath, minify, rewrite);
 #else
@@ -737,7 +774,7 @@ int main(int narg, const char** args) {
 #endif // YUE_NO_WATCHER
        std::list<std::future<std::tuple<int, std::string, std::string>>> results;
        for (const auto& file : files) {
-                auto task = std::async(std::launch::async, [=]() {
+                auto task = async<std::tuple<int, std::string, std::string>>([=]() {
                        std::ifstream input(file.first, std::ios::in);
                        if (input) {
                                std::string s(
diff --git a/src/yue_wasm.cpp b/src/yue_wasm.cpp
index 20f3794..abb291e 100644
--- a/src/yue_wasm.cpp
+++ b/src/yue_wasm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/src/yuescript/parser.cpp b/src/yuescript/parser.cpp
index f0ddd06..5910348 100644
--- a/src/yuescript/parser.cpp
+++ b/src/yuescript/parser.cpp
@@ -18,8 +18,33 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include "yuescript/parser.hpp"
+#ifndef YUE_UTF8_IMPL
+namespace CodeCvt {
+        std::u32string utf8to32(const std::string& str);
+        std::string utf32to8(const std::u32string& str);
+} // namespace CodeCvt
+#else
+#include "utf8cpp.h"
+namespace CodeCvt {
+        std::u32string utf8to32(const std::string& str) {
+                return utf8::utf8to32(str);
+        }
+        std::string utf32to8(const std::u32string& str) {
+                return utf8::utf32to8(str);
+        }
+} // namespace CodeCvt
+#endif // YUE_UTF8_IMPL
 namespace parserlib {
+input utf8_decode(const std::string& str) {
+        return CodeCvt::utf8to32(str);
+}
+std::string utf8_encode(const input& str) {
+        return CodeCvt::utf32to8(str);
+}
 // internal private class that manages access to the public classes' internals.
 class _private {
 public:
@@ -241,7 +266,7 @@ class _string : public _expr {
 public:
        // constructor from ansi string.
        _string(const char* s)
-                : m_string(Converter{}.from_bytes(s)) {
+                : m_string(utf8_decode(s)) {
        }
        // parse with whitespace
@@ -279,7 +304,7 @@ class _set : public _expr {
 public:
        // constructor from ansi string.
        _set(const char* s) {
-                auto str = Converter{}.from_bytes(s);
+                auto str = utf8_decode(s);
                for (auto ch : str) {
                        _add(ch);
                }
diff --git a/src/yuescript/parser.hpp b/src/yuescript/parser.hpp
index c544785..4742539 100644
--- a/src/yuescript/parser.hpp
+++ b/src/yuescript/parser.hpp
@@ -17,7 +17,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #pragma warning(disable : 4521)
 #endif
-#include <codecvt>
 #include <functional>
 #include <list>
 #include <locale>
@@ -27,9 +26,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 namespace parserlib {
 /// type of the parser's input.
-typedef std::basic_string<wchar_t> input;
+typedef std::basic_string<char32_t> input;
 typedef input::iterator input_it;
-typedef std::wstring_convert<std::codecvt_utf8_utf16<input::value_type>> Converter;
+input utf8_decode(const std::string& str);
+std::string utf8_encode(const input& str);
 class _private;
 class _expr;
diff --git a/src/yuescript/yue_ast.cpp b/src/yuescript/yue_ast.cpp
index fe6e726..cfd4cc6 100644
--- a/src/yuescript/yue_ast.cpp
+++ b/src/yuescript/yue_ast.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -30,7 +30,7 @@ std::string YueFormat::ind() const {
 }
 std::string YueFormat::convert(const ast_node* node) {
-        return converter.to_bytes(std::wstring(node->m_begin.m_it, node->m_end.m_it));
+        return utf8_encode({node->m_begin.m_it, node->m_end.m_it});
 }
 std::string YueFormat::toString(ast_node* node) {
@@ -82,6 +82,13 @@ std::string SelfClass_t::to_string(void*) const {
 std::string VarArg_t::to_string(void*) const {
        return "..."s;
 }
+std::string VarArgDef_t::to_string(void* ud) const {
+        if (name) {
+                return "..."s + name->to_string(ud);
+        } else {
+                return "..."s;
+        }
+}
 std::string Seperator_t::to_string(void*) const {
        return {};
 }
@@ -167,12 +174,11 @@ std::string ExistentialOp_t::to_string(void*) const {
 std::string TableAppendingOp_t::to_string(void*) const {
        return "[]"s;
 }
-std::string PlainItem_t::to_string(void *) const {
+std::string PlainItem_t::to_string(void*) const {
        return {};
 }
-std::string GlobalOp_t::to_string(void* ud) const {
+std::string GlobalOp_t::to_string(void*) const {
-        auto info = reinterpret_cast<YueFormat*>(ud);
+        return "*"s;
-        return info->convert(this);
 }
 std::string ExportDefault_t::to_string(void*) const {
        return "default"s;
@@ -188,22 +194,34 @@ std::string ConstValue_t::to_string(void* ud) const {
 std::string NotIn_t::to_string(void*) const {
        return {};
 }
+std::string Break_t::to_string(void*) const {
+        return "break"s;
+}
+std::string Continue_t::to_string(void*) const {
+        return "continue"s;
+}
 std::string BreakLoop_t::to_string(void* ud) const {
-        auto info = reinterpret_cast<YueFormat*>(ud);
+        if (value) {
-        return info->convert(this);
+                return type->to_string(ud) + ' ' + value->to_string(ud);
+        }
+        return type->to_string(ud);
 }
 std::string YueLineComment_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
        return "--"s + info->convert(this);
 }
-std::string MultilineCommentInner_t::to_string(void* ud) const {
+std::string YueMultilineComment_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
-        return info->convert(this);
+        return "--[["s + info->convert(this) + "]]"s;
 }
-std::string Variable_t::to_string(void* ud) const {
+std::string YueComment_t::to_string(void* ud) const {
-        return name->to_string(ud);
+        if (comment) {
+                return comment->to_string(ud);
+        } else {
+                return {};
+        }
 }
-std::string LabelName_t::to_string(void* ud) const {
+std::string Variable_t::to_string(void* ud) const {
        return name->to_string(ud);
 }
 std::string LuaKeyword_t::to_string(void* ud) const {
@@ -297,6 +315,20 @@ std::string ImportAs_t::to_string(void* ud) const {
        }
        return join(temp, " "s);
 }
+std::string ImportGlobal_t::to_string(void* ud) const {
+        str_list temp;
+        for (auto seg : segs.objects()) {
+                temp.emplace_back(seg->to_string(ud));
+        }
+        auto item = join(temp, "."s);
+        if (target) {
+                return item + " as "s + target->to_string(ud);
+        }
+        return item;
+}
+std::string ImportAllGlobal_t::to_string(void*) const {
+        return "global"s;
+}
 std::string Import_t::to_string(void* ud) const {
        if (ast_is<FromImport_t>(content)) {
                return content->to_string(ud);
@@ -324,6 +356,12 @@ std::string Backcall_t::to_string(void* ud) const {
        temp.emplace_back(value->to_string(ud));
        return join(temp, " "sv);
 }
+std::string SubBackcall_t::to_string(void* ud) const {
+        str_list temp;
+        temp.emplace_back(arrow->to_string(ud));
+        temp.emplace_back(value->to_string(ud));
+        return join(temp, " "sv);
+}
 std::string PipeBody_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
        str_list temp;
@@ -332,13 +370,6 @@ std::string PipeBody_t::to_string(void* ud) const {
        }
        return join(temp, "\n"sv);
 }
-std::string ExpListLow_t::to_string(void* ud) const {
-        str_list temp;
-        for (auto exp : exprs.objects()) {
-                temp.emplace_back(exp->to_string(ud));
-        }
-        return join(temp, "; "sv);
-}
 std::string ExpList_t::to_string(void* ud) const {
        str_list temp;
        for (auto exp : exprs.objects()) {
@@ -359,8 +390,8 @@ std::string With_t::to_string(void* ud) const {
        str_list temp{
                eop ? "with?"s : "with"s,
                valueList->to_string(ud)};
-        if (assigns) {
+        if (assign) {
-                temp.push_back(assigns->to_string(ud));
+                temp.push_back(':' + assign->to_string(ud));
        }
        if (body.is<Statement_t>()) {
                return join(temp, " "sv) + " do "s + body->to_string(ud);
@@ -406,6 +437,9 @@ std::string SwitchCase_t::to_string(void* ud) const {
 std::string Switch_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
        str_list temp{"switch "s + target->to_string(ud)};
+        if (assignment) {
+                temp.back().append(assignment->to_string(ud));
+        }
        info->pushScope();
        for (auto branch : branches.objects()) {
                temp.emplace_back(info->ind() + branch->to_string(ud));
@@ -449,41 +483,75 @@ std::string If_t::to_string(void* ud) const {
                temp.back() += " then"s;
        }
        ++it;
-        bool condition = true;
+        enum class NType {
+                Cond,
+                Stat,
+                Block
+        };
+        NType lastType = NType::Cond;
        for (; it != nodes.objects().end(); ++it) {
                auto node = *it;
                switch (node->get_id()) {
                        case id<IfCond_t>():
                                temp.emplace_back(info->ind() + "elseif "s + node->to_string(ud));
-                                condition = true;
+                                lastType = NType::Cond;
                                break;
                        case id<Statement_t>(): {
-                                if (condition) {
+                                switch (lastType) {
-                                        temp.back() += " then "s + node->to_string(ud);
+                                        case NType::Cond:
-                                } else {
+                                                temp.back() += " then "s + node->to_string(ud);
-                                        temp.emplace_back(info->ind() + "else "s + node->to_string(ud));
+                                                break;
+                                        case NType::Stat:
+                                                if (temp.back().back() == '\n') {
+                                                        temp.emplace_back(info->ind() + "else "s + node->to_string(ud));
+                                                } else {
+                                                        temp.back() += " else "s + node->to_string(ud);
+                                                }
+                                                break;
+                                        case NType::Block:
+                                                temp.emplace_back(info->ind() + "else "s + node->to_string(ud));
+                                                break;
                                }
-                                condition = false;
+                                lastType = NType::Stat;
                                break;
                        }
                        case id<Block_t>(): {
-                                if (condition) {
+                                switch (lastType) {
-                                        info->pushScope();
+                                        case NType::Cond: {
-                                        temp.emplace_back(node->to_string(ud));
+                                                info->pushScope();
-                                        if (temp.back().empty()) {
+                                                temp.emplace_back(node->to_string(ud));
-                                                temp.back() = info->ind() + "--"s;
+                                                if (temp.back().empty()) {
+                                                        temp.back() = info->ind() + "--"s;
+                                                }
+                                                info->popScope();
+                                                break;
+                                        }
+                                        case NType::Stat: {
+                                                if (temp.back().back() == '\n') {
+                                                        temp.emplace_back(info->ind() + "else"s);
+                                                } else {
+                                                        temp.back() += " else"s;
+                                                }
+                                                info->pushScope();
+                                                temp.emplace_back(node->to_string(ud));
+                                                if (temp.back().empty()) {
+                                                        temp.back() = info->ind() + "--"s;
+                                                }
+                                                info->popScope();
+                                                break;
                                        }
-                                        info->popScope();
+                                        case NType::Block: {
-                                } else {
+                                                temp.emplace_back(info->ind() + "else"s);
-                                        temp.emplace_back(info->ind() + "else"s);
+                                                info->pushScope();
-                                        info->pushScope();
+                                                temp.emplace_back(node->to_string(ud));
-                                        temp.emplace_back(node->to_string(ud));
+                                                if (temp.back().empty()) {
-                                        if (temp.back().empty()) {
+                                                        temp.back() = info->ind() + "--"s;
-                                                temp.back() = info->ind() + "--"s;
+                                                }
+                                                info->popScope();
+                                                break;
                                        }
-                                        info->popScope();
                                }
-                                condition = false;
+                                lastType = NType::Block;
                                break;
                        }
                }
@@ -511,10 +579,10 @@ std::string While_t::to_string(void* ud) const {
 }
 std::string Repeat_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
-        str_list temp;
+        if (body.is<Statement_t>()) {
-        if (body->content.is<Statement_t>()) {
+                return "repeat "s + body->to_string(ud) + " until "s + condition->to_string(ud);
-                temp.emplace_back("repeat "s + body->to_string(ud));
        } else {
+                str_list temp;
                temp.emplace_back("repeat"s);
                info->pushScope();
                temp.emplace_back(body->to_string(ud));
@@ -522,14 +590,14 @@ std::string Repeat_t::to_string(void* ud) const {
                        temp.back() = info->ind() + "--"s;
                }
                info->popScope();
+                temp.emplace_back(info->ind() + "until "s + condition->to_string(ud));
+                return join(temp, "\n"sv);
        }
-        temp.emplace_back(info->ind() + "until "s + condition->to_string(ud));
-        return join(temp, "\n"sv);
 }
 std::string ForStepValue_t::to_string(void* ud) const {
        return value->to_string(ud);
 }
-std::string For_t::to_string(void* ud) const {
+std::string ForNum_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
        auto line = "for "s + varName->to_string(ud) + " = "s + startValue->to_string(ud) + ", "s + stopValue->to_string(ud);
        if (stepValue) {
@@ -568,6 +636,9 @@ std::string ForEach_t::to_string(void* ud) const {
                return line + '\n' + block;
        }
 }
+std::string For_t::to_string(void* ud) const {
+        return forLoop->to_string(ud);
+}
 std::string Do_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
        if (body->content.is<Statement_t>()) {
@@ -596,10 +667,13 @@ std::string CatchBlock_t::to_string(void* ud) const {
 std::string Try_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
        str_list temp;
+        temp.emplace_back("try"s);
+        if (eop) {
+                temp.back() += eop->to_string(ud);
+        }
        if (func.is<Exp_t>()) {
-                temp.emplace_back("try "s + func->to_string(ud));
+                temp.back() += (" "s + func->to_string(ud));
        } else {
-                temp.emplace_back("try"s);
                info->pushScope();
                temp.emplace_back(func->to_string(ud));
                if (temp.back().empty()) {
@@ -716,7 +790,7 @@ static bool isInBlockExp(ast_node* node, bool last = false) {
        return false;
 }
 std::string Comprehension_t::to_string(void* ud) const {
-        if (items.size() != 2 || !ast_is<CompInner_t>(items.back())) {
+        if (items.size() != 2 || !ast_is<CompFor_t>(items.back())) {
                if (items.size() == 1) {
                        str_list temp;
                        for (const auto& item : items.objects()) {
@@ -783,14 +857,14 @@ std::string StarExp_t::to_string(void* ud) const {
 std::string CompForEach_t::to_string(void* ud) const {
        return "for "s + nameList->to_string(ud) + " in "s + loopValue->to_string(ud);
 }
-std::string CompFor_t::to_string(void* ud) const {
+std::string CompForNum_t::to_string(void* ud) const {
        auto line = "for "s + varName->to_string(ud) + " = "s + startValue->to_string(ud) + ", "s + stopValue->to_string(ud);
        if (stepValue) {
                line += stepValue->to_string(ud);
        }
        return line;
 }
-std::string CompInner_t::to_string(void* ud) const {
+std::string CompFor_t::to_string(void* ud) const {
        str_list temp;
        for (auto item : items.objects()) {
                if (ast_is<Exp_t>(item)) {
@@ -809,7 +883,7 @@ std::string Assign_t::to_string(void* ud) const {
        for (auto value : values.objects()) {
                temp.emplace_back(value->to_string(ud));
        }
-        return "= "s + join(temp, "; "sv);
+        return "= "s + join(temp, ", "sv);
 }
 std::string Update_t::to_string(void* ud) const {
        return op->to_string(ud) + "= "s + value->to_string(ud);
@@ -851,6 +925,12 @@ std::string Exp_t::to_string(void* ud) const {
        }
        return join(temp, " "sv);
 }
+std::string ReversedIndex_t::to_string(void* ud) const {
+        if (modifier) {
+                return "[# - "s + modifier->to_string(ud) + ']';
+        }
+        return "[#]"s;
+}
 std::string Callable_t::to_string(void* ud) const {
        return item->to_string(ud);
 }
@@ -937,6 +1017,51 @@ std::string DoubleString_t::to_string(void* ud) const {
        }
        return '"' + join(temp) + '"';
 }
+std::string YAMLIndent_t::to_string(void* ud) const {
+        auto info = reinterpret_cast<YueFormat*>(ud);
+        return info->convert(this);
+}
+std::string YAMLLineInner_t::to_string(void* ud) const {
+        auto info = reinterpret_cast<YueFormat*>(ud);
+        return info->convert(this);
+}
+std::string YAMLLineContent_t::to_string(void* ud) const {
+        if (content.is<Exp_t>()) {
+                return "#{"s + content->to_string(ud) + '}';
+        }
+        return content->to_string(ud);
+}
+std::string YAMLLine_t::to_string(void* ud) const {
+        str_list temp;
+        for (auto seg : segments.objects()) {
+                temp.emplace_back(seg->to_string(ud));
+        }
+        return join(temp);
+}
+std::string YAMLMultiline_t::to_string(void* ud) const {
+        auto info = reinterpret_cast<YueFormat*>(ud);
+        int currentIndent = info->indent;
+        str_list temp;
+        int lastIndent = -1;
+        for (auto line_ : lines.objects()) {
+                auto line = static_cast<YAMLLine_t*>(line_);
+                auto indent = line->indent->to_string(ud);
+                int ind = 0;
+                for (auto c : indent) {
+                        if (c == ' ') ind++;
+                        if (c == '\t') ind += 4;
+                }
+                if (lastIndent < ind) {
+                        info->pushScope();
+                } else if (lastIndent > ind) {
+                        info->popScope();
+                }
+                lastIndent = ind;
+                temp.emplace_back(indent + line->to_string(ud));
+        }
+        info->indent = currentIndent;
+        return "|\n" + join(temp, "\n"sv) + '\n';
+}
 std::string String_t::to_string(void* ud) const {
        return str->to_string(ud);
 }
@@ -1125,7 +1250,7 @@ std::string ClassDecl_t::to_string(void* ud) const {
        return line;
 }
 std::string GlobalValues_t::to_string(void* ud) const {
-        auto line = nameList->to_string(ud);
+        std::string line = nameList->to_string(ud);
        if (valueList) {
                if (valueList.is<TableBlock_t>()) {
                        line += " =\n"s + valueList->to_string(ud);
@@ -1136,7 +1261,7 @@ std::string GlobalValues_t::to_string(void* ud) const {
        return line;
 }
 std::string Global_t::to_string(void* ud) const {
-        return "global "s + item->to_string(ud);
+        return "global "s + (constAttrib ? "const "s : ""s) + item->to_string(ud);
 }
 std::string Export_t::to_string(void* ud) const {
        auto line = "export"s;
@@ -1235,6 +1360,9 @@ std::string FnArgDef_t::to_string(void* ud) const {
        if (op) {
                line += op->to_string(ud);
        }
+        if (label) {
+                line += '`' + label->to_string(ud);
+        }
        if (defaultValue) {
                line += " = "s + defaultValue->to_string(ud);
        }
@@ -1257,6 +1385,9 @@ std::string FnArgDefList_t::to_string(void* ud) const {
                }
                if (varArg) {
                        temp.emplace_back(info->ind() + varArg->to_string(ud));
+                        if (label) {
+                                temp.back().append('`' + label->to_string(ud));
+                        }
                }
                return join(temp, "\n"sv);
        } else {
@@ -1265,6 +1396,9 @@ std::string FnArgDefList_t::to_string(void* ud) const {
                }
                if (varArg) {
                        temp.emplace_back(varArg->to_string(ud));
+                        if (label) {
+                                temp.back().append('`' + label->to_string(ud));
+                        }
                }
                return join(temp, ", "sv);
        }
@@ -1475,37 +1609,17 @@ std::string StatementAppendix_t::to_string(void* ud) const {
        return item->to_string(ud);
 }
 std::string Statement_t::to_string(void* ud) const {
-        std::string line;
+        if (appendix) {
-        if (!comments.empty()) {
+                return content->to_string(ud) + ' ' + appendix->to_string(ud);
-                auto info = reinterpret_cast<YueFormat*>(ud);
-                str_list temp;
-                for (ast_node* comment : comments.objects()) {
-                        if (comment == comments.front()) {
-                                temp.push_back(comment->to_string(ud));
-                        } else {
-                                temp.push_back(info->ind() + comment->to_string(ud));
-                        }
-                }
-                if (appendix) {
-                        temp.push_back(info->ind() + content->to_string(ud) + ' ' + appendix->to_string(ud));
-                        return join(temp, "\n"sv);
-                } else {
-                        temp.push_back(info->ind() + content->to_string(ud));
-                        return join(temp, "\n"sv);
-                }
        } else {
-                if (appendix) {
+                return content->to_string(ud);
-                        return content->to_string(ud) + ' ' + appendix->to_string(ud);
-                } else {
-                        return content->to_string(ud);
-                }
        }
 }
 std::string StatementSep_t::to_string(void*) const {
        return {};
 }
-std::string YueMultilineComment_t::to_string(void* ud) const {
+std::string EmptyLine_t::to_string(void*) const {
-        return "--[["s + inner->to_string(ud) + "]]"s;
+        return {};
 }
 std::string ChainAssign_t::to_string(void* ud) const {
        str_list temp;
@@ -1520,14 +1634,22 @@ std::string Body_t::to_string(void* ud) const {
 std::string Block_t::to_string(void* ud) const {
        auto info = reinterpret_cast<YueFormat*>(ud);
        str_list temp;
-        for (auto stmt_ : statements.objects()) {
+        for (auto stmt_ : statementOrComments.objects()) {
-                auto stmt = static_cast<Statement_t*>(stmt_);
+                if (auto stmt = ast_cast<Statement_t>(stmt_)) {
-                if (stmt->content.is<PipeBody_t>()) {
+                        if (stmt->content.is<PipeBody_t>()) {
-                        info->pushScope();
+                                info->pushScope();
-                        temp.emplace_back(stmt->to_string(ud));
+                                temp.emplace_back(stmt->to_string(ud));
-                        info->popScope();
+                                info->popScope();
-                } else {
+                        } else {
-                        temp.emplace_back(info->ind() + stmt->to_string(ud));
+                                temp.emplace_back(info->ind() + stmt->to_string(ud));
+                        }
+                } else if (info->reserveComment) {
+                        if (auto comment = ast_cast<YueComment_t>(stmt_)) {
+                                temp.emplace_back(info->ind() + comment->to_string(ud));
+                        } else {
+                                auto empty = ast_to<EmptyLine_t>(stmt_);
+                                temp.emplace_back(empty->to_string(ud));
+                        }
                }
        }
        return join(temp, "\n"sv);
@@ -1546,3 +1668,4 @@ std::string File_t::to_string(void* ud) const {
 } // namespace yue
 } // namespace parserlib
diff --git a/src/yuescript/yue_ast.h b/src/yuescript/yue_ast.h
index 5e70645..5043526 100644
--- a/src/yuescript/yue_ast.h
+++ b/src/yuescript/yue_ast.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -50,7 +50,7 @@ std::string_view ast_name() { return {}; }
 // clang-format off
 namespace yue {
-class ExpListLow_t;
+class ExpList_t;
 class TableBlock_t;
 class SimpleTable_t;
 class TableLit_t;
@@ -68,7 +68,7 @@ class Statement_t;
 class Body_t;
 class AssignableNameList_t;
 class StarExp_t;
-class CompInner_t;
+class CompFor_t;
 class AssignableChain_t;
 class UnaryExp_t;
 class Parens_t;
@@ -103,11 +103,6 @@ AST_NODE(Variable)
        AST_MEMBER(Variable, &name)
 AST_END(Variable)
-AST_NODE(LabelName)
-        ast_ptr<true, UnicodeName_t> name;
-        AST_MEMBER(LabelName, &name)
-AST_END(LabelName)
 AST_NODE(LuaKeyword)
        ast_ptr<true, Name_t> name;
        AST_MEMBER(LuaKeyword, &name)
@@ -139,6 +134,11 @@ AST_NODE(KeyName)
        AST_MEMBER(KeyName, &name)
 AST_END(KeyName)
+AST_NODE(VarArgDef)
+        ast_ptr<false, Variable_t> name;
+        AST_MEMBER(VarArgDef, &name)
+AST_END(VarArgDef)
 AST_LEAF(VarArg)
 AST_END(VarArg)
@@ -156,7 +156,7 @@ AST_END(NameList)
 AST_NODE(LocalValues)
        ast_ptr<true, NameList_t> nameList;
-        ast_sel<false, TableBlock_t, ExpListLow_t> valueList;
+        ast_sel<false, TableBlock_t, ExpList_t> valueList;
        AST_MEMBER(LocalValues, &nameList, &valueList)
 AST_END(LocalValues)
@@ -233,18 +233,28 @@ AST_NODE(ImportAs)
        AST_MEMBER(ImportAs, &literal, &target)
 AST_END(ImportAs)
+AST_LEAF(ImportAllGlobal)
+AST_END(ImportAllGlobal)
+AST_NODE(ImportGlobal)
+        ast_ptr<true, Seperator_t> sep;
+        ast_list<true, UnicodeName_t> segs;
+        ast_ptr<false, Variable_t> target;
+        AST_MEMBER(ImportGlobal, &sep, &segs, &target)
+AST_END(ImportGlobal)
 AST_NODE(Import)
-        ast_sel<true, ImportAs_t, ImportFrom_t, FromImport_t> content;
+        ast_sel<true, ImportAs_t, ImportFrom_t, FromImport_t, ImportGlobal_t, ImportAllGlobal_t> content;
        AST_MEMBER(Import, &content)
 AST_END(Import)
 AST_NODE(Label)
-        ast_ptr<true, LabelName_t> label;
+        ast_ptr<true, UnicodeName_t> label;
        AST_MEMBER(Label, &label)
 AST_END(Label)
 AST_NODE(Goto)
-        ast_ptr<true, LabelName_t> label;
+        ast_ptr<true, UnicodeName_t> label;
        AST_MEMBER(Goto, &label)
 AST_END(Goto)
@@ -263,31 +273,27 @@ AST_NODE(Backcall)
        AST_MEMBER(Backcall, &argsDef, &arrow, &value)
 AST_END(Backcall)
-AST_NODE(ExpListLow)
-        ast_ptr<true, Seperator_t> sep;
-        ast_list<true, Exp_t> exprs;
-        AST_MEMBER(ExpListLow, &sep, &exprs)
-AST_END(ExpListLow)
 AST_NODE(ExpList)
        ast_ptr<true, Seperator_t> sep;
        ast_list<true, Exp_t> exprs;
        AST_MEMBER(ExpList, &sep, &exprs)
+        bool followStmtProcessed = false;
+        Statement_t* followStmt = nullptr;
 AST_END(ExpList)
 AST_NODE(Return)
        bool allowBlockMacroReturn = false;
        bool explicitReturn = true;
-        ast_sel<false, TableBlock_t, ExpListLow_t> valueList;
+        ast_sel<false, TableBlock_t, ExpList_t> valueList;
        AST_MEMBER(Return, &valueList)
 AST_END(Return)
 AST_NODE(With)
        ast_ptr<false, ExistentialOp_t> eop;
        ast_ptr<true, ExpList_t> valueList;
-        ast_ptr<false, Assign_t> assigns;
+        ast_ptr<false, Assign_t> assign;
        ast_sel<true, Block_t, Statement_t> body;
-        AST_MEMBER(With, &eop, &valueList, &assigns, &body)
+        AST_MEMBER(With, &eop, &valueList, &assign, &body)
 AST_END(With)
 AST_NODE(SwitchList)
@@ -302,20 +308,21 @@ AST_NODE(SwitchCase)
        AST_MEMBER(SwitchCase, &condition, &body)
 AST_END(SwitchCase)
+AST_NODE(Assignment)
+        ast_ptr<false, ExpList_t> expList;
+        ast_ptr<true, Assign_t> assign;
+        AST_MEMBER(Assignment, &expList, &assign)
+AST_END(Assignment)
 AST_NODE(Switch)
        ast_ptr<true, Exp_t> target;
+        ast_ptr<false, Assignment_t> assignment;
        ast_ptr<true, Seperator_t> sep;
        ast_list<true, SwitchCase_t> branches;
        ast_sel<false, Block_t, Statement_t> lastBranch;
-        AST_MEMBER(Switch, &target, &sep, &branches, &lastBranch)
+        AST_MEMBER(Switch, &target, &assignment, &sep, &branches, &lastBranch)
 AST_END(Switch)
-AST_NODE(Assignment)
-        ast_ptr<false, ExpList_t> expList;
-        ast_ptr<true, Assign_t> assign;
-        AST_MEMBER(Assignment, &expList, &assign)
-AST_END(Assignment)
 AST_NODE(IfCond)
        ast_ptr<true, Exp_t> condition;
        ast_ptr<false, Assignment_t> assignment;
@@ -343,7 +350,7 @@ AST_NODE(While)
 AST_END(While)
 AST_NODE(Repeat)
-        ast_ptr<true, Body_t> body;
+        ast_sel<true, Block_t, Statement_t> body;
        ast_ptr<true, Exp_t> condition;
        AST_MEMBER(Repeat, &body, &condition)
 AST_END(Repeat)
@@ -353,14 +360,14 @@ AST_NODE(ForStepValue)
        AST_MEMBER(ForStepValue, &value)
 AST_END(ForStepValue)
-AST_NODE(For)
+AST_NODE(ForNum)
        ast_ptr<true, Variable_t> varName;
        ast_ptr<true, Exp_t> startValue;
        ast_ptr<true, Exp_t> stopValue;
        ast_ptr<false, ForStepValue_t> stepValue;
        ast_sel<true, Block_t, Statement_t> body;
-        AST_MEMBER(For, &varName, &startValue, &stopValue, &stepValue, &body)
+        AST_MEMBER(ForNum, &varName, &startValue, &stopValue, &stepValue, &body)
-AST_END(For)
+AST_END(ForNum)
 AST_NODE(ForEach)
        ast_ptr<true, AssignableNameList_t> nameList;
@@ -369,6 +376,11 @@ AST_NODE(ForEach)
        AST_MEMBER(ForEach, &nameList, &loopValue, &body)
 AST_END(ForEach)
+AST_NODE(For)
+        ast_sel<true, ForEach_t, ForNum_t> forLoop;
+        AST_MEMBER(For, &forLoop)
+AST_END(For)
 AST_NODE(Do)
        ast_ptr<true, Body_t> body;
        AST_MEMBER(Do, &body)
@@ -381,14 +393,15 @@ AST_NODE(CatchBlock)
 AST_END(CatchBlock)
 AST_NODE(Try)
+        ast_ptr<false, ExistentialOp_t> eop;
        ast_sel<true, Block_t, Exp_t> func;
        ast_ptr<false, CatchBlock_t> catchBlock;
-        AST_MEMBER(Try, &func, &catchBlock)
+        AST_MEMBER(Try, &eop, &func, &catchBlock)
 AST_END(Try)
 AST_NODE(Comprehension)
        ast_ptr<true, Seperator_t> sep;
-        ast_sel_list<false, NormalDef_t, SpreadListExp_t, CompInner_t,
+        ast_sel_list<false, NormalDef_t, SpreadListExp_t, CompFor_t,
                /*non-syntax-rule*/ Statement_t> items;
        AST_MEMBER(Comprehension, &sep, &items)
 AST_END(Comprehension)
@@ -401,7 +414,7 @@ AST_END(CompValue)
 AST_NODE(TblComprehension)
        ast_ptr<true, Exp_t> key;
        ast_ptr<false, CompValue_t> value;
-        ast_ptr<true, CompInner_t> forLoop;
+        ast_ptr<true, CompFor_t> forLoop;
        AST_MEMBER(TblComprehension, &key, &value, &forLoop)
 AST_END(TblComprehension)
@@ -416,23 +429,23 @@ AST_NODE(CompForEach)
        AST_MEMBER(CompForEach, &nameList, &loopValue)
 AST_END(CompForEach)
-AST_NODE(CompFor)
+AST_NODE(CompForNum)
        ast_ptr<true, Variable_t> varName;
        ast_ptr<true, Exp_t> startValue;
        ast_ptr<true, Exp_t> stopValue;
        ast_ptr<false, ForStepValue_t> stepValue;
-        AST_MEMBER(CompFor, &varName, &startValue, &stopValue, &stepValue)
+        AST_MEMBER(CompForNum, &varName, &startValue, &stopValue, &stepValue)
-AST_END(CompFor)
+AST_END(CompForNum)
-AST_NODE(CompInner)
+AST_NODE(CompFor)
        ast_ptr<true, Seperator_t> sep;
-        ast_sel_list<true, CompFor_t, CompForEach_t, Exp_t> items;
+        ast_sel_list<true, CompForNum_t, CompForEach_t, Exp_t> items;
-        AST_MEMBER(CompInner, &sep, &items)
+        AST_MEMBER(CompFor, &sep, &items)
-AST_END(CompInner)
+AST_END(CompFor)
 AST_NODE(Assign)
        ast_ptr<true, Seperator_t> sep;
-        ast_sel_list<true, With_t, If_t, Switch_t, TableBlock_t, Exp_t> values;
+        ast_sel_list<true, With_t, If_t, Switch_t, TableBlock_t, Exp_t, SpreadListExp_t> values;
        AST_MEMBER(Assign, &sep, &values)
 AST_END(Assign)
@@ -547,8 +560,8 @@ AST_NODE(SimpleValue)
        ast_sel<true,
                TableLit_t, ConstValue_t,
                If_t, Switch_t, With_t, ClassDecl_t,
-                ForEach_t, For_t, While_t, Do_t, Try_t,
+                For_t, While_t, Repeat_t,
-                UnaryValue_t,
+                Do_t, Try_t, UnaryValue_t,
                TblComprehension_t, Comprehension_t,
                FunLit_t, Num_t, VarArg_t> value;
        AST_MEMBER(SimpleValue, &value)
@@ -587,8 +600,31 @@ AST_NODE(DoubleString)
        AST_MEMBER(DoubleString, &sep, &segments)
 AST_END(DoubleString)
+AST_LEAF(YAMLIndent)
+AST_END(YAMLIndent)
+AST_LEAF(YAMLLineInner)
+AST_END(YAMLLineInner)
+AST_NODE(YAMLLineContent)
+        ast_sel<true, YAMLLineInner_t, Exp_t> content;
+        AST_MEMBER(YAMLLineContent, &content)
+AST_END(YAMLLineContent)
+AST_NODE(YAMLLine)
+        ast_ptr<true, YAMLIndent_t> indent;
+        ast_list<true, YAMLLineContent_t> segments;
+        AST_MEMBER(YAMLLine, &indent, &segments)
+AST_END(YAMLLine)
+AST_NODE(YAMLMultiline)
+        ast_ptr<true, Seperator_t> sep;
+        ast_list<true, YAMLLine_t> lines;
+        AST_MEMBER(YAMLMultiline, &sep, &lines)
+AST_END(YAMLMultiline)
 AST_NODE(String)
-        ast_sel<true, DoubleString_t, SingleString_t, LuaString_t> str;
+        ast_sel<true, DoubleString_t, SingleString_t, LuaString_t, YAMLMultiline_t> str;
        AST_MEMBER(String, &str)
 AST_END(String)
@@ -639,9 +675,14 @@ AST_END(TableAppendingOp)
 AST_LEAF(PlainItem)
 AST_END(PlainItem)
+AST_NODE(ReversedIndex)
+        ast_ptr<false, Exp_t> modifier;
+        AST_MEMBER(ReversedIndex, &modifier)
+AST_END(ReversedIndex)
 AST_NODE(ChainValue)
        ast_ptr<true, Seperator_t> sep;
-        ast_sel_list<true, Callable_t, Invoke_t, DotChainItem_t, ColonChainItem_t, Slice_t, Exp_t, String_t, InvokeArgs_t, ExistentialOp_t, TableAppendingOp_t,
+        ast_sel_list<true, Callable_t, Invoke_t, DotChainItem_t, ColonChainItem_t, Slice_t, Exp_t, String_t, InvokeArgs_t, ExistentialOp_t, TableAppendingOp_t, ReversedIndex_t,
                /*non-syntax-rule*/ PlainItem_t> items;
        AST_MEMBER(ChainValue, &sep, &items)
 AST_END(ChainValue)
@@ -717,7 +758,7 @@ AST_END(ClassDecl)
 AST_NODE(GlobalValues)
        ast_ptr<true, NameList_t> nameList;
-        ast_sel<false, TableBlock_t, ExpListLow_t> valueList;
+        ast_sel<false, TableBlock_t, ExpList_t> valueList;
        AST_MEMBER(GlobalValues, &nameList, &valueList)
 AST_END(GlobalValues)
@@ -725,8 +766,9 @@ AST_LEAF(GlobalOp)
 AST_END(GlobalOp)
 AST_NODE(Global)
+        ast_ptr<false, ConstAttrib_t> constAttrib;
        ast_sel<true, ClassDecl_t, GlobalOp_t, GlobalValues_t> item;
-        AST_MEMBER(Global, &item)
+        AST_MEMBER(Global, &constAttrib, &item)
 AST_END(Global)
 AST_LEAF(ExportDefault)
@@ -740,17 +782,19 @@ AST_NODE(Export)
 AST_END(Export)
 AST_NODE(FnArgDef)
-        ast_sel<true, Variable_t, SelfItem_t> name;
+        ast_sel<true, Variable_t, SelfItem_t, SimpleTable_t, TableLit_t> name;
        ast_ptr<false, ExistentialOp_t> op;
+        ast_ptr<false, Name_t> label;
        ast_ptr<false, Exp_t> defaultValue;
-        AST_MEMBER(FnArgDef, &name, &op, &defaultValue)
+        AST_MEMBER(FnArgDef, &name, &op, &label, &defaultValue)
 AST_END(FnArgDef)
 AST_NODE(FnArgDefList)
        ast_ptr<true, Seperator_t> sep;
        ast_list<false, FnArgDef_t> definitions;
-        ast_ptr<false, VarArg_t> varArg;
+        ast_ptr<false, VarArgDef_t> varArg;
-        AST_MEMBER(FnArgDefList, &sep, &definitions, &varArg)
+        ast_ptr<false, Name_t> label;
+        AST_MEMBER(FnArgDefList, &sep, &definitions, &varArg, &label)
 AST_END(FnArgDefList)
 AST_NODE(OuterVarShadow)
@@ -769,7 +813,7 @@ AST_END(FnArrow)
 AST_NODE(FunLit)
        ast_ptr<false, FnArgsDef_t> argsDef;
-        ast_sel<false, ExpListLow_t, DefaultValue_t> defaultReturn;
+        ast_sel<false, ExpList_t, DefaultValue_t> defaultReturn;
        ast_ptr<true, FnArrow_t> arrow;
        ast_ptr<false, Body_t> body;
        bool noRecursion = false;
@@ -806,7 +850,7 @@ AST_NODE(Macro)
 AST_END(Macro)
 AST_NODE(NameOrDestructure)
-        ast_sel<true, Variable_t, TableLit_t, Comprehension_t> item;
+        ast_sel<true, Variable_t, SimpleTable_t, TableLit_t, Comprehension_t> item;
        AST_MEMBER(NameOrDestructure, &item)
 AST_END(NameOrDestructure)
@@ -838,9 +882,15 @@ AST_NODE(UnaryExp)
        AST_MEMBER(UnaryExp, &ops, &expos, &inExp)
 AST_END(UnaryExp)
+AST_NODE(SubBackcall)
+        ast_ptr<true, FnArrowBack_t> arrow;
+        ast_ptr<true, ChainValue_t> value;
+        AST_MEMBER(SubBackcall, &arrow, &value)
+AST_END(SubBackcall)
 AST_NODE(ExpListAssign)
        ast_ptr<true, ExpList_t> expList;
-        ast_sel<false, Update_t, Assign_t> action;
+        ast_sel<false, Update_t, Assign_t, SubBackcall_t> action;
        AST_MEMBER(ExpListAssign, &expList, &action)
 AST_END(ExpListAssign)
@@ -856,7 +906,17 @@ AST_NODE(WhileLine)
        AST_MEMBER(WhileLine, &type, &condition)
 AST_END(WhileLine)
-AST_LEAF(BreakLoop)
+AST_LEAF(Break)
+AST_END(Break)
+AST_LEAF(Continue)
+AST_END(Continue)
+AST_NODE(BreakLoop)
+        ast_sel<true, Break_t, Continue_t> type;
+        ast_ptr<false, Exp_t> value;
+        AST_MEMBER(BreakLoop, &type, &value)
+        std::string varBWV;
 AST_END(BreakLoop)
 AST_NODE(PipeBody)
@@ -866,7 +926,7 @@ AST_NODE(PipeBody)
 AST_END(PipeBody)
 AST_NODE(StatementAppendix)
-        ast_sel<true, IfLine_t, WhileLine_t, CompInner_t> item;
+        ast_sel<true, IfLine_t, WhileLine_t, CompFor_t> item;
        AST_MEMBER(StatementAppendix, &item)
 AST_END(StatementAppendix)
@@ -876,14 +936,17 @@ AST_END(StatementSep)
 AST_LEAF(YueLineComment)
 AST_END(YueLineComment)
-AST_LEAF(MultilineCommentInner)
+AST_LEAF(YueMultilineComment)
-AST_END(MultilineCommentInner)
-AST_NODE(YueMultilineComment)
-        ast_ptr<true, MultilineCommentInner_t> inner;
-        AST_MEMBER(YueMultilineComment, &inner)
 AST_END(YueMultilineComment)
+AST_NODE(YueComment)
+        ast_sel<true, YueLineComment_t, YueMultilineComment_t> comment;
+        AST_MEMBER(YueComment, &comment)
+AST_END(YueComment)
+AST_LEAF(EmptyLine)
+AST_END(EmptyLine)
 AST_NODE(ChainAssign)
        ast_ptr<true, Seperator_t> sep;
        ast_list<true, Exp_t> exprs;
@@ -892,16 +955,14 @@ AST_NODE(ChainAssign)
 AST_END(ChainAssign)
 AST_NODE(Statement)
-        ast_ptr<true, Seperator_t> sep;
-        ast_sel_list<false, YueLineComment_t, YueMultilineComment_t> comments;
        ast_sel<true,
-                Import_t, While_t, Repeat_t, For_t, ForEach_t,
+                Import_t, While_t, Repeat_t, For_t,
                Return_t, Local_t, Global_t, Export_t, Macro_t, MacroInPlace_t,
                BreakLoop_t, Label_t, Goto_t, ShortTabAppending_t,
                Backcall_t, LocalAttrib_t, PipeBody_t, ExpListAssign_t, ChainAssign_t
        > content;
        ast_ptr<false, StatementAppendix_t> appendix;
-        AST_MEMBER(Statement, &sep, &comments, &content, &appendix)
+        AST_MEMBER(Statement, &content, &appendix)
 AST_END(Statement)
 AST_NODE(Body)
@@ -911,8 +972,8 @@ AST_END(Body)
 AST_NODE(Block)
        ast_ptr<true, Seperator_t> sep;
-        ast_list<false, Statement_t> statements;
+        ast_sel_list<false, Statement_t, YueComment_t, EmptyLine_t> statementOrComments;
-        AST_MEMBER(Block, &sep, &statements)
+        AST_MEMBER(Block, &sep, &statementOrComments)
 AST_END(Block)
 AST_NODE(BlockEnd)
@@ -931,9 +992,9 @@ struct YueFormat {
        int indent = 0;
        bool spaceOverTab = false;
        int tabSpaces = 4;
+        bool reserveComment = true;
        std::string toString(ast_node* node);
-        Converter converter{};
        void pushScope();
        void popScope();
        std::string convert(const ast_node* node);
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 590c502..f9b4f18 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -78,7 +78,7 @@ static std::unordered_set<std::string> Metamethods = {
        "close"s // Lua 5.4
 };
-const std::string_view version = "0.27.5"sv;
+const std::string_view version = "0.32.1"sv;
 const std::string_view extension = "yue"sv;
 class CompileError : public std::logic_error {
@@ -165,12 +165,12 @@ public:
                double compileTime = 0.0;
                if (config.profiling) {
                        auto start = std::chrono::high_resolution_clock::now();
-                        _info = _parser.parse<File_t>(codes);
+                        _info = _parser.parse<File_t>(codes, config.lax);
                        auto stop = std::chrono::high_resolution_clock::now();
                        std::chrono::duration<double> diff = stop - start;
                        parseTime = diff.count();
                } else {
-                        _info = _parser.parse<File_t>(codes);
+                        _info = _parser.parse<File_t>(codes, config.lax);
                }
                std::unique_ptr<GlobalVars> globals;
                std::unique_ptr<Options> options;
@@ -182,8 +182,9 @@ public:
                        try {
                                auto block = _info.node.to<File_t>()->block.get();
                                if (_info.exportMacro) {
-                                        for (auto stmt_ : block->statements.objects()) {
+                                        for (auto stmt_ : block->statementOrComments.objects()) {
-                                                auto stmt = static_cast<Statement_t*>(stmt_);
+                                                auto stmt = ast_cast<Statement_t>(stmt_);
+                                                if (!stmt) continue;
                                                switch (stmt->content->get_id()) {
                                                        case id<MacroInPlace_t>():
                                                        case id<Macro_t>():
@@ -258,8 +259,8 @@ public:
                                if (config.lintGlobalVariable) {
                                        globals = std::make_unique<GlobalVars>();
                                        for (const auto& var : _globals) {
-                                                auto [name, line, col, accessType] = var.second;
+                                                auto [name, line, col, accessType, defined] = var.second;
-                                                globals->push_back({name, line + _config.lineOffset, col, accessType});
+                                                globals->push_back({name, line + _config.lineOffset, col, accessType, defined});
                                        }
                                        std::sort(globals->begin(), globals->end(), [](const GlobalVar& varA, const GlobalVar& varB) {
                                                if (varA.line < varB.line) {
@@ -396,7 +397,7 @@ private:
        };
        std::stack<ContinueVar> _continueVars;
        std::list<std::unique_ptr<input>> _codeCache;
-        std::unordered_map<std::string, std::tuple<std::string, int, int, AccessType>> _globals;
+        std::unordered_map<std::string, std::tuple<std::string, int, int, AccessType, bool>> _globals;
        std::ostringstream _buf;
        std::ostringstream _joinBuf;
        const std::string _newLine = "\n";
@@ -429,8 +430,18 @@ private:
        };
        enum class VarType {
                Local = 0,
-                Const = 1,
+                LocalConst = 1,
-                Global = 2
+                Global = 2,
+                GlobalConst = 3
+        };
+        struct Scope;
+        struct ImportedGlobal {
+                std::string* globalCodeLine = nullptr;
+                std::unordered_map<std::string, VarType>* vars = nullptr;
+                std::string indent;
+                std::string nl;
+                std::unordered_set<std::string_view> globals;
+                str_list globalList;
        };
        struct Scope {
                GlobalMode mode = GlobalMode::None;
@@ -440,8 +451,10 @@ private:
 #endif
                std::unique_ptr<std::unordered_map<std::string, VarType>> vars;
                std::unique_ptr<std::unordered_set<std::string>> allows;
+                std::unique_ptr<ImportedGlobal> importedGlobal;
        };
        std::list<Scope> _scopes;
+        ImportedGlobal* _importedGlobal = nullptr;
        static const std::string Empty;
        enum class MemType {
@@ -558,7 +571,7 @@ private:
                for (auto it = _scopes.rbegin(); it != _scopes.rend(); ++it) {
                        auto vars = it->vars.get();
                        auto vit = vars->find(name);
-                        if (vit != vars->end() && vit->second != VarType::Global) {
+                        if (vit != vars->end() && (vit->second == VarType::Local || vit->second == VarType::LocalConst)) {
                                local = true;
                                break;
                        }
@@ -571,7 +584,7 @@ private:
                for (auto it = _scopes.rbegin(); it != _scopes.rend(); ++it) {
                        auto vars = it->vars.get();
                        auto vit = vars->find(name);
-                        if (vit != vars->end() && vit->second == VarType::Global) {
+                        if (vit != vars->end() && (vit->second == VarType::Global || vit->second == VarType::GlobalConst)) {
                                global = true;
                                break;
                        }
@@ -593,7 +606,7 @@ private:
                        auto vars = it->vars.get();
                        auto vit = vars->find(name);
                        if (vit != vars->end()) {
-                                isConst = (vit->second == VarType::Const);
+                                isConst = (vit->second == VarType::LocalConst || vit->second == VarType::GlobalConst);
                                break;
                        }
                        if (checkShadowScopeOnly && it->allows) break;
@@ -874,9 +887,13 @@ private:
                return false;
        }
-        void markVarConst(const std::string& name) {
+        bool isListComp(Comprehension_t* comp) const {
+                return comp->items.size() == 2 && ast_is<CompFor_t>(comp->items.back());
+        }
+        void markVarLocalConst(const std::string& name) {
                auto& scope = _scopes.back();
-                scope.vars->insert_or_assign(name, VarType::Const);
+                scope.vars->insert_or_assign(name, VarType::LocalConst);
        }
        void markVarShadowed() {
@@ -895,6 +912,11 @@ private:
                scope.vars->insert_or_assign(name, VarType::Global);
        }
+        void markVarGlobalConst(const std::string& name) {
+                auto& scope = _scopes.back();
+                scope.vars->insert_or_assign(name, VarType::GlobalConst);
+        }
        void addToAllowList(const std::string& name) {
                auto& scope = _scopes.back();
                scope.allows->insert(name);
@@ -961,7 +983,7 @@ private:
                }
        }
-        const std::string nll(ast_node* node) const {
+        const std::string nl(ast_node* node) const {
                if (_config.reserveLineNumber) {
                        return " -- "s + std::to_string(node->m_begin.m_line + _config.lineOffset) + _newLine;
                } else {
@@ -969,14 +991,6 @@ private:
                }
        }
-        const std::string nlr(ast_node* node) const {
-                if (_config.reserveLineNumber) {
-                        return " -- "s + std::to_string(node->m_end.m_line + _config.lineOffset) + _newLine;
-                } else {
-                        return _newLine;
-                }
-        }
        void incIndentOffset() {
                _indentOffset++;
        }
@@ -1043,13 +1057,6 @@ private:
                                }
                                break;
                        }
-                        case id<ExpListLow_t>(): {
-                                auto expList = static_cast<ExpListLow_t*>(item);
-                                if (expList->exprs.size() == 1) {
-                                        exp = static_cast<Exp_t*>(expList->exprs.front());
-                                }
-                                break;
-                        }
                        case id<SwitchList_t>(): {
                                auto expList = static_cast<SwitchList_t*>(item);
                                if (expList->exprs.size() == 1) {
@@ -1078,12 +1085,12 @@ private:
                return nullptr;
        }
-        Value_t* singleValueFrom(ast_node* item) const {
+        Value_t* singleValueFrom(ast_node* item, bool forceUnparened = false) const {
                if (auto unary = singleUnaryExpFrom(item)) {
                        if (unary->ops.empty()) {
                                Value_t* value = static_cast<Value_t*>(unary->expos.back());
                                if (auto chain = ast_cast<ChainValue_t>(value->item); chain && chain->items.size() == 1) {
-                                        if (auto parens = chain->get_by_path<Callable_t, Parens_t>(); parens && parens->extra) {
+                                        if (auto parens = chain->get_by_path<Callable_t, Parens_t>(); parens && (forceUnparened || parens->extra)) {
                                                if (auto insideValue = singleValueFrom(parens->expr)) {
                                                        return insideValue;
                                                }
@@ -1143,6 +1150,22 @@ private:
                return exp;
        }
+        ast_ptr<false, Return_t> newReturn(Exp_t* value) {
+                auto returnNode = value->new_ptr<Return_t>();
+                returnNode->explicitReturn = false;
+                auto expList = value->new_ptr<ExpList_t>();
+                expList->exprs.push_back(value);
+                returnNode->valueList.set(expList);
+                return returnNode;
+        }
+        ast_ptr<false, Return_t> newReturn(ExpList_t* valueList) {
+                auto returnNode = valueList->new_ptr<Return_t>();
+                returnNode->explicitReturn = false;
+                returnNode->valueList.set(valueList);
+                return returnNode;
+        }
        SimpleValue_t* simpleSingleValueFrom(ast_node* node) const {
                auto value = singleValueFrom(node);
                if (value && value->item.is<SimpleValue_t>()) {
@@ -1163,14 +1186,22 @@ private:
                return nullptr;
        }
-        Statement_t* lastStatementFrom(const node_container& stmts) const {
+        Statement_t* lastStatementFrom(const node_container& statementOrComments) const {
-                if (!stmts.empty()) {
+                if (!statementOrComments.empty()) {
-                        auto it = stmts.end();
+                        for (auto it = statementOrComments.rbegin(); it != statementOrComments.rend(); ++it) {
-                        --it;
+                                if (auto stmt = ast_cast<Statement_t>(*it)) {
-                        while (!static_cast<Statement_t*>(*it)->content && it != stmts.begin()) {
+                                        return stmt;
-                                --it;
+                                }
+                        }
+                }
+                return nullptr;
+        }
+        Statement_t* firstStatementFrom(Block_t* block) const {
+                for (auto stmt_ : block->statementOrComments.objects()) {
+                        if (auto stmt = ast_cast<Statement_t>(stmt_)) {
+                                return stmt;
                        }
-                        return static_cast<Statement_t*>(*it);
                }
                return nullptr;
        }
@@ -1179,16 +1210,26 @@ private:
                if (auto stmt = body->content.as<Statement_t>()) {
                        return stmt;
                } else {
-                        const auto& stmts = body->content.to<Block_t>()->statements.objects();
+                        const auto& stmts = body->content.to<Block_t>()->statementOrComments.objects();
                        return lastStatementFrom(stmts);
                }
        }
        Statement_t* lastStatementFrom(Block_t* block) const {
-                const auto& stmts = block->statements.objects();
+                const auto& stmts = block->statementOrComments.objects();
                return lastStatementFrom(stmts);
        }
+        int countStatementFrom(Block_t* block) const {
+                int count = 0;
+                for (auto stmt_ : block->statementOrComments.objects()) {
+                        if (ast_is<Statement_t>(stmt_)) {
+                                count++;
+                        }
+                }
+                return count;
+        }
        Exp_t* lastExpFromAssign(ast_node* action) {
                switch (action->get_id()) {
                        case id<Update_t>(): {
@@ -1232,7 +1273,7 @@ private:
                        }
                        case id<Local_t>(): {
                                if (auto localValues = static_cast<Local_t*>(stmt->content.get())->item.as<LocalValues_t>()) {
-                                        if (auto expList = localValues->valueList.as<ExpListLow_t>()) {
+                                        if (auto expList = localValues->valueList.as<ExpList_t>()) {
                                                return static_cast<Exp_t*>(expList->exprs.back());
                                        }
                                }
@@ -1240,7 +1281,7 @@ private:
                        }
                        case id<Global_t>(): {
                                if (auto globalValues = static_cast<Global_t*>(stmt->content.get())->item.as<GlobalValues_t>()) {
-                                        if (auto expList = globalValues->valueList.as<ExpListLow_t>()) {
+                                        if (auto expList = globalValues->valueList.as<ExpList_t>()) {
                                                return static_cast<Exp_t*>(expList->exprs.back());
                                        }
                                }
@@ -1252,7 +1293,7 @@ private:
        template <class T>
        ast_ptr<false, T> toAst(std::string_view codes, ast_node* parent) {
-                auto res = _parser.parse<T>(std::string(codes));
+                auto res = _parser.parse<T>(std::string(codes), false);
                if (res.error) {
                        throw CompileError(res.error.value().msg, parent);
                }
@@ -1275,6 +1316,8 @@ private:
                Common,
                EndWithColon,
                EndWithEOP,
+                EndWithSlice,
+                HasRIndex,
                HasEOP,
                HasKeyword,
                HasUnicode,
@@ -1293,6 +1336,9 @@ private:
                if (ast_is<ExistentialOp_t>(chainValue->items.back())) {
                        return ChainType::EndWithEOP;
                }
+                if (ast_is<Slice_t>(chainValue->items.back())) {
+                        return ChainType::EndWithSlice;
+                }
                if (auto dot = ast_cast<DotChainItem_t>(chainValue->items.back())) {
                        if (dot->name.is<Metatable_t>()) {
                                return ChainType::Metatable;
@@ -1318,6 +1364,8 @@ private:
                                }
                        } else if (ast_is<ExistentialOp_t>(item)) {
                                return ChainType::HasEOP;
+                        } else if (ast_is<ReversedIndex_t>(item)) {
+                                return ChainType::HasRIndex;
                        }
                }
                return type;
@@ -1347,10 +1395,10 @@ private:
                std::ostringstream buf;
                for (auto it = uname->m_begin.m_it; it != uname->m_end.m_it; ++it) {
                        auto ch = *it;
-                        if (ch > 255) {
+                        if (ch <= 0x7F && ((ch == '_') || ((ch | 0x20) >= 'a' && (ch | 0x20) <= 'z') || (ch >= '0' && ch <= '9'))) {
-                                buf << "_u"sv << std::hex << static_cast<int>(ch);
-                        } else {
                                buf << static_cast<char>(ch);
+                        } else {
+                                buf << "_u"sv << std::hex << static_cast<uint32_t>(ch);
                        }
                }
                return buf.str();
@@ -1432,6 +1480,7 @@ private:
                                case id<DotChainItem_t>():
                                case id<Exp_t>():
                                case id<TableAppendingOp_t>():
+                                case id<ReversedIndex_t>():
                                        return true;
                        }
                }
@@ -1449,7 +1498,7 @@ private:
                                        if (simpleValue->value.is<TableLit_t>()) {
                                                return true;
                                        } else if (auto comp = simpleValue->value.as<Comprehension_t>()) {
-                                                if (comp->items.size() != 2 || !ast_is<CompInner_t>(comp->items.back())) {
+                                                if (!isListComp(comp)) {
                                                        return true;
                                                }
                                        }
@@ -1581,16 +1630,26 @@ private:
                return !_varArgs.empty() && _varArgs.top().usedVar ? "end)(...)"s : "end)()"s;
        }
+        void markGlobalImported(const std::string& name) {
+                if (_importedGlobal->globals.find(name) == _importedGlobal->globals.end() && !isSolidDefined(name)) {
+                        const auto& global = _importedGlobal->globalList.emplace_back(name);
+                        _importedGlobal->globals.insert(global);
+                        _importedGlobal->vars->insert_or_assign(name, VarType::LocalConst);
+                }
+        }
        std::string globalVar(std::string_view var, ast_node* x, AccessType accessType) {
                std::string str(var);
-                if (_config.lintGlobalVariable) {
+                if (_importedGlobal) {
+                        markGlobalImported(str);
+                } else if (_config.lintGlobalVariable) {
                        if (!isLocal(str)) {
                                auto key = str + ':' + std::to_string(x->m_begin.m_line) + ':' + std::to_string(x->m_begin.m_col);
                                if (_globals.find(key) == _globals.end()) {
                                        if (accessType == AccessType::Read && _funcLevel > 1) {
                                                accessType = AccessType::Capture;
                                        }
-                                        _globals[key] = {str, x->m_begin.m_line, x->m_begin.m_col, accessType};
+                                        _globals[key] = {str, x->m_begin.m_line, x->m_begin.m_col, accessType, isSolidDefined(str)};
                                }
                        }
                }
@@ -1632,24 +1691,31 @@ private:
                return;
        }
-        void transformStatement(Statement_t* statement, str_list& out) {
+        void transformComment(YueComment_t* comment, str_list& out) {
-                auto x = statement;
+                if (!_config.reserveComment) {
-                if (_config.reserveComment && !x->comments.empty()) {
+                        return;
-                        for (ast_node* node : x->comments.objects()) {
+                }
-                                switch (node->get_id()) {
+                auto node = comment->comment.get();
-                                        case id<YueLineComment_t>(): {
+                if (!node) {
-                                                auto comment = ast_cast<YueLineComment_t>(node);
+                        out.push_back("\n"s);
-                                                out.push_back(indent() + "--"s + _parser.toString(comment) + '\n');
+                        return;
-                                                break;
+                }
-                                        }
+                switch (node->get_id()) {
-                                        case id<YueMultilineComment_t>(): {
+                        case id<YueLineComment_t>(): {
-                                                auto comment = ast_cast<YueMultilineComment_t>(node);
+                                auto content = static_cast<YueLineComment_t*>(node);
-                                                out.push_back(indent() + _parser.toString(comment) + '\n');
+                                out.push_back(indent() + "--"s + _parser.toString(content) + '\n');
-                                                break;
+                                break;
-                                        }
+                        }
-                                }
+                        case id<YueMultilineComment_t>(): {
+                                auto content = static_cast<YueMultilineComment_t*>(node);
+                                out.push_back(indent() + "--[["s + _parser.toString(content) + "]]\n"s);
+                                break;
                        }
                }
+        }
+        void transformStatement(Statement_t* statement, str_list& out) {
+                auto x = statement;
                if (statement->appendix) {
                        if (auto assignment = assignmentFrom(statement)) {
                                auto preDefine = getPreDefineLine(assignment);
@@ -1713,7 +1779,7 @@ private:
                                                throw CompileError("while-loop line decorator is not supported here"sv, appendix->item.get());
                                                break;
                                        }
-                                        case id<CompInner_t>(): {
+                                        case id<CompFor_t>(): {
                                                throw CompileError("for-loop line decorator is not supported here"sv, appendix->item.get());
                                                break;
                                        }
@@ -1774,8 +1840,8 @@ private:
                                        statement->content.set(expListAssign);
                                        break;
                                }
-                                case id<CompInner_t>(): {
+                                case id<CompFor_t>(): {
-                                        auto compInner = appendix->item.to<CompInner_t>();
+                                        auto compInner = appendix->item.to<CompFor_t>();
                                        auto comp = x->new_ptr<Comprehension_t>();
                                        auto stmt = x->new_ptr<Statement_t>();
                                        stmt->content.set(statement->content);
@@ -1840,11 +1906,12 @@ private:
                                                                case id<ForEach_t>(): transformForEach(static_cast<ForEach_t*>(value), out); break;
                                                                case id<For_t>(): transformFor(static_cast<For_t*>(value), out); break;
                                                                case id<While_t>(): transformWhile(static_cast<While_t*>(value), out); break;
+                                                                case id<Repeat_t>(): transformRepeat(static_cast<Repeat_t*>(value), out); break;
                                                                case id<Do_t>(): transformDo(static_cast<Do_t*>(value), out, ExpUsage::Common); break;
                                                                case id<Try_t>(): transformTry(static_cast<Try_t*>(value), out, ExpUsage::Common); break;
                                                                case id<Comprehension_t>(): {
                                                                        auto comp = static_cast<Comprehension_t*>(value);
-                                                                        if (comp->items.size() == 2 && ast_is<CompInner_t>(comp->items.back())) {
+                                                                        if (isListComp(comp)) {
                                                                                transformCompCommon(comp, out);
                                                                        } else {
                                                                                specialSingleValue = false;
@@ -1968,7 +2035,7 @@ private:
                return indent() + "local "s + join(defs, ", "sv);
        }
-        std::string getDestrucureDefine(ExpListAssign_t* assignment) {
+        std::string getDestructureDefine(ExpListAssign_t* assignment) {
                auto info = extractDestructureInfo(assignment, true, false);
                if (!info.destructures.empty()) {
                        str_list defs;
@@ -1999,8 +2066,31 @@ private:
                return clearBuf();
        }
+        str_list getArgDestructureList(ExpListAssign_t* assignment) {
+                str_list defs;
+                auto info = extractDestructureInfo(assignment, true, false);
+                if (!info.destructures.empty()) {
+                        for (const auto& des : info.destructures) {
+                                if (std::holds_alternative<Destructure>(des)) {
+                                        const auto& destruct = std::get<Destructure>(des);
+                                        for (const auto& item : destruct.items) {
+                                                if (item.targetVar.empty()) {
+                                                        throw CompileError("can only destruct argument to variable"sv, item.target);
+                                                } else {
+                                                        defs.push_back(item.targetVar);
+                                                }
+                                        }
+                                } else {
+                                        const auto& assignment = std::get<AssignmentPtr>(des);
+                                        YUEE("AST node mismatch", assignment.ptr);
+                                }
+                        }
+                }
+                return defs;
+        }
        std::string getPreDefine(ExpListAssign_t* assignment) {
-                auto preDefine = getDestrucureDefine(assignment);
+                auto preDefine = getDestructureDefine(assignment);
                if (preDefine.empty()) {
                        preDefine = toLocalDecl(transformAssignDefs(assignment->expList, DefOp::Mark));
                }
@@ -2009,7 +2099,7 @@ private:
        std::string getPreDefineLine(ExpListAssign_t* assignment) {
                auto preDefine = getPreDefine(assignment);
-                if (!preDefine.empty()) preDefine += nll(assignment);
+                if (!preDefine.empty()) preDefine += nl(assignment);
                return preDefine;
        }
@@ -2051,13 +2141,16 @@ private:
                                        if (item.targetVar.empty()) {
                                                throw CompileError("can only declare variable as const"sv, item.target);
                                        }
-                                        markVarConst(item.targetVar);
+                                        markVarLocalConst(item.targetVar);
                                }
                        }
                }
        }
        bool transformAssignment(ExpListAssign_t* assignment, str_list& out, bool optionalDestruct = false) {
+                if (assignment->action.is<SubBackcall_t>()) {
+                        YUEE("AST node mismatch", assignment->action);
+                }
                checkAssignable(assignment->expList);
                BLOCK_START
                auto assign = ast_cast<Assign_t>(assignment->action);
@@ -2162,14 +2255,14 @@ private:
                        temp.push_back(getPreDefineLine(assignment));
                        bool needScope = !currentScope().lastStatement;
                        if (needScope) {
-                                temp.push_back(indent() + "do"s + nll(assignment));
+                                temp.push_back(indent() + "do"s + nl(assignment));
                                pushScope();
                        }
                        transformAssignment(preAssignment, temp);
                        transformAssignment(assignment, temp);
                        if (needScope) {
                                popScope();
-                                temp.push_back(indent() + "end"s + nll(assignment));
+                                temp.push_back(indent() + "end"s + nl(assignment));
                        }
                        out.push_back(join(temp));
                        return false;
@@ -2214,7 +2307,8 @@ private:
                                BREAK_IF(!value);
                                auto chainValue = value->item.as<ChainValue_t>();
                                BREAK_IF(!chainValue);
-                                if (auto dot = ast_cast<DotChainItem_t>(chainValue->items.back())) {
+                                auto last = chainValue->items.back();
+                                if (auto dot = ast_cast<DotChainItem_t>(last)) {
                                        BREAK_IF(!dot->name.is<Metatable_t>());
                                        str_list temp;
                                        auto [beforeAssignment, afterAssignment] = splitAssignment();
@@ -2238,14 +2332,14 @@ private:
                                                throw CompileError("right value missing"sv, values.front());
                                        }
                                        transformAssignItem(*vit, args);
-                                        _buf << indent() << globalVar("setmetatable"sv, x, AccessType::Read) << '(' << join(args, ", "sv) << ')' << nll(x);
+                                        _buf << indent() << globalVar("setmetatable"sv, x, AccessType::Read) << '(' << join(args, ", "sv) << ')' << nl(x);
                                        temp.push_back(clearBuf());
                                        if (!afterAssignment->expList->exprs.empty()) {
                                                transformAssignment(afterAssignment, temp);
                                        }
                                        out.push_back(join(temp));
                                        return false;
-                                } else if (ast_is<TableAppendingOp_t>(chainValue->items.back())) {
+                                } else if (ast_is<TableAppendingOp_t>(last)) {
                                        str_list temp;
                                        auto [beforeAssignment, afterAssignment] = splitAssignment();
                                        if (!beforeAssignment->expList->exprs.empty()) {
@@ -2267,7 +2361,7 @@ private:
                                        if (varName.empty() || !isLocal(varName)) {
                                                if (needScope) {
                                                        extraScoped = true;
-                                                        temp.push_back(indent() + "do"s + nll(x));
+                                                        temp.push_back(indent() + "do"s + nl(x));
                                                        pushScope();
                                                }
                                                auto objVar = getUnusedName("_obj_"sv);
@@ -2279,24 +2373,74 @@ private:
                                                transformAssignment(newAssignment, temp);
                                                varName = objVar;
                                        }
-                                        auto newAssignment = x->new_ptr<ExpListAssign_t>();
+                                        if (auto spread = ast_cast<SpreadListExp_t>(*vit)) {
-                                        newAssignment->expList.set(toAst<ExpList_t>(varName + "[#"s + varName + "+1]"s, x));
+                                                auto lenVar = getUnusedName("_len_"sv);
-                                        auto assign = x->new_ptr<Assign_t>();
+                                                forceAddToScope(lenVar);
-                                        if (vit == values.end()) {
+                                                temp.push_back(indent() + "local "s + lenVar + " = #"s + varName + " + 1"s + nl(spread));
-                                                throw CompileError("right value missing"sv, values.front());
+                                                auto elmVar = getUnusedName("_elm_"sv);
+                                                _buf << varName << '[' << lenVar << "],"s << lenVar << "="s << elmVar << ',' << lenVar << "+1 for "s << elmVar << " in *nil"s;
+                                                auto stmt = toAst<Statement_t>(clearBuf(), spread);
+                                                auto comp = stmt->appendix->item.to<CompFor_t>();
+                                                ast_to<CompForEach_t>(comp->items.front())->loopValue.to<StarExp_t>()->value.set(spread->exp);
+                                                transformStatement(stmt, temp);
+                                        } else {
+                                                auto newAssignment = x->new_ptr<ExpListAssign_t>();
+                                                newAssignment->expList.set(toAst<ExpList_t>(varName + "[#"s + varName + "+1]"s, x));
+                                                auto assign = x->new_ptr<Assign_t>();
+                                                if (vit == values.end()) {
+                                                        throw CompileError("right value missing"sv, values.front());
+                                                }
+                                                assign->values.push_back(*vit);
+                                                newAssignment->action.set(assign);
+                                                transformAssignment(newAssignment, temp);
                                        }
-                                        assign->values.push_back(*vit);
-                                        newAssignment->action.set(assign);
-                                        transformAssignment(newAssignment, temp);
                                        if (extraScoped) {
                                                popScope();
-                                                temp.push_back(indent() + "end"s + nlr(x));
+                                                temp.push_back(indent() + "end"s + nl(x));
                                        }
                                        if (!afterAssignment->expList->exprs.empty()) {
                                                transformAssignment(afterAssignment, temp);
                                        }
                                        out.push_back(join(temp));
                                        return false;
+                                } else if (ast_is<ReversedIndex_t>(last)) {
+                                        if (chainValue->items.size() == 1) {
+                                                if (_withVars.empty()) {
+                                                        throw CompileError("short dot/colon syntax must be called within a with block"sv, x);
+                                                } else {
+                                                        break;
+                                                }
+                                        }
+                                        auto tmpChain = chainValue->new_ptr<ChainValue_t>();
+                                        tmpChain->items.dup(chainValue->items);
+                                        tmpChain->items.pop_back();
+                                        auto tmpLeft = newExp(tmpChain, tmpChain);
+                                        auto leftVar = singleVariableFrom(tmpLeft, AccessType::Read);
+                                        if (!leftVar.empty() && isLocal(leftVar)) {
+                                                break;
+                                        }
+                                        leftVar = getUnusedName("_obj_"sv);
+                                        auto tmpAsmt = assignmentFrom(toAst<Exp_t>(leftVar, tmpLeft), tmpLeft, tmpLeft);
+                                        str_list temp;
+                                        transformAssignment(tmpAsmt, temp);
+                                        auto [beforeAssignment, afterAssignment] = splitAssignment();
+                                        if (!beforeAssignment->expList->exprs.empty()) {
+                                                transformAssignment(beforeAssignment, temp);
+                                        }
+                                        if (vit == values.end()) {
+                                                throw CompileError("right value missing"sv, values.front());
+                                        }
+                                        auto newChain = chainValue->new_ptr<ChainValue_t>();
+                                        newChain->items.push_back(toAst<Callable_t>(leftVar, newChain));
+                                        newChain->items.push_back(chainValue->items.back());
+                                        auto newLeft = newExp(newChain, newChain);
+                                        auto newAsmt = assignmentFrom(newLeft, *vit, newLeft);
+                                        transformAssignment(newAsmt, temp);
+                                        if (!afterAssignment->expList->exprs.empty()) {
+                                                transformAssignment(afterAssignment, temp);
+                                        }
+                                        out.push_back(join(temp));
+                                        return false;
                                } else {
                                        break;
                                }
@@ -2320,6 +2464,17 @@ private:
                                out.back().insert(0, preDefine);
                                return false;
                        }
+                        case id<Try_t>(): {
+                                auto tryNode = static_cast<Try_t*>(value);
+                                if (tryNode->eop) {
+                                        auto assignList = assignment->expList.get();
+                                        std::string preDefine = getPreDefineLine(assignment);
+                                        transformTry(tryNode, out, ExpUsage::Assignment, assignList);
+                                        out.back().insert(0, preDefine);
+                                        return false;
+                                }
+                                break;
+                        }
                        case id<Switch_t>(): {
                                auto switchNode = static_cast<Switch_t*>(value);
                                auto assignList = assignment->expList.get();
@@ -2347,7 +2502,7 @@ private:
                        case id<Comprehension_t>(): {
                                auto comp = static_cast<Comprehension_t*>(value);
                                auto expList = assignment->expList.get();
-                                if (comp->items.size() == 2 && ast_is<CompInner_t>(comp->items.back())) {
+                                if (isListComp(comp)) {
                                        std::string preDefine = getPreDefineLine(assignment);
                                        transformComprehension(comp, out, ExpUsage::Assignment, expList);
                                        out.back().insert(0, preDefine);
@@ -2391,6 +2546,13 @@ private:
                                out.back().insert(0, preDefine);
                                return false;
                        }
+                        case id<Repeat_t>(): {
+                                auto expList = assignment->expList.get();
+                                std::string preDefine = getPreDefineLine(assignment);
+                                transformRepeatInPlace(static_cast<Repeat_t*>(value), out, expList);
+                                out.back().insert(0, preDefine);
+                                return false;
+                        }
                        case id<TableLit_t>(): {
                                auto tableLit = static_cast<TableLit_t*>(value);
                                if (hasSpreadExp(tableLit->values.objects())) {
@@ -2443,12 +2605,14 @@ private:
                        switch (type) {
                                case ChainType::HasEOP:
                                case ChainType::EndWithColon:
+                                case ChainType::EndWithSlice:
                                case ChainType::MetaFieldInvocation: {
                                        std::string preDefine = getPreDefineLine(assignment);
                                        transformChainValue(chainValue, out, ExpUsage::Assignment, expList, false, optionalDestruct);
                                        out.back().insert(0, preDefine);
                                        return false;
                                }
+                                case ChainType::HasRIndex:
                                case ChainType::HasKeyword:
                                case ChainType::HasUnicode:
                                case ChainType::Macro:
@@ -2464,6 +2628,10 @@ private:
                auto info = extractDestructureInfo(assignment, false, optionalDestruct);
                if (info.destructures.empty()) {
                        transformAssignmentCommon(assignment, out);
+                        if (assignment->expList->followStmt) {
+                                transformStatement(assignment->expList->followStmt, out);
+                                assignment->expList->followStmtProcessed = true;
+                        }
                        return true;
                } else {
                        auto x = assignment;
@@ -2499,11 +2667,11 @@ private:
                                                checkConst(def, x);
                                                addToScope(def);
                                        }
-                                        temp.push_back(indent() + "local "s + join(defs, ", "sv) + nll(x));
+                                        temp.push_back(indent() + "local "s + join(defs, ", "sv) + nl(x));
                                }
                                if (needScope) {
                                        extraScope = true;
-                                        temp.push_back(indent() + "do"s + nll(x));
+                                        temp.push_back(indent() + "do"s + nl(x));
                                        pushScope();
                                }
                        }
@@ -2555,13 +2723,13 @@ private:
                                                continue;
                                        }
                                        if (extraScope) {
-                                                temp.push_back(indent() + "do"s + nll(x));
+                                                temp.push_back(indent() + "do"s + nl(x));
                                                pushScope();
                                        }
                                        if (!pair.targetVar.empty()) {
                                                checkConst(pair.targetVar, x);
                                                if (addToScope(pair.targetVar)) {
-                                                        _buf << indent() << "local "sv << pair.targetVar << nll(x);
+                                                        _buf << indent() << "local "sv << pair.targetVar << nl(x);
                                                        temp.push_back(clearBuf());
                                                }
                                        }
@@ -2571,7 +2739,7 @@ private:
                                                objVar = destruct.valueVar;
                                        } else {
                                                if (needScope) {
-                                                        temp.push_back(indent() + "do"s + nll(x));
+                                                        temp.push_back(indent() + "do"s + nl(x));
                                                        pushScope();
                                                }
                                                objVar = getUnusedName("_obj_"sv);
@@ -2587,7 +2755,7 @@ private:
                                        if (!isLocalValue) {
                                                if (needScope) {
                                                        popScope();
-                                                        _buf << indent() << "end"sv << nlr(x);
+                                                        _buf << indent() << "end"sv << nl(x);
                                                        temp.push_back(clearBuf());
                                                }
                                        }
@@ -2625,9 +2793,9 @@ private:
                                                                        checkConst(def, x);
                                                                        addToScope(def);
                                                                }
-                                                                temp.push_back(indent() + "local "s + join(defs, ", "sv) + nll(x));
+                                                                temp.push_back(indent() + "local "s + join(defs, ", "sv) + nl(x));
                                                        }
-                                                        temp.push_back(indent() + "do"s + nll(x));
+                                                        temp.push_back(indent() + "do"s + nl(x));
                                                        pushScope();
                                                }
                                        } else {
@@ -2636,11 +2804,11 @@ private:
                                                                checkConst(def, x);
                                                                addToScope(def);
                                                        }
-                                                        temp.push_back(indent() + "local "s + join(defs, ", "sv) + nll(x));
+                                                        temp.push_back(indent() + "local "s + join(defs, ", "sv) + nl(x));
                                                }
                                                if (needScope) {
                                                        extraScope = true;
-                                                        temp.push_back(indent() + "do"s + nll(x));
+                                                        temp.push_back(indent() + "do"s + nl(x));
                                                        pushScope();
                                                }
                                                auto valVar = getUnusedName("_obj_"sv);
@@ -2655,7 +2823,7 @@ private:
                                        if (destruct.inlineAssignment) {
                                                if (needScope && !extraScope) {
                                                        extraScope = true;
-                                                        temp.push_back(indent() + "do"s + nll(x));
+                                                        temp.push_back(indent() + "do"s + nl(x));
                                                        pushScope();
                                                }
                                                transformAssignment(destruct.inlineAssignment, temp);
@@ -2720,17 +2888,21 @@ private:
                                }
                                if (extraScope) {
                                        popScope();
-                                        _buf << indent() << "end"sv << nlr(x);
+                                        _buf << indent() << "end"sv << nl(x);
                                        temp.push_back(clearBuf());
                                }
                        }
                        if (extraScope) {
                                popScope();
-                                temp.push_back(indent() + "end"s + nlr(x));
+                                temp.push_back(indent() + "end"s + nl(x));
                        }
                        out.push_back(join(temp));
+                        if (assignment->expList->followStmt) {
+                                transformStatement(assignment->expList->followStmt, out);
+                                assignment->expList->followStmtProcessed = true;
+                        }
+                        return false;
                }
-                return false;
        }
        void transformAssignItem(ast_node* value, str_list& out) {
@@ -2740,6 +2912,7 @@ private:
                        case id<Switch_t>(): transformSwitch(static_cast<Switch_t*>(value), out, ExpUsage::Closure); break;
                        case id<TableBlock_t>(): transformTableBlock(static_cast<TableBlock_t*>(value), out); break;
                        case id<Exp_t>(): transformExp(static_cast<Exp_t*>(value), out, ExpUsage::Closure); break;
+                        case id<SpreadListExp_t>(): throw CompileError("can only be used for ranged table append assignments"sv, value); break;
                        default: YUEE("AST node mismatch", value); break;
                }
        }
@@ -2754,7 +2927,7 @@ private:
                                if (auto tbA = item->get_by_path<TableLit_t>()) {
                                        tableItems = &tbA->values.objects();
                                } else if (auto tbB = item->get_by_path<Comprehension_t>()) {
-                                        if (tbB->items.size() == 2 && ast_is<CompInner_t>(tbB->items.back())) {
+                                        if (isListComp(tbB)) {
                                                throw CompileError("invalid destructure value"sv, tbB);
                                        }
                                        tableItems = &tbB->items.objects();
@@ -2785,7 +2958,7 @@ private:
                        }
                        case id<Comprehension_t>(): {
                                auto table = static_cast<Comprehension_t*>(node);
-                                if (table->items.size() == 2 && ast_is<CompInner_t>(table->items.back())) {
+                                if (isListComp(table)) {
                                        throw CompileError("invalid destructure value"sv, table);
                                }
                                tableItems = &table->items.objects();
@@ -2796,20 +2969,46 @@ private:
                if (!tableItems) throw CompileError("invalid destructure value"sv, node);
                std::list<DestructItem> pairs;
                int index = 0;
+                int count = 0;
+                bool hasSpread = false;
                auto subMetaDestruct = node->new_ptr<TableLit_t>();
                for (auto pair : *tableItems) {
                        switch (pair->get_id()) {
                                case id<Exp_t>():
                                case id<NormalDef_t>(): {
+                                        ++index;
                                        Exp_t* defVal = nullptr;
                                        if (auto nd = ast_cast<NormalDef_t>(pair)) {
                                                pair = nd->item.get();
                                                defVal = nd->defVal.get();
                                        }
-                                        ++index;
+                                        bool assignable = false;
-                                        if (!varDefOnly && !isAssignable(static_cast<Exp_t*>(pair))) {
+                                        try {
+                                                assignable = isAssignable(static_cast<Exp_t*>(pair));
+                                        } catch (const CompileError& e) {
+                                                if (!varDefOnly) throw e;
+                                        }
+                                        if (!assignable && !varDefOnly) {
+                                                if (optional) break;
                                                throw CompileError("can't destructure value"sv, pair);
                                        }
+                                        ast_ptr<true, ast_node> indexItem;
+                                        if (hasSpread) {
+                                                int rIndex = count - index;
+                                                indexItem.set(toAst<ReversedIndex_t>('#' + (rIndex == 0 ? Empty : "-"s + std::to_string(rIndex)), pair));
+                                        } else {
+                                                indexItem.set(toAst<Exp_t>(std::to_string(index), pair));
+                                        }
+                                        if (optional && varDefOnly && !assignable) {
+                                                if (defVal) {
+                                                        throw CompileError("default value is not supported here"sv, defVal);
+                                                }
+                                                auto exp = static_cast<Exp_t*>(pair);
+                                                auto chain = exp->new_ptr<ChainValue_t>();
+                                                chain->items.push_back(indexItem);
+                                                pairs.push_back({exp, Empty, chain, nullptr});
+                                                break;
+                                        }
                                        auto value = singleValueFrom(pair);
                                        auto item = value->item.get();
                                        ast_node* subExp = ast_cast<SimpleTable_t>(item);
@@ -2820,7 +3019,6 @@ private:
                                                                throw CompileError("default value is not supported here"sv, defVal);
                                                        }
                                                }
-                                                auto indexItem = toAst<Exp_t>(std::to_string(index), value);
                                                for (auto& p : subPairs) {
                                                        if (sep) p.structure->items.push_front(sep);
                                                        p.structure->items.push_front(indexItem);
@@ -2831,7 +3029,6 @@ private:
                                                auto varName = singleVariableFrom(exp, AccessType::None);
                                                if (varName == "_"sv) break;
                                                auto chain = exp->new_ptr<ChainValue_t>();
-                                                auto indexItem = toAst<Exp_t>(std::to_string(index), exp);
                                                chain->items.push_back(indexItem);
                                                pairs.push_back({exp,
                                                        varName,
@@ -2889,7 +3086,25 @@ private:
                                                }
                                        }
                                        if (auto exp = np->value.as<Exp_t>()) {
-                                                if (!varDefOnly && !isAssignable(exp)) throw CompileError("can't do destructure value"sv, exp);
+                                                bool assignable = false;
+                                                try {
+                                                        assignable = isAssignable(exp);
+                                                } catch (const CompileError& e) {
+                                                        if (!varDefOnly) throw e;
+                                                }
+                                                if (!assignable && !varDefOnly) {
+                                                        if (optional) break;
+                                                        throw CompileError("can't destructure value"sv, pair);
+                                                }
+                                                if (optional && varDefOnly && !assignable) {
+                                                        if (defVal) {
+                                                                throw CompileError("default value is not supported here"sv, defVal);
+                                                        }
+                                                        auto chain = exp->new_ptr<ChainValue_t>();
+                                                        if (keyIndex) chain->items.push_back(keyIndex);
+                                                        pairs.push_back({exp, Empty, chain, nullptr});
+                                                        break;
+                                                }
                                                auto item = singleValueFrom(exp)->item.get();
                                                ast_node* subExp = ast_cast<SimpleTable_t>(item);
                                                if (subExp || (subExp = item->get_by_path<TableLit_t>()) || (subExp = item->get_by_path<Comprehension_t>())) {
@@ -2938,7 +3153,13 @@ private:
                                        auto tb = static_cast<TableBlockIndent_t*>(pair);
                                        ++index;
                                        auto subPairs = destructFromExp(tb, varDefOnly, optional);
-                                        auto indexItem = toAst<Exp_t>(std::to_string(index), tb);
+                                        ast_ptr<true, ast_node> indexItem;
+                                        if (hasSpread) {
+                                                int rIndex = count - index;
+                                                indexItem.set(toAst<ReversedIndex_t>('#' + (rIndex == 0 ? Empty : "-"s + std::to_string(rIndex)), tb));
+                                        } else {
+                                                indexItem.set(toAst<Exp_t>(std::to_string(index), tb));
+                                        }
                                        for (auto& p : subPairs) {
                                                if (sep) p.structure->items.push_front(sep);
                                                p.structure->items.push_front(indexItem);
@@ -2995,6 +3216,42 @@ private:
                                        subMetaDestruct->values.push_back(newPairDef);
                                        break;
                                }
+                                case id<SpreadListExp_t>():
+                                case id<SpreadExp_t>(): {
+                                        ++index;
+                                        if (hasSpread) {
+                                                throw CompileError("duplicated spread expression"sv, pair);
+                                        }
+                                        hasSpread = true;
+                                        for (auto item : *tableItems) {
+                                                if (ast_is<
+                                                                SpreadListExp_t, SpreadExp_t,
+                                                                TableBlockIndent_t,
+                                                                Exp_t, NormalDef_t>(item)) {
+                                                        count++;
+                                                }
+                                        }
+                                        Exp_t* exp = nullptr;
+                                        if (auto se = ast_cast<SpreadExp_t>(pair)) {
+                                                exp = se->exp.get();
+                                        } else {
+                                                exp = ast_to<SpreadListExp_t>(pair)->exp.get();
+                                        }
+                                        auto varName = singleVariableFrom(exp, AccessType::None);
+                                        if (varName == "_"sv) break;
+                                        int start = index;
+                                        int stop = index - count - 1;
+                                        auto chain = exp->new_ptr<ChainValue_t>();
+                                        auto slice = toAst<Slice_t>(
+                                                '[' + (start == 1 ? Empty : std::to_string(start)) + ',' + (stop == -1 ? Empty : std::to_string(stop)) + ']', exp);
+                                        chain->items.push_back(slice);
+                                        auto nil = toAst<Exp_t>("nil"sv, slice);
+                                        pairs.push_back({exp,
+                                                varName,
+                                                chain,
+                                                nil.get()});
+                                        break;
+                                }
                                default: YUEE("AST node mismatch", pair); break;
                        }
                }
@@ -3072,7 +3329,7 @@ private:
                                        if (auto tab = sVal->value.as<TableLit_t>()) {
                                                destructNode = tab;
                                        } else if (auto comp = sVal->value.as<Comprehension_t>()) {
-                                                if (comp->items.size() != 2 || !ast_is<CompInner_t>(comp->items.back())) {
+                                                if (!isListComp(comp)) {
                                                        destructNode = comp;
                                                }
                                        }
@@ -3111,7 +3368,11 @@ private:
                                                break;
                                        default: YUEE("AST node mismatch", destructNode); break;
                                }
-                                if (dlist->empty()) throw CompileError("expect items to be destructured"sv, destructNode);
+                                if (dlist->empty()) {
+                                        if (!optional) {
+                                                throw CompileError("expect items to be destructured"sv, destructNode);
+                                        }
+                                }
                                for (auto item : *dlist) {
                                        switch (item->get_id()) {
                                                case id<MetaVariablePairDef_t>(): {
@@ -3247,7 +3508,9 @@ private:
                                                simpleValue->value.set(tab);
                                                auto pairs = destructFromExp(newExp(simpleValue, expr), varDefOnly, optional);
                                                if (pairs.empty()) {
-                                                        throw CompileError("expect items to be destructured"sv, tab);
+                                                        if (!optional) {
+                                                                throw CompileError("expect items to be destructured"sv, tab);
+                                                        }
                                                }
                                                destruct.items = std::move(pairs);
                                                if (!varDefOnly) {
@@ -3286,7 +3549,7 @@ private:
                                                                destruct.valueVar.clear();
                                                        }
                                                }
-                                                destructs.push_back(destruct);
+                                                destructs.push_back(std::move(destruct));
                                        }
                                }
                        } else {
@@ -3453,7 +3716,7 @@ private:
                                        _buf << defs;
                                else
                                        _buf << indent() << left;
-                                _buf << " = "sv << left << ' ' << op << ' ' << right << nll(assignment);
+                                _buf << " = "sv << left << ' ' << op << ' ' << right << nl(assignment);
                                out.push_back(clearBuf());
                                break;
                        }
@@ -3463,7 +3726,7 @@ private:
                                bool oneLined = defs.size() == expList->exprs.objects().size();
                                bool nonRecursionFunLit = false;
                                for (auto val : assign->values.objects()) {
-                                        if (auto value = singleValueFrom(val)) {
+                                        if (auto value = singleValueFrom(val, true)) {
                                                if (auto spValue = value->item.as<SimpleValue_t>()) {
                                                        if (auto funLit = spValue->value.as<FunLit_t>()) {
                                                                if (funLit->noRecursion) {
@@ -3500,9 +3763,9 @@ private:
                                                transformExpList(expList, temp);
                                                std::string left = std::move(temp.back());
                                                temp.pop_back();
-                                                out.push_back(indent() + left + " = "s + join(temp, ", "sv) + nll(assignment));
+                                                out.push_back(indent() + left + " = "s + join(temp, ", "sv) + nl(assignment));
                                        } else {
-                                                out.push_back(preDefine + " = "s + join(temp, ", "sv) + nll(assignment));
+                                                out.push_back(preDefine + " = "s + join(temp, ", "sv) + nl(assignment));
                                        }
                                } else {
                                        std::string preDefine = toLocalDecl(defs);
@@ -3518,7 +3781,7 @@ private:
                                        for (auto value : assign->values.objects()) {
                                                transformAssignItem(value, temp);
                                        }
-                                        out.push_back((preDefine.empty() ? Empty : preDefine + nll(assignment)) + indent() + left + " = "s + join(temp, ", "sv) + nll(assignment));
+                                        out.push_back((preDefine.empty() ? Empty : preDefine + nl(assignment)) + indent() + left + " = "s + join(temp, ", "sv) + nl(assignment));
                                }
                                break;
                        }
@@ -3619,7 +3882,7 @@ private:
                                        if (usage != ExpUsage::Closure) {
                                                if (!currentScope().lastStatement) {
                                                        extraScope = true;
-                                                        temp.push_back(indent() + "do"s + nll(asmt));
+                                                        temp.push_back(indent() + "do"s + nl(asmt));
                                                        pushScope();
                                                }
                                        }
@@ -3652,7 +3915,7 @@ private:
                                        if (usage != ExpUsage::Closure) {
                                                if (!currentScope().lastStatement) {
                                                        extraScope = true;
-                                                        temp.push_back(indent() + "do"s + nll(asmt));
+                                                        temp.push_back(indent() + "do"s + nl(asmt));
                                                        pushScope();
                                                }
                                        }
@@ -3681,12 +3944,12 @@ private:
                                if (pair != ifCondPairs.front()) {
                                        _buf << "else"sv;
                                }
-                                _buf << "if "sv << condStr << " then"sv << nll(condition);
+                                _buf << "if "sv << condStr << " then"sv << nl(condition);
                                temp.push_back(clearBuf());
                        }
                        if (pair.second) {
                                if (!pair.first) {
-                                        temp.push_back(indent() + "else"s + nll(pair.second));
+                                        temp.push_back(indent() + "else"s + nl(pair.second));
                                }
                                pushScope();
                                if (pair == ifCondPairs.front() && extraAssignment) {
@@ -3696,17 +3959,17 @@ private:
                                popScope();
                        }
                        if (!pair.first) {
-                                temp.push_back(indent() + "end"s + nll(nodes.front()));
+                                temp.push_back(indent() + "end"s + nl(nodes.front()));
                                break;
                        }
                }
                if (extraScope) {
                        popScope();
-                        temp.push_back(indent() + "end"s + nlr(nodes.front()));
+                        temp.push_back(indent() + "end"s + nl(nodes.front()));
                }
                if (usage == ExpUsage::Closure) {
                        popScope();
-                        *funcStart = anonFuncStart() + nll(nodes.front());
+                        *funcStart = anonFuncStart() + nl(nodes.front());
                        temp.push_back(indent() + anonFuncEnd());
                        popAnonVarArg();
                        popFunctionScope();
@@ -3727,14 +3990,6 @@ private:
                out.push_back(join(temp, ", "sv));
        }
-        void transformExpListLow(ExpListLow_t* expListLow, str_list& out) {
-                str_list temp;
-                for (auto exp : expListLow->exprs.objects()) {
-                        transformExp(static_cast<Exp_t*>(exp), temp, ExpUsage::Closure);
-                }
-                out.push_back(join(temp, ", "sv));
-        }
        void transform_pipe_exp(const node_container& values, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
                if (values.size() == 1 && usage == ExpUsage::Closure) {
                        transformUnaryExp(static_cast<UnaryExp_t*>(values.front()), out, ExpUsage::Closure);
@@ -3801,16 +4056,12 @@ private:
                                        } else {
                                                transformExp(arg, out, ExpUsage::Closure);
                                                out.back().insert(0, indent());
-                                                out.back().append(nlr(x));
+                                                out.back().append(nl(x));
                                        }
                                        return;
                                }
                                case ExpUsage::Return: {
-                                        auto ret = x->new_ptr<Return_t>();
+                                        auto ret = newReturn(arg);
-                                        ret->explicitReturn = false;
-                                        auto expListLow = x->new_ptr<ExpListLow_t>();
-                                        expListLow->exprs.push_back(arg);
-                                        ret->valueList.set(expListLow);
                                        transformReturn(ret, out);
                                        return;
                                }
@@ -3925,7 +4176,7 @@ private:
                                                                auto stmt = exp->new_ptr<Statement_t>();
                                                                stmt->content.set(preDefine);
                                                                preDefine.set(nullptr);
-                                                                block->statements.push_back(stmt);
+                                                                block->statementOrComments.push_back(stmt);
                                                                auto simpleValue = exp->new_ptr<SimpleValue_t>();
                                                                simpleValue->value.set(ifNode);
                                                                auto explist = exp->new_ptr<ExpList_t>();
@@ -3934,7 +4185,7 @@ private:
                                                                expListAssign->expList.set(explist);
                                                                stmt = exp->new_ptr<Statement_t>();
                                                                stmt->content.set(expListAssign);
-                                                                block->statements.push_back(stmt);
+                                                                block->statementOrComments.push_back(stmt);
                                                                nodes->push_back(block);
                                                                nodes = &ifNode->nodes;
                                                        } else {
@@ -3942,7 +4193,7 @@ private:
                                                                auto stmt = exp->new_ptr<Statement_t>();
                                                                stmt->content.set(preDefine);
                                                                preDefine.set(nullptr);
-                                                                block->statements.push_back(stmt);
+                                                                block->statementOrComments.push_back(stmt);
                                                                auto simpleValue = exp->new_ptr<SimpleValue_t>();
                                                                simpleValue->value.set(ifNode);
                                                                auto explist = exp->new_ptr<ExpList_t>();
@@ -3951,7 +4202,7 @@ private:
                                                                expListAssign->expList.set(explist);
                                                                stmt = exp->new_ptr<Statement_t>();
                                                                stmt->content.set(expListAssign);
-                                                                block->statements.push_back(stmt);
+                                                                block->statementOrComments.push_back(stmt);
                                                                auto body = exp->new_ptr<Body_t>();
                                                                body->content.set(block);
                                                                auto doNode = exp->new_ptr<Do_t>();
@@ -4035,11 +4286,7 @@ private:
                                                break;
                                        }
                                        case ExpUsage::Return: {
-                                                auto expListLow = exp->new_ptr<ExpListLow_t>();
+                                                auto returnNode = newReturn(e);
-                                                expListLow->exprs.push_back(e);
-                                                auto returnNode = exp->new_ptr<Return_t>();
-                                                returnNode->explicitReturn = false;
-                                                returnNode->valueList.set(expListLow);
                                                transformReturn(returnNode, out);
                                                break;
                                        }
@@ -4113,7 +4360,7 @@ private:
                                        auto stmt = x->new_ptr<Statement_t>();
                                        stmt->content.set(expListAssign);
                                        auto blk = x->new_ptr<Block_t>();
-                                        blk->statements.push_back(stmt);
+                                        blk->statementOrComments.push_back(stmt);
                                        newBlock.set(blk);
                                }
                                if (!globals.empty()) {
@@ -4205,15 +4452,21 @@ private:
        std::optional<std::pair<std::string, str_list>> upValueFuncFromExp(Exp_t* exp, str_list* ensureArgListInTheEnd, bool blockRewrite) {
                if (checkUpValueFuncAvailable(exp)) {
-                        auto returnNode = exp->new_ptr<Return_t>();
-                        returnNode->explicitReturn = false;
-                        auto returnList = exp->new_ptr<ExpListLow_t>();
-                        returnList->exprs.push_back(exp);
-                        returnNode->valueList.set(returnList);
                        auto block = exp->new_ptr<Block_t>();
+                        if (auto sVal = simpleSingleValueFrom(exp)) {
+                                if (auto doNode = sVal->value.as<Do_t>()) {
+                                        if (auto blk = doNode->body->content.as<Block_t>()) {
+                                                block->statementOrComments.dup(blk->statementOrComments);
+                                        } else {
+                                                block->statementOrComments.push_back(doNode->body->content.to<Statement_t>());
+                                        }
+                                        return getUpValueFuncFromBlock(block, ensureArgListInTheEnd, false, blockRewrite);
+                                }
+                        }
+                        auto returnNode = newReturn(exp);
                        auto stmt = exp->new_ptr<Statement_t>();
                        stmt->content.set(returnNode);
-                        block->statements.push_back(stmt);
+                        block->statementOrComments.push_back(stmt);
                        return getUpValueFuncFromBlock(block, ensureArgListInTheEnd, false, blockRewrite);
                }
                return std::nullopt;
@@ -4270,7 +4523,7 @@ private:
                                bool extraScope = !currentScope().lastStatement;
                                if (forAssignment) {
                                        if (extraScope) {
-                                                temp.push_back(indent() + "do"s + nll(x));
+                                                temp.push_back(indent() + "do"s + nl(x));
                                                pushScope();
                                        }
                                }
@@ -4287,26 +4540,24 @@ private:
                        return false;
                };
                switch (usage) {
-                        case ExpUsage::Common: YUEE("AST node mismatch", x); return;
+                        case ExpUsage::Common:
+                                YUEE("AST node mismatch", x);
+                                return;
                        case ExpUsage::Return:
                        case ExpUsage::Closure: {
                                prepareValue();
-                                _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nll(x);
+                                _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nl(x);
-                                _buf << indent(1) << "return "s << objVar << nll(x);
+                                _buf << indent(1) << "return "s << objVar << nl(x);
-                                _buf << indent() << "else"s << nll(x);
+                                _buf << indent() << "else"s << nl(x);
                                temp.push_back(clearBuf());
-                                auto ret = x->new_ptr<Return_t>();
-                                ret->explicitReturn = false;
-                                auto retList = x->new_ptr<ExpListLow_t>();
-                                retList->exprs.push_back(exp->nilCoalesed);
-                                ret->valueList.set(retList);
                                incIndentOffset();
+                                auto ret = newReturn(exp->nilCoalesed);
                                transformReturn(ret, temp);
                                decIndentOffset();
-                                temp.push_back(indent() + "end"s + nll(x));
+                                temp.push_back(indent() + "end"s + nl(x));
                                if (usage == ExpUsage::Closure) {
                                        popScope();
-                                        *funcStart = anonFuncStart() + nll(x);
+                                        *funcStart = anonFuncStart() + nl(x);
                                        temp.push_back(indent() + anonFuncEnd());
                                        popAnonVarArg();
                                        popFunctionScope();
@@ -4323,14 +4574,14 @@ private:
                                        assign->values.push_back(exp);
                                        temp.push_back(getPreDefineLine(assignment));
                                        extraScope = prepareValue(true);
-                                        _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nll(x);
+                                        _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nl(x);
                                        temp.push_back(clearBuf());
                                        pushScope();
                                        assign->values.clear();
                                        assign->values.push_back(toAst<Exp_t>(objVar, x));
                                        transformAssignment(assignment, temp);
                                        popScope();
-                                        temp.push_back(indent() + "else"s + nll(x));
+                                        temp.push_back(indent() + "else"s + nl(x));
                                        assign->values.clear();
                                        assign->values.push_back(exp->nilCoalesed);
                                } else {
@@ -4338,17 +4589,17 @@ private:
                                        assign->values.push_back(exp->nilCoalesed);
                                        temp.push_back(getPreDefineLine(assignment));
                                        transformExp(left, temp, ExpUsage::Closure);
-                                        _buf << indent() << "if "sv << temp.back() << " == nil then"sv << nll(x);
+                                        _buf << indent() << "if "sv << temp.back() << " == nil then"sv << nl(x);
                                        temp.pop_back();
                                        temp.push_back(clearBuf());
                                }
                                pushScope();
                                transformAssignment(assignment, temp);
                                popScope();
-                                temp.push_back(indent() + "end"s + nlr(x));
+                                temp.push_back(indent() + "end"s + nl(x));
                                if (extraScope) {
                                        popScope();
-                                        temp.push_back(indent() + "end"s + nlr(x));
+                                        temp.push_back(indent() + "end"s + nl(x));
                                }
                                break;
                        }
@@ -4372,13 +4623,17 @@ private:
                switch (item->get_id()) {
                        case id<Variable_t>(): {
                                transformVariable(static_cast<Variable_t*>(item), out);
-                                if (_config.lintGlobalVariable && accessType != AccessType::None && !isLocal(out.back())) {
+                                if (accessType != AccessType::None) {
-                                        auto key = out.back() + ':' + std::to_string(item->m_begin.m_line) + ':' + std::to_string(item->m_begin.m_col);
+                                        if (_importedGlobal) {
-                                        if (_globals.find(key) == _globals.end()) {
+                                                markGlobalImported(out.back());
-                                                if (accessType == AccessType::Read && _funcLevel > 1) {
+                                        } else if (_config.lintGlobalVariable && !isLocal(out.back())) {
-                                                        accessType = AccessType::Capture;
+                                                auto key = out.back() + ':' + std::to_string(item->m_begin.m_line) + ':' + std::to_string(item->m_begin.m_col);
+                                                if (_globals.find(key) == _globals.end()) {
+                                                        if (accessType == AccessType::Read && _funcLevel > 1) {
+                                                                accessType = AccessType::Capture;
+                                                        }
+                                                        _globals[key] = {out.back(), item->m_begin.m_line, item->m_begin.m_col, accessType, isSolidDefined(out.back())};
                                                }
-                                                _globals[key] = {out.back(), item->m_begin.m_line, item->m_begin.m_col, accessType};
                                        }
                                }
                                break;
@@ -4410,6 +4665,7 @@ private:
                        case id<ForEach_t>(): transformForEachClosure(static_cast<ForEach_t*>(value), out); break;
                        case id<For_t>(): transformForClosure(static_cast<For_t*>(value), out); break;
                        case id<While_t>(): transformWhileClosure(static_cast<While_t*>(value), out); break;
+                        case id<Repeat_t>(): transformRepeatClosure(static_cast<Repeat_t*>(value), out); break;
                        case id<Do_t>(): transformDo(static_cast<Do_t*>(value), out, ExpUsage::Closure); break;
                        case id<Try_t>(): transformTry(static_cast<Try_t*>(value), out, ExpUsage::Closure); break;
                        case id<UnaryValue_t>(): transformUnaryValue(static_cast<UnaryValue_t*>(value), out); break;
@@ -4446,23 +4702,21 @@ private:
                                switch (content->get_id()) {
                                        case id<Block_t>(): {
                                                auto block = static_cast<Block_t*>(content);
-                                                newBlock->statements.dup(block->statements);
+                                                newBlock->statementOrComments.dup(block->statementOrComments);
                                                break;
                                        }
                                        case id<Statement_t>(): {
-                                                newBlock->statements.push_back(content);
+                                                newBlock->statementOrComments.push_back(content);
                                                break;
                                        }
                                        default: YUEE("AST node mismatch", content); break;
                                }
                        }
-                        if (funLit->defaultReturn.is<ExpListLow_t>()) {
+                        if (auto defaultReturn = funLit->defaultReturn.as<ExpList_t>()) {
-                                auto returnNode = newBlock->new_ptr<Return_t>();
+                                auto returnNode = newReturn(defaultReturn);
-                                returnNode->explicitReturn = false;
-                                returnNode->valueList.set(funLit->defaultReturn);
                                auto stmt = newBlock->new_ptr<Statement_t>();
                                stmt->content.set(returnNode);
-                                newBlock->statements.push_back(stmt);
+                                newBlock->statementOrComments.push_back(stmt);
                        }
                        transformBlock(newBlock, temp, ExpUsage::Common);
                } else {
@@ -4484,7 +4738,7 @@ private:
                        }
                        _buf << args << ')';
                        if (!initArgs.empty() || !bodyCodes.empty()) {
-                                _buf << nlr(argsDef) << initArgs << bodyCodes;
+                                _buf << nl(argsDef) << initArgs << bodyCodes;
                                popScope();
                                _buf << indent() << "end"sv;
                        } else {
@@ -4495,7 +4749,7 @@ private:
                        auto& bodyCodes = temp.back();
                        _buf << "function("sv << (isFatArrow ? "self"s : Empty) << ')';
                        if (!bodyCodes.empty()) {
-                                _buf << nll(funLit) << bodyCodes;
+                                _buf << nl(funLit) << bodyCodes;
                                popScope();
                                _buf << indent() << "end"sv;
                        } else {
@@ -4512,7 +4766,7 @@ private:
                auto x = body;
                if (auto stmt = body->content.as<Statement_t>()) {
                        auto block = x->new_ptr<Block_t>();
-                        block->statements.push_back(stmt);
+                        block->statementOrComments.push_back(stmt);
                        transformBlock(block, out, usage, assignList);
                } else {
                        transformBlock(body->content.to<Block_t>(), out, usage, assignList);
@@ -4524,13 +4778,15 @@ private:
                        out.push_back(Empty);
                        return;
                }
-                const auto& nodes = block->statements.objects();
+                const auto& nodes = block->statementOrComments.objects();
+                auto lastStmt = lastStatementFrom(nodes);
                LocalMode mode = LocalMode::None;
                Local_t *any = nullptr, *capital = nullptr;
                for (auto it = nodes.begin(); it != nodes.end(); ++it) {
                        auto node = *it;
-                        auto stmt = static_cast<Statement_t*>(node);
+                        auto stmt = ast_cast<Statement_t>(node);
-                        if (!stmt->appendix && stmt->content.is<Return_t>() && stmt != nodes.back()) {
+                        if (!stmt) continue;
+                        if (!stmt->appendix && stmt->content.is<Return_t>() && stmt != lastStmt) {
                                throw CompileError("'return' statement must be the last line in the block"sv, stmt->content);
                        } else if (auto pipeBody = stmt->content.as<PipeBody_t>()) {
                                auto x = stmt;
@@ -4539,6 +4795,16 @@ private:
                                BREAK_IF(it == nodes.begin());
                                auto last = it;
                                --last;
+                                bool found = true;
+                                while (!ast_is<Statement_t>(*last)) {
+                                        if (last == nodes.begin()) {
+                                                found = false;
+                                                break;
+                                        } else {
+                                                --last;
+                                        }
+                                }
+                                BREAK_IF(!found);
                                auto lst = static_cast<Statement_t*>(*last);
                                if (lst->appendix) {
                                        throw CompileError("statement decorator must be placed at the end of pipe chain"sv, lst->appendix.get());
@@ -4556,9 +4822,17 @@ private:
                                stmt->content.set(nullptr);
                                auto next = it;
                                ++next;
+                                Statement_t* nextStmt = nullptr;
+                                while (next != nodes.end()) {
+                                        nextStmt = ast_cast<Statement_t>(*next);
+                                        if (nextStmt) {
+                                                break;
+                                        }
+                                        ++next;
+                                }
                                BLOCK_START
-                                BREAK_IF(next == nodes.end());
+                                BREAK_IF(!nextStmt);
-                                BREAK_IF(!static_cast<Statement_t*>(*next)->content.as<PipeBody_t>());
+                                BREAK_IF(!nextStmt->content.as<PipeBody_t>());
                                throw CompileError("indent mismatch in pipe chain"sv, *next);
                                BLOCK_END
                        } else if (auto backcall = stmt->content.as<Backcall_t>()) {
@@ -4566,7 +4840,7 @@ private:
                                auto newBlock = x->new_ptr<Block_t>();
                                if (it != nodes.begin()) {
                                        for (auto i = nodes.begin(); i != it; ++i) {
-                                                newBlock->statements.push_back(*i);
+                                                newBlock->statementOrComments.push_back(*i);
                                        }
                                }
                                x = backcall;
@@ -4577,7 +4851,7 @@ private:
                                        ++next;
                                        if (next != nodes.end()) {
                                                for (auto i = next; i != nodes.end(); ++i) {
-                                                        block->statements.push_back(*i);
+                                                        block->statementOrComments.push_back(*i);
                                                }
                                        }
                                        auto body = x->new_ptr<Body_t>();
@@ -4629,7 +4903,7 @@ private:
                                        expListAssign->expList.set(expList);
                                        newStmt->content.set(expListAssign);
                                        newStmt->appendix.set(stmt->appendix);
-                                        newBlock->statements.push_back(newStmt);
+                                        newBlock->statementOrComments.push_back(newStmt);
                                }
                                transformBlock(newBlock, out, usage, assignList, isRoot);
                                return;
@@ -4656,7 +4930,7 @@ private:
                                                        throw CompileError("while-loop line decorator is not supported here"sv, appendix->item.get());
                                                        break;
                                                }
-                                                case id<CompInner_t>(): {
+                                                case id<CompFor_t>(): {
                                                        throw CompileError("for-loop line decorator is not supported here"sv, appendix->item.get());
                                                        break;
                                                }
@@ -4685,7 +4959,7 @@ private:
                                auto newBlock = x->new_ptr<Block_t>();
                                if (it != nodes.begin()) {
                                        for (auto i = nodes.begin(); i != it; ++i) {
-                                                newBlock->statements.push_back(*i);
+                                                newBlock->statementOrComments.push_back(*i);
                                        }
                                }
                                x = expListAssign;
@@ -4695,7 +4969,7 @@ private:
                                        ++next;
                                        if (next != nodes.end()) {
                                                for (auto i = next; i != nodes.end(); ++i) {
-                                                        followingBlock->statements.push_back(*i);
+                                                        followingBlock->statementOrComments.push_back(*i);
                                                }
                                        }
                                }
@@ -4723,17 +4997,13 @@ private:
                                        newAssignment->action.set(newAssign);
                                        auto newStatement = x->new_ptr<Statement_t>();
                                        newStatement->content.set(newAssignment);
-                                        followingBlock->statements.push_front(newStatement);
+                                        followingBlock->statementOrComments.push_front(newStatement);
                                }
                                argNames.push_back("..."s);
                                auto newBody = x->new_ptr<Body_t>();
                                newBody->content.set(followingBlock);
                                {
-                                        auto doNode = x->new_ptr<Do_t>();
+                                        if (auto result = upValueFuncFromBlock(followingBlock.get(), &argNames, false, true)) {
-                                        doNode->body.set(newBody);
-                                        auto simpleValue = x->new_ptr<SimpleValue_t>();
-                                        simpleValue->value.set(doNode);
-                                        if (auto result = upValueFuncFromExp(newExp(simpleValue, x), &argNames, true)) {
                                                auto [funcName, args] = std::move(*result);
                                                str_list finalArgs;
                                                for (const auto& arg : args) {
@@ -4741,9 +5011,14 @@ private:
                                                                finalArgs.push_back(arg);
                                                        }
                                                }
-                                                newBlock->statements.push_back(toAst<Statement_t>(funcName + ' ' + join(finalArgs, ","sv), x));
+                                                auto lastNewStmt = toAst<Statement_t>(funcName + ' ' + (finalArgs.empty() ? "nil"s : join(finalArgs, ","sv)), x);
-                                                auto sVal = singleValueFrom(static_cast<Statement_t*>(newBlock->statements.back())->content.to<ExpListAssign_t>()->expList);
+                                                newBlock->statementOrComments.push_back(lastNewStmt);
-                                                ast_to<InvokeArgs_t>(sVal->item.to<ChainValue_t>()->items.back())->args.dup(newInvoke->args);
+                                                auto sVal = singleValueFrom(lastNewStmt->content.to<ExpListAssign_t>()->expList);
+                                                auto invokArgs = ast_to<InvokeArgs_t>(sVal->item.to<ChainValue_t>()->items.back());
+                                                if (finalArgs.empty()) {
+                                                        invokArgs->args.clear();
+                                                }
+                                                invokArgs->args.dup(newInvoke->args);
                                                transformBlock(newBlock, out, usage, assignList, isRoot);
                                                return;
                                        }
@@ -4768,7 +5043,7 @@ private:
                                newItemListAssign->expList.set(newItemList);
                                auto newItemStatement = x->new_ptr<Statement_t>();
                                newItemStatement->content.set(newItemListAssign);
-                                newBlock->statements.push_back(newItemStatement);
+                                newBlock->statementOrComments.push_back(newItemStatement);
                                transformBlock(newBlock, out, usage, assignList, isRoot);
                                return;
                                BLOCK_END
@@ -4777,11 +5052,11 @@ private:
                                auto newBlock = x->new_ptr<Block_t>();
                                if (it != nodes.begin()) {
                                        for (auto i = nodes.begin(); i != it; ++i) {
-                                                newBlock->statements.push_back(*i);
+                                                newBlock->statementOrComments.push_back(*i);
                                        }
                                }
                                localAttrib->attrib.set(localAttrib->new_ptr<ConstAttrib_t>());
-                                newBlock->statements.push_back(*it);
+                                newBlock->statementOrComments.push_back(*it);
                                x = localAttrib;
                                auto followingBlock = x->new_ptr<Block_t>();
                                {
@@ -4789,7 +5064,7 @@ private:
                                        ++next;
                                        if (next != nodes.end()) {
                                                for (auto i = next; i != nodes.end(); ++i) {
-                                                        followingBlock->statements.push_back(*i);
+                                                        followingBlock->statementOrComments.push_back(*i);
                                                }
                                        }
                                }
@@ -4811,13 +5086,44 @@ private:
                                auto value = singleValueFrom(pCallExp);
                                value->item.to<SimpleValue_t>()->value.to<Try_t>()->func.set(followingBlock);
                                for (const auto& stmt : getCloses) {
-                                        newBlock->statements.push_back(toAst<Statement_t>(stmt, x));
+                                        newBlock->statementOrComments.push_back(toAst<Statement_t>(stmt, x));
                                }
-                                newBlock->statements.push_back(pCallStmt);
+                                newBlock->statementOrComments.push_back(pCallStmt);
                                for (const auto& stmt : doCloses) {
-                                        newBlock->statements.push_back(toAst<Statement_t>(stmt, x));
+                                        newBlock->statementOrComments.push_back(toAst<Statement_t>(stmt, x));
+                                }
+                                newBlock->statementOrComments.push_back(toAst<Statement_t>("if "s + okVar + " then return ... else error ..."s, x));
+                                transformBlock(newBlock, out, usage, assignList, isRoot);
+                                return;
+                        } else if (auto expListAssign = stmt->content.as<ExpListAssign_t>();
+                                expListAssign && expListAssign->action && expListAssign->action.is<SubBackcall_t>()) {
+                                auto x = *nodes.begin();
+                                auto newBlock = x->new_ptr<Block_t>();
+                                if (it != nodes.begin()) {
+                                        for (auto i = nodes.begin(); i != it; ++i) {
+                                                newBlock->statementOrComments.push_back(*i);
+                                        }
+                                }
+                                auto doBackcall = static_cast<SubBackcall_t*>(expListAssign->action.get());
+                                auto backcall = expListAssign->new_ptr<Backcall_t>();
+                                auto argsDef = backcall->new_ptr<FnArgsDef_t>();
+                                try {
+                                        auto defList = toAst<FnArgDefList_t>(YueFormat{}.toString(expListAssign->expList), expListAssign->expList);
+                                        argsDef->defList.set(defList);
+                                } catch (const std::exception&) {
+                                        throw CompileError("backcall syntax error", backcall);
+                                }
+                                backcall->argsDef.set(argsDef);
+                                backcall->arrow.set(doBackcall->arrow);
+                                backcall->value.set(doBackcall->value);
+                                auto newStmt = backcall->new_ptr<Statement_t>();
+                                newStmt->content.set(backcall);
+                                newStmt->appendix.set(stmt->appendix);
+                                newBlock->statementOrComments.push_back(newStmt);
+                                auto ait = it;
+                                for (auto i = ++ait; i != nodes.end(); ++i) {
+                                        newBlock->statementOrComments.push_back(*i);
                                }
-                                newBlock->statements.push_back(toAst<Statement_t>("if "s + okVar + " then return ... else error ..."s, x));
                                transformBlock(newBlock, out, usage, assignList, isRoot);
                                return;
                        }
@@ -4928,7 +5234,7 @@ private:
                        }
                }
                if (isRoot && !_info.moduleName.empty() && !_info.exportMacro) {
-                        block->statements.push_front(toAst<Statement_t>(_info.moduleName + (_info.exportDefault ? "=nil"s : (_info.exportMetatable ? "=<>:{}"s : "={}"s)), block));
+                        block->statementOrComments.push_front(toAst<Statement_t>(_info.moduleName + (_info.exportDefault ? "=nil"s : (_info.exportMetatable ? "=<>:{}"s : "={}"s)), block));
                }
                switch (usage) {
                        case ExpUsage::Closure:
@@ -4941,11 +5247,9 @@ private:
                                auto expList = expListFrom(last);
                                BREAK_IF(!expList);
                                BREAK_IF(last->appendix && !last->appendix->item.is<IfLine_t>());
-                                auto expListLow = x->new_ptr<ExpListLow_t>();
-                                expListLow->exprs.dup(expList->exprs);
                                auto returnNode = x->new_ptr<Return_t>();
                                returnNode->explicitReturn = false;
-                                returnNode->valueList.set(expListLow);
+                                returnNode->valueList.set(expList);
                                returnNode->allowBlockMacroReturn = true;
                                last->content.set(returnNode);
                                BLOCK_END
@@ -4965,7 +5269,7 @@ private:
                                                        break;
                                        }
                                }
-                                bool lastAssignable = (expListFrom(last) || ast_is<For_t, ForEach_t, While_t>(last->content));
+                                bool lastAssignable = (expListFrom(last) || ast_is<For_t, While_t>(last->content));
                                if (lastAssignable) {
                                        auto x = last;
                                        auto newAssignment = x->new_ptr<ExpListAssign_t>();
@@ -4990,45 +5294,88 @@ private:
                }
                if (!nodes.empty()) {
                        str_list temp;
+                        auto lastStmt = lastStatementFrom(nodes);
                        for (auto node : nodes) {
-                                currentScope().lastStatement = (node == nodes.back()) && currentScope().mode == GlobalMode::None;
+                                if (auto comment = ast_cast<YueComment_t>(node)) {
-                                transformStatement(static_cast<Statement_t*>(node), temp);
+                                        transformComment(comment, temp);
-                                if (isRoot && !_rootDefs.empty()) {
+                                        continue;
-                                        auto last = std::move(temp.back());
+                                }
-                                        temp.pop_back();
+                                if (!ast_is<Statement_t>(node)) {
-                                        temp.insert(temp.end(), _rootDefs.begin(), _rootDefs.end());
+                                        continue;
-                                        _rootDefs.clear();
+                                }
-                                        temp.push_back(std::move(last));
+                                auto transformNode = [&]() {
-                                }
+                                        currentScope().lastStatement = (node == lastStmt) && currentScope().mode == GlobalMode::None;
-                                if (!temp.empty() && _parser.startWith<StatementSep_t>(temp.back())) {
+                                        auto stmt = static_cast<Statement_t*>(node);
-                                        auto rit = ++temp.rbegin();
+                                        if (auto importNode = stmt->content.as<Import_t>();
-                                        if (rit != temp.rend() && !rit->empty()) {
+                                                importNode && importNode->content.is<ImportAllGlobal_t>()) {
-                                                auto index = std::string::npos;
+                                                if (_importedGlobal) {
-                                                if (_config.reserveLineNumber) {
+                                                        throw CompileError("import global redeclared in same scope"sv, importNode);
-                                                        index = rit->rfind(" -- "sv);
                                                } else {
-                                                        index = rit->find_last_not_of('\n');
+                                                        auto& scope = currentScope();
-                                                        if (index != std::string::npos) index++;
+                                                        scope.importedGlobal = std::make_unique<ImportedGlobal>();
-                                                }
+                                                        _importedGlobal = scope.importedGlobal.get();
-                                                if (index != std::string::npos) {
+                                                        _importedGlobal->vars = scope.vars.get();
-                                                        auto ending = rit->substr(0, index);
+                                                        _importedGlobal->indent = indent();
-                                                        auto ind = ending.find_last_of(" \t\n"sv);
+                                                        _importedGlobal->nl = nl(stmt);
-                                                        if (ind != std::string::npos) {
+                                                        _importedGlobal->globalCodeLine = &temp.emplace_back();
-                                                                ending = ending.substr(ind + 1);
+                                                }
+                                        } else {
+                                                transformStatement(stmt, temp);
+                                        }
+                                        if (isRoot && !_rootDefs.empty()) {
+                                                auto last = std::move(temp.back());
+                                                temp.pop_back();
+                                                temp.insert(temp.end(), _rootDefs.begin(), _rootDefs.end());
+                                                _rootDefs.clear();
+                                                temp.push_back(std::move(last));
+                                        }
+                                        if (!temp.empty() && _parser.startWith<StatementSep_t>(temp.back())) {
+                                                auto rit = ++temp.rbegin();
+                                                if (rit != temp.rend() && !rit->empty()) {
+                                                        auto index = std::string::npos;
+                                                        if (_config.reserveLineNumber) {
+                                                                index = rit->rfind(" -- "sv);
+                                                        } else {
+                                                                index = rit->find_last_not_of('\n');
+                                                                if (index != std::string::npos) index++;
                                                        }
-                                                        if (LuaKeywords.find(ending) == LuaKeywords.end()) {
+                                                        if (index != std::string::npos) {
-                                                                rit->insert(index, ";"sv);
+                                                                auto ending = rit->substr(0, index);
+                                                                auto ind = ending.find_last_of(" \t\n"sv);
+                                                                if (ind != std::string::npos) {
+                                                                        ending = ending.substr(ind + 1);
+                                                                }
+                                                                if (LuaKeywords.find(ending) == LuaKeywords.end()) {
+                                                                        rit->insert(index, ";"sv);
+                                                                }
                                                        }
                                                }
                                        }
+                                };
+                                if (_config.lax) {
+                                        try {
+                                                transformNode();
+                                        } catch (const CompileError&) { }
+                                } else {
+                                        transformNode();
                                }
                        }
+                        if (auto importedGlobal = currentScope().importedGlobal.get()) {
+                                int target = getLuaTarget(block);
+                                auto attrib = target >= 504 ? " <const>"s : Empty;
+                                str_list globalCodes;
+                                for (const auto& global : importedGlobal->globalList) {
+                                        globalCodes.emplace_back(importedGlobal->indent + "local "s + global + attrib + " = "s + global + importedGlobal->nl);
+                                }
+                                *importedGlobal->globalCodeLine = join(globalCodes);
+                                _importedGlobal = nullptr;
+                        }
                        out.push_back(join(temp));
                } else {
                        out.push_back(Empty);
                }
                if (isRoot && !_info.moduleName.empty() && !_info.exportMacro) {
-                        out.back().append(indent() + "return "s + _info.moduleName + nlr(block));
+                        out.back().append(indent() + "return "s + _info.moduleName + nl(block));
                }
        }
@@ -5229,18 +5576,29 @@ private:
                auto macroLit = macro->decl.to<MacroLit_t>();
                auto argsDef = macroLit->argsDef.get();
                str_list newArgs;
+                str_list argChecks;
+                bool hasCheck = false;
                if (argsDef) {
                        for (auto def_ : argsDef->definitions.objects()) {
                                auto def = static_cast<FnArgDef_t*>(def_);
                                if (def->name.is<SelfItem_t>()) {
                                        throw CompileError("self name is not supported for macro function argument"sv, def->name);
                                } else {
+                                        if (def->op) throw CompileError("invalid existence checking"sv, def->op);
+                                        if (def->label) {
+                                                hasCheck = true;
+                                                const auto& astName = argChecks.emplace_back(_parser.toString(def->label));
+                                                if (!_parser.hasAST(astName)) {
+                                                        throw CompileError("invalid AST name"sv, def->label);
+                                                }
+                                        } else {
+                                                argChecks.emplace_back();
+                                        }
                                        std::string defVal;
                                        if (def->defaultValue) {
                                                defVal = _parser.toString(def->defaultValue);
                                                Utils::trim(defVal);
-                                                defVal.insert(0, "=[==========["sv);
+                                                defVal = '=' + Utils::toLuaDoubleString(defVal);
-                                                defVal.append("]==========]"sv);
                                        }
                                        newArgs.emplace_back(_parser.toString(def->name) + defVal);
                                }
@@ -5248,6 +5606,14 @@ private:
                        if (argsDef->varArg) {
                                newArgs.emplace_back(_parser.toString(argsDef->varArg));
                        }
+                        if (argsDef->label) {
+                                hasCheck = true;
+                                const auto& astName = _parser.toString(argsDef->label);
+                                if (!_parser.hasAST(astName)) {
+                                        throw CompileError("invalid AST name"sv, argsDef->label);
+                                }
+                                argChecks.emplace_back("..."s + astName);
+                        }
                }
                std::string macroCodes = "_ENV=require('yue').macro_env\n("s + join(newArgs, ","sv) + ")->"s + _parser.toString(macroLit->body);
                auto chunkName = "=(macro "s + macroName + ')';
@@ -5278,6 +5644,24 @@ private:
                        throw CompileError("failed to generate macro function\n"s + err, macroLit);
                } // cur true macro
                lua_remove(L, -2); // cur macro
+                if (hasCheck) {
+                        lua_createtable(L, 0, 0); // cur macro checks
+                        int i = 1;
+                        for (const auto& check : argChecks) {
+                                if (check.empty()) {
+                                        lua_pushboolean(L, 0);
+                                        lua_rawseti(L, -2, i);
+                                } else {
+                                        lua_pushlstring(L, check.c_str(), check.size());
+                                        lua_rawseti(L, -2, i);
+                                }
+                                i++;
+                        }
+                        lua_createtable(L, 2, 0); // cur macro checks macrotab
+                        lua_insert(L, -3); // cur macrotab macro checks
+                        lua_rawseti(L, -3, 1); // macrotab[1] = checks, cur macrotab macro
+                        lua_rawseti(L, -2, 2); // macrotab[2] = macro, cur macrotab
+                } // cur macro
                if (exporting && _config.exporting && !_config.module.empty()) {
                        pushModuleTable(_config.module); // cur macro module
                        lua_pushlstring(L, macroName.c_str(), macroName.size()); // cur macro module name
@@ -5310,7 +5694,7 @@ private:
                        if (!target) target = returnNode;
                        throw CompileError("explicit return statement is not allowed in this context"sv, target);
                }
-                if (auto valueList = returnNode->valueList.as<ExpListLow_t>()) {
+                if (auto valueList = returnNode->valueList.as<ExpList_t>()) {
                        if (valueList->exprs.size() == 1) {
                                auto exp = static_cast<Exp_t*>(valueList->exprs.back());
                                if (isPurePipeChain(exp)) {
@@ -5352,11 +5736,11 @@ private:
                                                case id<While_t>():
                                                        transformWhileInPlace(static_cast<While_t*>(value), out);
                                                        return;
-                                                case id<For_t>():
+                                                case id<Repeat_t>():
-                                                        transformForInPlace(static_cast<For_t*>(value), out);
+                                                        transformRepeatInPlace(static_cast<Repeat_t*>(value), out);
                                                        return;
-                                                case id<ForEach_t>():
+                                                case id<For_t>():
-                                                        transformForEachInPlace(static_cast<ForEach_t*>(value), out);
+                                                        transformForInPlace(static_cast<For_t*>(value), out, nullptr);
                                                        return;
                                                case id<If_t>():
                                                        transformIf(static_cast<If_t*>(value), out, ExpUsage::Return);
@@ -5376,12 +5760,12 @@ private:
                                        }
                                }
                                transformValue(singleValue, out);
-                                out.back() = indent() + "return "s + out.back() + nlr(returnNode);
+                                out.back() = indent() + "return "s + out.back() + nl(returnNode);
                                return;
                        } else {
                                str_list temp;
-                                transformExpListLow(valueList, temp);
+                                transformExpList(valueList, temp);
-                                out.push_back(indent() + "return "s + temp.back() + nlr(returnNode));
+                                out.push_back(indent() + "return "s + temp.back() + nl(returnNode));
                        }
                } else if (auto tableBlock = returnNode->valueList.as<TableBlock_t>()) {
                        const auto& values = tableBlock->values.objects();
@@ -5389,10 +5773,10 @@ private:
                                transformSpreadTable(values, out, ExpUsage::Return, nullptr, false);
                        } else {
                                transformTable(values, out);
-                                out.back() = indent() + "return "s + out.back() + nlr(returnNode);
+                                out.back() = indent() + "return "s + out.back() + nl(returnNode);
                        }
                } else {
-                        out.push_back(indent() + "return"s + nll(returnNode));
+                        out.push_back(indent() + "return"s + nl(returnNode));
                }
        }
@@ -5423,6 +5807,7 @@ private:
                        bool checkExistence = false;
                        std::string name;
                        std::string assignSelf;
+                        ast_ptr<false, ExpListAssign_t> assignment;
                };
                std::list<ArgItem> argItems;
                str_list temp;
@@ -5432,7 +5817,11 @@ private:
                        auto def = static_cast<FnArgDef_t*>(_def);
                        auto& arg = argItems.emplace_back();
                        switch (def->name->get_id()) {
-                                case id<Variable_t>(): arg.name = variableToString(static_cast<Variable_t*>(def->name.get())); break;
+                                case id<Variable_t>(): {
+                                        if (def->op) throw CompileError("invalid existence checking"sv, def->op);
+                                        arg.name = variableToString(static_cast<Variable_t*>(def->name.get()));
+                                        break;
+                                }
                                case id<SelfItem_t>(): {
                                        assignSelf = true;
                                        if (def->op) {
@@ -5473,6 +5862,22 @@ private:
                                        }
                                        break;
                                }
+                                case id<TableLit_t>(): {
+                                        arg.name = getUnusedName("_arg_"sv);
+                                        auto simpleValue = def->new_ptr<SimpleValue_t>();
+                                        simpleValue->value.set(def->name);
+                                        auto asmt = assignmentFrom(newExp(simpleValue, def), toAst<Exp_t>(arg.name, def), def);
+                                        arg.assignment = asmt;
+                                        break;
+                                }
+                                case id<SimpleTable_t>(): {
+                                        arg.name = getUnusedName("_arg_"sv);
+                                        auto value = def->new_ptr<Value_t>();
+                                        value->item.set(def->name);
+                                        auto asmt = assignmentFrom(newExp(value, def), toAst<Exp_t>(arg.name, def), def);
+                                        arg.assignment = asmt;
+                                        break;
+                                }
                                default: YUEE("AST node mismatch", def->name.get()); break;
                        }
                        forceAddToScope(arg.name);
@@ -5486,23 +5891,46 @@ private:
                                assignment->action.set(assign);
                                transformAssignment(assignment, temp);
                                popScope();
-                                _buf << indent() << "if "sv << arg.name << " == nil then"sv << nll(def);
+                                _buf << indent() << "if "sv << arg.name << " == nil then"sv << nl(def);
                                _buf << temp.back();
-                                _buf << indent() << "end"sv << nll(def);
+                                _buf << indent() << "end"sv << nl(def);
                                temp.back() = clearBuf();
                        }
-                        if (varNames.empty())
+                        if (arg.assignment) {
+                                auto names = getArgDestructureList(arg.assignment);
+                                for (const auto& name : names) {
+                                        forceAddToScope(name);
+                                }
+                                temp.emplace_back(indent() + "local "s + join(names, ", "sv) + nl(def));
+                                transformAssignment(arg.assignment, temp);
+                        }
+                        if (varNames.empty()) {
                                varNames = arg.name;
-                        else
+                        } else {
                                varNames.append(", "s + arg.name);
+                        }
                }
                if (argDefList->varArg) {
+                        std::string varStr;
+                        if (auto varName = argDefList->varArg->name.get()) {
+                                varStr = variableToString(varName);
+                                int target = getLuaTarget(varName);
+                                forceAddToScope(varStr);
+                                if (target < 505) {
+                                        temp.push_back(indent() + "local "s + varStr + " = {"s + nl(varName));
+                                        temp.push_back(indent(1) + "n = "s + globalVar("select", varName, AccessType::Read) + "(\"#\", ...),"s + nl(varName));
+                                        temp.push_back(indent(1) + "..."s + nl(varName));
+                                        temp.push_back(indent() + '}' + nl(varName));
+                                        varStr.clear();
+                                }
+                        }
                        auto& arg = argItems.emplace_back();
                        arg.name = "..."sv;
-                        if (varNames.empty())
+                        if (varNames.empty()) {
-                                varNames = arg.name;
+                                varNames = arg.name + varStr;
-                        else
+                        } else {
-                                varNames.append(", "s + arg.name);
+                                varNames.append(", "s + arg.name + varStr);
+                        }
                        _varArgs.top().hasVar = true;
                }
                if (assignSelf) {
@@ -5571,6 +5999,45 @@ private:
                }
        }
+        bool transformChainEndWithSlice(const node_container& chainList, str_list& out, ExpUsage usage, ExpList_t* assignList) {
+                auto x = chainList.front();
+                if (ast_is<Slice_t>(chainList.back())) {
+                        auto comp = x->new_ptr<Comprehension_t>();
+                        {
+                                auto chainValue = x->new_ptr<ChainValue_t>();
+                                for (auto item : chainList) {
+                                        chainValue->items.push_back(item);
+                                }
+                                auto itemVar = getUnusedName("_item_"sv);
+                                auto expCode = YueFormat{}.toString(chainValue);
+                                auto compCode = '[' + itemVar + " for "s + itemVar + " in *"s + expCode + ']';
+                                comp.set(toAst<Comprehension_t>(compCode, x));
+                        }
+                        switch (usage) {
+                                case ExpUsage::Assignment: {
+                                        auto simpleValue = x->new_ptr<SimpleValue_t>();
+                                        simpleValue->value.set(comp);
+                                        auto exp = newExp(simpleValue, x);
+                                        auto assignment = x->new_ptr<ExpListAssign_t>();
+                                        assignment->expList.set(assignList);
+                                        auto assign = x->new_ptr<Assign_t>();
+                                        assign->values.push_back(exp);
+                                        assignment->action.set(assign);
+                                        transformAssignment(assignment, out);
+                                        break;
+                                }
+                                case ExpUsage::Return:
+                                        transformComprehension(comp, out, ExpUsage::Return);
+                                        break;
+                                default:
+                                        transformComprehension(comp, out, ExpUsage::Closure);
+                                        break;
+                        }
+                        return true;
+                }
+                return false;
+        }
        bool transformChainEndWithEOP(const node_container& chainList, str_list& out, ExpUsage usage, ExpList_t* assignList) {
                auto x = chainList.front();
                if (ast_is<ExistentialOp_t>(chainList.back())) {
@@ -5605,7 +6072,7 @@ private:
                                case ExpUsage::Return:
                                        transformParens(parens, out);
                                        out.back().insert(0, indent() + "return "s);
-                                        out.back().append(nlr(x));
+                                        out.back().append(nl(x));
                                        break;
                                default:
                                        transformParens(parens, out);
@@ -5676,7 +6143,7 @@ private:
                                        }
                                }
                                if (isScoped) {
-                                        temp.push_back(indent() + "do"s + nll(x));
+                                        temp.push_back(indent() + "do"s + nl(x));
                                        pushScope();
                                }
                                objVar = getUnusedName("_obj_"sv);
@@ -5736,9 +6203,9 @@ private:
                                _buf << typeVar << "=type "sv << objVar;
                                auto typeAssign = toAst<ExpListAssign_t>(clearBuf(), partOne);
                                transformAssignment(typeAssign, temp);
-                                _buf << indent() << "if \"table\" == " << typeVar << " or \"userdata\" == "sv << typeVar << " then"sv << nll(x);
+                                _buf << indent() << "if \"table\" == " << typeVar << " or \"userdata\" == "sv << typeVar << " then"sv << nl(x);
                        } else {
-                                _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nll(x);
+                                _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nl(x);
                        }
                        temp.push_back(clearBuf());
                        pushScope();
@@ -5764,25 +6231,21 @@ private:
                                case ExpUsage::Return:
                                case ExpUsage::Closure: {
                                        auto exp = newExp(partTwo, x);
-                                        auto ret = x->new_ptr<Return_t>();
+                                        auto ret = newReturn(exp);
-                                        ret->explicitReturn = false;
-                                        auto expListLow = x->new_ptr<ExpListLow_t>();
-                                        expListLow->exprs.push_back(exp);
-                                        ret->valueList.set(expListLow);
                                        transformReturn(ret, temp);
                                        break;
                                }
                        }
                        popScope();
-                        temp.push_back(indent() + "end"s + nlr(x));
+                        temp.push_back(indent() + "end"s + nl(x));
                        switch (usage) {
                                case ExpUsage::Return:
-                                        temp.push_back(indent() + "return nil"s + nlr(x));
+                                        temp.push_back(indent() + "return nil"s + nl(x));
                                        break;
                                case ExpUsage::Closure:
-                                        temp.push_back(indent() + "return nil"s + nlr(x));
+                                        temp.push_back(indent() + "return nil"s + nl(x));
                                        popScope();
-                                        *funcStart = anonFuncStart() + nll(x);
+                                        *funcStart = anonFuncStart() + nl(x);
                                        temp.push_back(indent() + anonFuncEnd());
                                        popAnonVarArg();
                                        popFunctionScope();
@@ -5792,7 +6255,7 @@ private:
                        }
                        if (isScoped) {
                                popScope();
-                                temp.push_back(indent() + "end"s + nlr(x));
+                                temp.push_back(indent() + "end"s + nl(x));
                        }
                        out.push_back(join(temp));
                        return true;
@@ -5809,7 +6272,7 @@ private:
                        switch (usage) {
                                case ExpUsage::Assignment:
                                        if (isScoped) {
-                                                temp.push_back(indent() + "do"s + nll(x));
+                                                temp.push_back(indent() + "do"s + nl(x));
                                                pushScope();
                                        }
                                        break;
@@ -5863,11 +6326,7 @@ private:
                        switch (usage) {
                                case ExpUsage::Closure:
                                case ExpUsage::Return: {
-                                        auto returnNode = x->new_ptr<Return_t>();
+                                        auto returnNode = newReturn(funLit);
-                                        returnNode->explicitReturn = false;
-                                        auto expListLow = x->new_ptr<ExpListLow_t>();
-                                        expListLow->exprs.push_back(funLit);
-                                        returnNode->valueList.set(expListLow);
                                        transformReturn(returnNode, temp);
                                        break;
                                }
@@ -5887,12 +6346,12 @@ private:
                                case ExpUsage::Assignment:
                                        if (isScoped) {
                                                popScope();
-                                                temp.push_back(indent() + "end"s + nlr(x));
+                                                temp.push_back(indent() + "end"s + nl(x));
                                        }
                                        break;
                                case ExpUsage::Closure:
                                        popScope();
-                                        *funcStart = anonFuncStart() + nll(x);
+                                        *funcStart = anonFuncStart() + nl(x);
                                        temp.push_back(indent() + anonFuncEnd());
                                        popAnonVarArg();
                                        popFunctionScope();
@@ -5968,7 +6427,7 @@ private:
                                                        pushScope();
                                                } else if (usage != ExpUsage::Return) {
                                                        if (isScoped) {
-                                                                temp.push_back(indent() + "do"s + nll(x));
+                                                                temp.push_back(indent() + "do"s + nl(x));
                                                                pushScope();
                                                        }
                                                }
@@ -5998,25 +6457,17 @@ private:
                                                }
                                                switch (usage) {
                                                        case ExpUsage::Closure: {
-                                                                auto returnNode = x->new_ptr<Return_t>();
+                                                                auto returnNode = newReturn(newChainExp);
-                                                                returnNode->explicitReturn = false;
-                                                                auto values = x->new_ptr<ExpListLow_t>();
-                                                                values->exprs.push_back(newChainExp);
-                                                                returnNode->valueList.set(values);
                                                                transformReturn(returnNode, temp);
                                                                popScope();
-                                                                *funcStart = anonFuncStart() + nll(x);
+                                                                *funcStart = anonFuncStart() + nl(x);
                                                                temp.push_back(indent() + anonFuncEnd());
                                                                popAnonVarArg();
                                                                popFunctionScope();
                                                                break;
                                                        }
                                                        case ExpUsage::Return: {
-                                                                auto returnNode = x->new_ptr<Return_t>();
+                                                                auto returnNode = newReturn(newChainExp);
-                                                                returnNode->explicitReturn = false;
-                                                                auto values = x->new_ptr<ExpListLow_t>();
-                                                                values->exprs.push_back(newChainExp);
-                                                                returnNode->valueList.set(values);
                                                                transformReturn(returnNode, temp);
                                                                break;
                                                        }
@@ -6029,7 +6480,7 @@ private:
                                                                transformAssignment(assignment, temp);
                                                                if (isScoped) {
                                                                        popScope();
-                                                                        temp.push_back(indent() + "end"s + nlr(x));
+                                                                        temp.push_back(indent() + "end"s + nl(x));
                                                                }
                                                                break;
                                                        }
@@ -6037,7 +6488,7 @@ private:
                                                                transformExp(newChainExp, temp, usage);
                                                                if (isScoped) {
                                                                        popScope();
-                                                                        temp.push_back(indent() + "end"s + nlr(x));
+                                                                        temp.push_back(indent() + "end"s + nl(x));
                                                                }
                                                                break;
                                                }
@@ -6088,7 +6539,7 @@ private:
                        case id<ColonChainItem_t>():
                        case id<Exp_t>():
                                if (_withVars.empty()) {
-                                        throw CompileError("short dot/colon and indexing syntax must be called within a with block"sv, x);
+                                        throw CompileError("short dot/colon/indexing syntax must be called within a with block"sv, x);
                                } else {
                                        temp.push_back(_withVars.top());
                                }
@@ -6142,7 +6593,7 @@ private:
                                                                assignment->action.set(assign);
                                                                auto stmt = x->new_ptr<Statement_t>();
                                                                stmt->content.set(assignment);
-                                                                block->statements.push_back(stmt);
+                                                                block->statementOrComments.push_back(stmt);
                                                        }
                                                }
                                                ast_ptr<false, Exp_t> nexp;
@@ -6188,7 +6639,7 @@ private:
                                                        expListAssign->expList.set(expList);
                                                        auto stmt = x->new_ptr<Statement_t>();
                                                        stmt->content.set(expListAssign);
-                                                        block->statements.push_back(stmt);
+                                                        block->statementOrComments.push_back(stmt);
                                                }
                                                switch (usage) {
                                                        case ExpUsage::Common:
@@ -6202,7 +6653,7 @@ private:
                                                        default:
                                                                break;
                                                }
-                                                if (block->statements.size() == 1) {
+                                                if (block->statementOrComments.size() == 1) {
                                                        transformExp(nexp, out, usage, assignList);
                                                } else {
                                                        auto body = x->new_ptr<Body_t>();
@@ -6234,6 +6685,120 @@ private:
                                                }
                                                return;
                                        }
+                                        break;
+                                }
+                                case id<ReversedIndex_t>(): {
+                                        auto rIndex = static_cast<ReversedIndex_t*>(*it);
+                                        auto current = it;
+                                        auto prevChain = x->new_ptr<ChainValue_t>();
+                                        for (auto i = chainList.begin(); i != current; ++i) {
+                                                prevChain->items.push_back(*i);
+                                        }
+                                        auto var = singleVariableFrom(prevChain, AccessType::None);
+                                        if (!var.empty() && isLocal(var)) {
+                                                auto indexNode = toAst<Exp_t>('#' + var, rIndex);
+                                                if (rIndex->modifier) {
+                                                        auto opValue = rIndex->new_ptr<ExpOpValue_t>();
+                                                        opValue->op.set(toAst<BinaryOperator_t>("-"sv, rIndex));
+                                                        opValue->pipeExprs.dup(rIndex->modifier->pipeExprs);
+                                                        indexNode->opValues.push_back(opValue);
+                                                        indexNode->opValues.dup(rIndex->modifier->opValues);
+                                                        indexNode->nilCoalesed.set(rIndex->modifier->nilCoalesed);
+                                                }
+                                                prevChain->items.push_back(indexNode);
+                                                auto next = current;
+                                                ++next;
+                                                for (auto i = next; i != chainList.end(); ++i) {
+                                                        prevChain->items.push_back(*i);
+                                                }
+                                                if (usage == ExpUsage::Assignment) {
+                                                        auto assignment = x->new_ptr<ExpListAssign_t>();
+                                                        assignment->expList.set(assignList);
+                                                        auto assign = x->new_ptr<Assign_t>();
+                                                        assign->values.push_back(newExp(prevChain, x));
+                                                        assignment->action.set(assign);
+                                                        transformAssignment(assignment, out);
+                                                        return;
+                                                }
+                                                transformChainValue(prevChain, out, usage, assignList);
+                                                return;
+                                        } else {
+                                                auto itemVar = getUnusedName("_item_"sv);
+                                                auto asmt = assignmentFrom(toAst<Exp_t>(itemVar, x), newExp(prevChain, x), x);
+                                                auto stmt1 = x->new_ptr<Statement_t>();
+                                                stmt1->content.set(asmt);
+                                                auto newChain = x->new_ptr<ChainValue_t>();
+                                                newChain->items.push_back(toAst<Callable_t>(itemVar, x));
+                                                auto indexNode = toAst<Exp_t>('#' + itemVar, rIndex);
+                                                if (rIndex->modifier) {
+                                                        auto opValue = rIndex->new_ptr<ExpOpValue_t>();
+                                                        opValue->op.set(toAst<BinaryOperator_t>("-"sv, rIndex));
+                                                        opValue->pipeExprs.dup(rIndex->modifier->pipeExprs);
+                                                        indexNode->opValues.push_back(opValue);
+                                                        indexNode->opValues.dup(rIndex->modifier->opValues);
+                                                        indexNode->nilCoalesed.set(rIndex->modifier->nilCoalesed);
+                                                }
+                                                newChain->items.push_back(indexNode);
+                                                auto expList = x->new_ptr<ExpList_t>();
+                                                expList->exprs.push_back(newExp(newChain, x));
+                                                auto expListAssign = x->new_ptr<ExpListAssign_t>();
+                                                expListAssign->expList.set(expList);
+                                                auto stmt2 = x->new_ptr<Statement_t>();
+                                                stmt2->content.set(expListAssign);
+                                                auto block = x->new_ptr<Block_t>();
+                                                block->statementOrComments.push_back(stmt1);
+                                                block->statementOrComments.push_back(stmt2);
+                                                auto body = x->new_ptr<Body_t>();
+                                                body->content.set(block);
+                                                auto doNode = x->new_ptr<Do_t>();
+                                                doNode->body.set(body);
+                                                if (usage == ExpUsage::Assignment) {
+                                                        auto next = current;
+                                                        ++next;
+                                                        for (auto i = next; i != chainList.end(); ++i) {
+                                                                newChain->items.push_back(*i);
+                                                        }
+                                                        auto assignment = x->new_ptr<ExpListAssign_t>();
+                                                        assignment->expList.set(assignList);
+                                                        auto assign = x->new_ptr<Assign_t>();
+                                                        auto sVal = x->new_ptr<SimpleValue_t>();
+                                                        sVal->value.set(doNode);
+                                                        assign->values.push_back(newExp(sVal, x));
+                                                        assignment->action.set(assign);
+                                                        transformAssignment(assignment, out);
+                                                        return;
+                                                }
+                                                if (usage == ExpUsage::Closure) {
+                                                        auto next = current;
+                                                        ++next;
+                                                        if (next != chainList.end()) {
+                                                                doNode->new_ptr<ChainValue_t>();
+                                                                auto dVal = doNode->new_ptr<SimpleValue_t>();
+                                                                dVal->value.set(doNode);
+                                                                auto dExp = newExp(dVal, dVal);
+                                                                auto dParen = dExp->new_ptr<Parens_t>();
+                                                                dParen->extra = true;
+                                                                dParen->expr.set(dExp);
+                                                                auto dCallable = dExp->new_ptr<Callable_t>();
+                                                                dCallable->item.set(dParen);
+                                                                auto dChain = doNode->new_ptr<ChainValue_t>();
+                                                                dChain->items.push_back(dCallable);
+                                                                for (auto i = next; i != chainList.end(); ++i) {
+                                                                        dChain->items.push_back(*i);
+                                                                }
+                                                                transformExp(newExp(dChain, dExp), out, usage);
+                                                                return;
+                                                        }
+                                                }
+                                                auto next = current;
+                                                ++next;
+                                                for (auto i = next; i != chainList.end(); ++i) {
+                                                        newChain->items.push_back(*i);
+                                                }
+                                                transformDo(doNode, out, usage);
+                                                return;
+                                        }
+                                        break;
                                }
                        }
                }
@@ -6283,10 +6848,10 @@ private:
                }
                switch (usage) {
                        case ExpUsage::Common:
-                                out.push_back(indent() + join(temp) + nll(x));
+                                out.push_back(indent() + join(temp) + nl(x));
                                break;
                        case ExpUsage::Return:
-                                out.push_back(indent() + "return "s + join(temp) + nll(x));
+                                out.push_back(indent() + "return "s + join(temp) + nl(x));
                                break;
                        case ExpUsage::Assignment: YUEE("invalid expression usage", x); break;
                        default:
@@ -6418,7 +6983,7 @@ private:
                                }
                        }
                }
-                int len = lua_objlen(L, -1);
+                int len = static_cast<int>(lua_objlen(L, -1));
                lua_pushnil(L); // cur nil
                for (int i = len; i >= 1; i--) {
                        lua_pop(L, 1); // cur
@@ -6430,7 +6995,25 @@ private:
                                break;
                        }
                }
-                if (!lua_isfunction(L, -1)) {
+                str_list checks;
+                if (lua_istable(L, -1)) {
+                        lua_rawgeti(L, -1, 1); // cur macrotab checks
+                        int len = static_cast<int>(lua_objlen(L, -1));
+                        for (int i = 1; i <= len; i++) {
+                                lua_rawgeti(L, -1, i);
+                                if (lua_toboolean(L, -1) == 0) {
+                                        checks.emplace_back();
+                                } else {
+                                        size_t str_len = 0;
+                                        auto str = lua_tolstring(L, -1, &str_len);
+                                        checks.emplace_back(std::string{str, str_len});
+                                }
+                                lua_pop(L, 1);
+                        }
+                        lua_pop(L, 1);
+                        lua_rawgeti(L, -1, 2); // cur macrotab macroFunc
+                        lua_remove(L, -2); // cur macroFunc
+                } else if (!lua_isfunction(L, -1)) {
                        auto code = expandBuiltinMacro(macroName, x);
                        if (!code.empty()) return code;
                        if (macroName == "is_ast"sv) {
@@ -6475,11 +7058,34 @@ private:
                } // cur macroFunc
                pushYue("pcall"sv); // cur macroFunc pcall
                lua_insert(L, -2); // cur pcall macroFunc
-                if (!lua_checkstack(L, argStrs.size())) {
+                if (!lua_checkstack(L, static_cast<int>(argStrs.size()))) {
                        throw CompileError("too much macro params"s, x);
                }
+                auto checkIt = checks.begin();
+                node_container::const_iterator argIt;
+                if (args) {
+                        argIt = args->begin();
+                }
                for (const auto& arg : argStrs) {
+                        if (checkIt != checks.end()) {
+                                if (checkIt->empty()) {
+                                        ++checkIt;
+                                } else {
+                                        if ((*checkIt)[0] == '.') {
+                                                auto astName = checkIt->substr(3);
+                                                if (!_parser.match(astName, arg)) {
+                                                        throw CompileError("expecting \""s + astName + "\", AST mismatch"s, *argIt);
+                                                }
+                                        } else {
+                                                if (!_parser.match(*checkIt, arg)) {
+                                                        throw CompileError("expecting \""s + *checkIt + "\", AST mismatch"s, *argIt);
+                                                }
+                                                ++checkIt;
+                                        }
+                                }
+                        }
                        lua_pushlstring(L, arg.c_str(), arg.size());
+                        ++argIt;
                } // cur pcall macroFunc args...
                bool success = lua_pcall(L, static_cast<int>(argStrs.size()), 1, 0) == 0;
                if (!success) { // cur err
@@ -6571,8 +7177,8 @@ private:
                                        throw CompileError("lua macro is not expanding to valid block\n"s + err, x);
                                }
                                if (!codes.empty()) {
-                                        codes.insert(0, indent() + "do"s + nll(chainValue));
+                                        codes.insert(0, indent() + "do"s + nl(chainValue));
-                                        codes.append(_newLine + indent() + "end"s + nlr(chainValue));
+                                        codes.append(_newLine + indent() + "end"s + nl(chainValue));
                                }
                                return {nullptr, nullptr, std::move(codes), std::move(localVars)};
                        } else {
@@ -6609,14 +7215,14 @@ private:
                } else {
                        if (!codes.empty()) {
                                if (isBlock) {
-                                        info = _parser.parse<BlockEnd_t>(codes);
+                                        info = _parser.parse<BlockEnd_t>(codes, false);
                                        if (info.error) {
                                                throw CompileError("failed to expand macro as block: "s + info.error.value().msg, x);
                                        }
                                } else {
-                                        info = _parser.parse<Exp_t>(codes);
+                                        info = _parser.parse<Exp_t>(codes, false);
                                        if (!info.node && allowBlockMacroReturn) {
-                                                info = _parser.parse<BlockEnd_t>(codes);
+                                                info = _parser.parse<BlockEnd_t>(codes, false);
                                                if (info.error) {
                                                        throw CompileError("failed to expand macro as expr or block: "s + info.error.value().msg, x);
                                                }
@@ -6661,7 +7267,7 @@ private:
                                                auto stmt = x->new_ptr<Statement_t>();
                                                stmt->content.set(exps);
                                                auto block = x->new_ptr<Block_t>();
-                                                block->statements.push_back(stmt);
+                                                block->statementOrComments.push_back(stmt);
                                                info.node.set(block);
                                        } else {
                                                info.node.set(exp);
@@ -6698,7 +7304,7 @@ private:
                                return;
                        }
                        if (usage == ExpUsage::Common || (usage == ExpUsage::Return && node.is<Block_t>())) {
-                                if (node.to<Block_t>()->statements.empty()) {
+                                if (node.to<Block_t>()->statementOrComments.empty()) {
                                        out.push_back(Empty);
                                } else {
                                        auto doBody = node->new_ptr<Body_t>();
@@ -6720,11 +7326,7 @@ private:
                                                break;
                                        }
                                        case ExpUsage::Return: {
-                                                auto expListLow = x->new_ptr<ExpListLow_t>();
+                                                auto returnNode = newReturn(node.to<Exp_t>());
-                                                expListLow->exprs.push_back(node);
-                                                auto returnNode = x->new_ptr<Return_t>();
-                                                returnNode->explicitReturn = false;
-                                                returnNode->valueList.set(expListLow);
                                                transformReturn(returnNode, out);
                                                break;
                                        }
@@ -6752,6 +7354,9 @@ private:
                if (transformChainEndWithColonItem(chainList, out, usage, assignList)) {
                        return;
                }
+                if (transformChainEndWithSlice(chainList, out, usage, assignList)) {
+                        return;
+                }
                transformChainList(chainList, out, usage, assignList);
        }
@@ -6848,7 +7453,7 @@ private:
                                        }
                                }
                        } else if (auto comp = sval->value.as<Comprehension_t>()) {
-                                if (comp->items.size() != 2 || !ast_is<CompInner_t>(comp->items.back())) {
+                                if (!isListComp(comp)) {
                                        discrete = inExp->new_ptr<ExpList_t>();
                                        for (ast_node* val : comp->items.objects()) {
                                                if (auto def = ast_cast<NormalDef_t>(val)) {
@@ -6877,7 +7482,7 @@ private:
                                        auto assignment = assignmentFrom(toAst<Exp_t>(checkVar, inExp), newExp(inExp, inExp), inExp);
                                        auto stmt = x->new_ptr<Statement_t>();
                                        stmt->content.set(assignment);
-                                        block->statements.push_back(stmt);
+                                        block->statementOrComments.push_back(stmt);
                                }
                                if (varName.empty()) {
                                        auto newUnaryExp = x->new_ptr<UnaryExp_t>();
@@ -6889,7 +7494,7 @@ private:
                                        auto assignment = assignmentFrom(assignExp, exp, x);
                                        auto stmt = x->new_ptr<Statement_t>();
                                        stmt->content.set(assignment);
-                                        block->statements.push_back(stmt);
+                                        block->statementOrComments.push_back(stmt);
                                }
                                auto findVar = getUnusedName("_find_");
                                auto itemVar = getUnusedName("_item_");
@@ -6905,7 +7510,7 @@ private:
                                }
                                auto blockStr = clearBuf();
                                auto checkBlock = toAst<Block_t>(blockStr, inExp);
-                                block->statements.dup(checkBlock->statements);
+                                block->statementOrComments.dup(checkBlock->statementOrComments);
                                auto body = x->new_ptr<Body_t>();
                                body->content.set(block);
                                auto doNode = x->new_ptr<Do_t>();
@@ -6925,16 +7530,16 @@ private:
                        } else {
                                auto arrayCheck = [&](bool exist) {
                                        auto indexVar = getUnusedName("_index_");
-                                        _buf << indent() << "for "sv << indexVar << " = 1, #"sv << checkVar << " do"sv << nll(x);
+                                        _buf << indent() << "for "sv << indexVar << " = 1, #"sv << checkVar << " do"sv << nl(x);
                                        incIndentOffset();
-                                        _buf << indent() << "if "sv << checkVar << '[' << indexVar << "] == "sv << varName << " then"sv << nll(x);
+                                        _buf << indent() << "if "sv << checkVar << '[' << indexVar << "] == "sv << varName << " then"sv << nl(x);
                                        incIndentOffset();
-                                        _buf << indent() << "return "sv << (exist ? "true"sv : "false"sv) << nll(x);
+                                        _buf << indent() << "return "sv << (exist ? "true"sv : "false"sv) << nl(x);
                                        decIndentOffset();
-                                        _buf << indent() << "end"sv << nll(x);
+                                        _buf << indent() << "end"sv << nl(x);
                                        decIndentOffset();
-                                        _buf << indent() << "end"sv << nll(x);
+                                        _buf << indent() << "end"sv << nl(x);
-                                        _buf << indent() << "return "sv << (exist ? "false"sv : "true"sv) << nll(x);
+                                        _buf << indent() << "return "sv << (exist ? "false"sv : "true"sv) << nl(x);
                                        temp.push_back(clearBuf());
                                };
                                bool useShortCheck = (usage == ExpUsage::Closure) && !varName.empty() && !checkVar.empty() && isLocal(checkVar);
@@ -6950,7 +7555,7 @@ private:
                                                pushAnonVarArg();
                                                pushScope();
                                                arrayCheck(true);
-                                                temp.push_front("(#"s + checkVar + " > 0 and "s + anonFuncStart() + nll(x));
+                                                temp.push_front("(#"s + checkVar + " > 0 and "s + anonFuncStart() + nl(x));
                                                popScope();
                                                temp.push_back(indent() + anonFuncEnd() + ')');
                                                if (unary_exp->inExp->not_) {
@@ -6987,7 +7592,7 @@ private:
                                                arrayCheck(!unary_exp->inExp->not_);
                                        } else {
                                                arrayCheck(!unary_exp->inExp->not_);
-                                                temp.push_front(anonFuncStart() + nll(x));
+                                                temp.push_front(anonFuncStart() + nl(x));
                                                popScope();
                                                temp.push_back(indent() + anonFuncEnd());
                                                popAnonVarArg();
@@ -7027,7 +7632,7 @@ private:
                                        pushScope();
                                } else if (usage == ExpUsage::Assignment) {
                                        if (isScoped) {
-                                                temp.push_back(indent() + "do"s + nll(x));
+                                                temp.push_back(indent() + "do"s + nl(x));
                                                pushScope();
                                        }
                                }
@@ -7067,10 +7672,10 @@ private:
                                if (unary_exp->inExp->not_) {
                                        _buf << ")"sv;
                                }
-                                _buf << nll(x);
+                                _buf << nl(x);
                                temp.push_back(clearBuf());
                                if (usage == ExpUsage::Closure) {
-                                        temp.push_front(anonFuncStart() + nll(x));
+                                        temp.push_front(anonFuncStart() + nl(x));
                                        popScope();
                                        temp.push_back(indent() + anonFuncEnd());
                                        out.push_back(join(temp));
@@ -7079,7 +7684,7 @@ private:
                                } else if (usage == ExpUsage::Assignment) {
                                        if (isScoped) {
                                                popScope();
-                                                temp.push_back(indent() + "end"s + nll(x));
+                                                temp.push_back(indent() + "end"s + nl(x));
                                        }
                                        out.push_back(join(temp));
                                } else {
@@ -7113,7 +7718,7 @@ private:
                                }
                                _buf << ')';
                                if (usage == ExpUsage::Assignment || usage == ExpUsage::Return) {
-                                        _buf << nll(discrete);
+                                        _buf << nl(discrete);
                                }
                                out.push_back(clearBuf());
                        }
@@ -7153,7 +7758,7 @@ private:
                                try {
                                        unsigned long long value = std::stoull(binaryPart, nullptr, 2);
                                        numStr = std::to_string(value);
-                                } catch (const std::exception& e) {
+                                } catch (const std::exception&) {
                                        throw CompileError("invalid binary literal"sv, num);
                                }
                        } else if (getLuaTarget(num) < 502) {
@@ -7233,7 +7838,7 @@ private:
                forceAddToScope(tableVar);
                auto it = values.begin();
                if (ast_is<SpreadExp_t, SpreadListExp_t>(*it)) {
-                        temp.push_back(indent() + "local "s + tableVar + " = { }"s + nll(x));
+                        temp.push_back(indent() + "local "s + tableVar + " = { }"s + nl(x));
                } else {
                        auto initialTab = x->new_ptr<TableLit_t>();
                        while (it != values.end() && !ast_is<SpreadExp_t, SpreadListExp_t>(*it)) {
@@ -7241,7 +7846,7 @@ private:
                                ++it;
                        }
                        transformTable(initialTab->values.objects(), temp);
-                        temp.back() = indent() + "local "s + tableVar + " = "s + temp.back() + nll(*it);
+                        temp.back() = indent() + "local "s + tableVar + " = "s + temp.back() + nl(*it);
                }
                for (; it != values.end(); ++it) {
                        auto item = *it;
@@ -7261,14 +7866,14 @@ private:
                                                transformAssignment(assignment, temp);
                                        }
                                        forceAddToScope(indexVar);
-                                        temp.push_back(indent() + "local "s + indexVar + " = 1"s + nll(item));
+                                        temp.push_back(indent() + "local "s + indexVar + " = 1"s + nl(item));
                                        _buf << "for "sv << keyVar << ',' << valueVar << " in pairs "sv << objVar
                                                 << "\n\tif "sv << indexVar << "=="sv << keyVar
                                                 << "\n\t\t"sv << tableVar << "[]="sv << valueVar
                                                 << "\n\t\t"sv << indexVar << "+=1"sv
                                                 << "\n\telse "sv << tableVar << '[' << keyVar << "]="sv << valueVar;
-                                        auto forEach = toAst<ForEach_t>(clearBuf(), item);
+                                        auto forNode = toAst<For_t>(clearBuf(), item);
-                                        transformForEach(forEach, temp);
+                                        transformFor(forNode, temp);
                                        break;
                                }
                                case id<SpreadListExp_t>(): {
@@ -7285,12 +7890,12 @@ private:
                                                transformAssignment(assignment, temp);
                                        }
                                        forceAddToScope(indexVar);
-                                        temp.push_back(indent() + "local "s + indexVar + " = #"s + tableVar + " + 1"s + nll(item));
+                                        temp.push_back(indent() + "local "s + indexVar + " = #"s + tableVar + " + 1"s + nl(item));
                                        _buf << "for "sv << valueVar << " in *"sv << objVar
                                                 << "\n\t"sv << tableVar << '[' << indexVar << "]="sv << valueVar
                                                 << "\n\t"sv << indexVar << "+=1"sv;
-                                        auto forEach = toAst<ForEach_t>(clearBuf(), item);
+                                        auto forNode = toAst<For_t>(clearBuf(), item);
-                                        transformForEach(forEach, temp);
+                                        transformFor(forNode, temp);
                                        break;
                                }
                                case id<VariablePair_t>():
@@ -7468,9 +8073,9 @@ private:
                                break;
                        case ExpUsage::Closure: {
                                out.push_back(join(temp));
-                                out.back().append(indent() + "return "s + tableVar + nlr(x));
+                                out.back().append(indent() + "return "s + tableVar + nl(x));
                                popScope();
-                                out.back().insert(0, anonFuncStart() + nll(x));
+                                out.back().insert(0, anonFuncStart() + nl(x));
                                out.back().append(indent() + anonFuncEnd());
                                popAnonVarArg();
                                popFunctionScope();
@@ -7486,13 +8091,13 @@ private:
                                if (extraScope) popScope();
                                out.push_back(join(temp));
                                if (extraScope) {
-                                        out.back() = indent() + "do"s + nll(x) + out.back() + indent() + "end"s + nlr(x);
+                                        out.back() = indent() + "do"s + nl(x) + out.back() + indent() + "end"s + nl(x);
                                }
                                break;
                        }
                        case ExpUsage::Return:
                                out.push_back(join(temp));
-                                out.back().append(indent() + "return "s + tableVar + nlr(x));
+                                out.back().append(indent() + "return "s + tableVar + nl(x));
                                break;
                        default:
                                break;
@@ -7613,11 +8218,11 @@ private:
                                default: YUEE("AST node mismatch", item); break;
                        }
                        if (!isMetamethod) {
-                                temp.back() = indent() + (value == values.back() ? temp.back() : temp.back() + ',') + nll(value);
+                                temp.back() = indent() + (value == values.back() ? temp.back() : temp.back() + ',') + nl(value);
                        }
                }
                if (metatable->pairs.empty() && !metatableItem) {
-                        out.push_back('{' + nll(x) + join(temp));
+                        out.push_back('{' + nl(x) + join(temp));
                        decIndentOffset();
                        out.back() += (indent() + '}');
                } else {
@@ -7627,7 +8232,7 @@ private:
                                decIndentOffset();
                                tabStr += "{ }"sv;
                        } else {
-                                tabStr += ('{' + nll(x) + join(temp));
+                                tabStr += ('{' + nl(x) + join(temp));
                                decIndentOffset();
                                tabStr += (indent() + '}');
                        }
@@ -7671,18 +8276,18 @@ private:
        void transformCompCommon(Comprehension_t* comp, str_list& out) {
                str_list temp;
                auto x = comp;
-                auto compInner = static_cast<CompInner_t*>(comp->items.back());
+                auto compFor = static_cast<CompFor_t*>(comp->items.back());
-                for (auto item : compInner->items.objects()) {
+                for (auto item : compFor->items.objects()) {
                        switch (item->get_id()) {
                                case id<CompForEach_t>():
                                        transformCompForEach(static_cast<CompForEach_t*>(item), temp);
                                        break;
-                                case id<CompFor_t>():
+                                case id<CompForNum_t>():
-                                        transformCompFor(static_cast<CompFor_t*>(item), temp);
+                                        transformCompForNum(static_cast<CompForNum_t*>(item), temp);
                                        break;
                                case id<Exp_t>():
                                        transformExp(static_cast<Exp_t*>(item), temp, ExpUsage::Closure);
-                                        temp.back() = indent() + "if "s + temp.back() + " then"s + nll(item);
+                                        temp.back() = indent() + "if "s + temp.back() + " then"s + nl(item);
                                        pushScope();
                                        break;
                                default: YUEE("AST node mismatch", item); break;
@@ -7702,16 +8307,16 @@ private:
                auto value = std::move(temp.back());
                temp.pop_back();
                _buf << join(temp) << value;
-                for (size_t i = 0; i < compInner->items.objects().size(); ++i) {
+                for (size_t i = 0; i < compFor->items.objects().size(); ++i) {
                        popScope();
-                        _buf << indent() << "end"sv << nll(comp);
+                        _buf << indent() << "end"sv << nl(comp);
                }
                out.push_back(clearBuf());
        }
        void transformComprehension(Comprehension_t* comp, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
                auto x = comp;
-                if (comp->items.size() != 2 || !ast_is<CompInner_t>(comp->items.back())) {
+                if (!isListComp(comp)) {
                        switch (usage) {
                                case ExpUsage::Assignment: {
                                        auto tableLit = x->new_ptr<TableLit_t>();
@@ -7733,11 +8338,7 @@ private:
                                        auto simpleValue = x->new_ptr<SimpleValue_t>();
                                        simpleValue->value.set(tableLit);
                                        auto exp = newExp(simpleValue, x);
-                                        auto returnNode = x->new_ptr<Return_t>();
+                                        auto returnNode = newReturn(exp);
-                                        returnNode->explicitReturn = false;
-                                        auto expList = x->new_ptr<ExpListLow_t>();
-                                        expList->exprs.push_back(exp);
-                                        returnNode->valueList.set(expList);
                                        transformReturn(returnNode, out);
                                        break;
                                }
@@ -7750,9 +8351,16 @@ private:
                        }
                        return;
                }
-                auto def = ast_cast<NormalDef_t>(comp->items.front());
+                ast_node* value = nullptr;
-                if (!def || def->defVal) {
+                bool isSpread = ast_is<SpreadListExp_t>(comp->items.front());
-                        throw CompileError("invalid comprehension expression", comp->items.front());
+                if (isSpread) {
+                        value = comp->items.front();
+                } else {
+                        auto def = ast_cast<NormalDef_t>(comp->items.front());
+                        if (!def || def->defVal) {
+                                throw CompileError("invalid comprehension expression", comp->items.front());
+                        }
+                        value = def->item.get();
                }
                bool extraScope = false;
                switch (usage) {
@@ -7776,31 +8384,33 @@ private:
                        default:
                                break;
                }
-                auto value = def->item.get();
+                auto compFor = static_cast<CompFor_t*>(comp->items.back());
-                auto compInner = static_cast<CompInner_t*>(comp->items.back());
                str_list temp;
                std::string accumVar = getUnusedName("_accum_"sv);
-                std::string lenVar = getUnusedName("_len_"sv);
                addToScope(accumVar);
-                addToScope(lenVar);
+                std::string lenVar;
-                for (auto item : compInner->items.objects()) {
+                if (!isSpread) {
+                        lenVar = getUnusedName("_len_"sv);
+                        addToScope(lenVar);
+                }
+                for (auto item : compFor->items.objects()) {
                        switch (item->get_id()) {
                                case id<CompForEach_t>():
                                        transformCompForEach(static_cast<CompForEach_t*>(item), temp);
                                        break;
-                                case id<CompFor_t>():
+                                case id<CompForNum_t>():
-                                        transformCompFor(static_cast<CompFor_t*>(item), temp);
+                                        transformCompForNum(static_cast<CompForNum_t*>(item), temp);
                                        break;
                                case id<Exp_t>():
                                        transformExp(static_cast<Exp_t*>(item), temp, ExpUsage::Closure);
-                                        temp.back() = indent() + "if "s + temp.back() + " then"s + nll(item);
+                                        temp.back() = indent() + "if "s + temp.back() + " then"s + nl(item);
                                        pushScope();
                                        break;
                                default: YUEE("AST node mismatch", item); break;
                        }
                }
                {
-                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + (isSpread ? "]"s : lenVar + ']'), x);
                        auto assign = x->new_ptr<Assign_t>();
                        assign->values.push_back(value);
                        auto assignment = x->new_ptr<ExpListAssign_t>();
@@ -7810,25 +8420,30 @@ private:
                }
                auto assignStr = std::move(temp.back());
                temp.pop_back();
-                for (size_t i = 0; i < compInner->items.objects().size(); ++i) {
+                for (size_t i = 0; i < compFor->items.objects().size(); ++i) {
                        popScope();
                }
-                _buf << indent() << "local "sv << accumVar << " = { }"sv << nll(comp);
+                _buf << indent() << "local "sv << accumVar << " = { }"sv << nl(comp);
-                _buf << indent() << "local "sv << lenVar << " = 1"sv << nll(comp);
+                if (isSpread) {
-                _buf << join(temp);
+                        _buf << join(temp);
-                _buf << assignStr;
+                        _buf << assignStr;
-                _buf << indent(int(temp.size())) << lenVar << " = "sv << lenVar << " + 1"sv << nll(comp);
+                } else {
+                        _buf << indent() << "local "sv << lenVar << " = 1"sv << nl(comp);
+                        _buf << join(temp);
+                        _buf << assignStr;
+                        _buf << indent(int(temp.size())) << lenVar << " = "sv << lenVar << " + 1"sv << nl(comp);
+                }
                for (int ind = int(temp.size()) - 1; ind > -1; --ind) {
-                        _buf << indent(ind) << "end"sv << nll(comp);
+                        _buf << indent(ind) << "end"sv << nl(comp);
                }
                switch (usage) {
                        case ExpUsage::Common:
                                break;
                        case ExpUsage::Closure: {
                                out.push_back(clearBuf());
-                                out.back().append(indent() + "return "s + accumVar + nlr(comp));
+                                out.back().append(indent() + "return "s + accumVar + nl(comp));
                                popScope();
-                                out.back().insert(0, anonFuncStart() + nll(comp));
+                                out.back().insert(0, anonFuncStart() + nl(comp));
                                out.back().append(indent() + anonFuncEnd());
                                popAnonVarArg();
                                popFunctionScope();
@@ -7845,13 +8460,13 @@ private:
                                out.back().append(temp.back());
                                if (extraScope) {
                                        popScope();
-                                        out.back() = indent() + "do"s + nll(comp) + out.back() + indent() + "end"s + nlr(comp);
+                                        out.back() = indent() + "do"s + nl(comp) + out.back() + indent() + "end"s + nl(comp);
                                }
                                break;
                        }
                        case ExpUsage::Return:
                                out.push_back(clearBuf());
-                                out.back().append(indent() + "return "s + accumVar + nlr(comp));
+                                out.back().append(indent() + "return "s + accumVar + nl(comp));
                                break;
                        default:
                                break;
@@ -7859,6 +8474,11 @@ private:
        }
        bool transformForEachHead(AssignableNameList_t* nameList, ast_node* loopTarget, str_list& out, bool inClosure) {
+                enum class NumState {
+                        Unknown,
+                        Positive,
+                        Negtive
+                };
                auto x = nameList;
                str_list temp;
                str_list vars;
@@ -7877,13 +8497,8 @@ private:
                                                varConstAfter = vars.back();
                                        }
                                        break;
-                                case id<TableLit_t>(): {
+                                case id<SimpleTable_t>():
-                                        auto desVar = getUnusedName("_des_"sv);
+                                case id<TableLit_t>():
-                                        destructPairs.emplace_back(item, toAst<Exp_t>(desVar, x));
-                                        vars.push_back(desVar);
-                                        varAfter.push_back(desVar);
-                                        break;
-                                }
                                case id<Comprehension_t>(): {
                                        auto desVar = getUnusedName("_des_"sv);
                                        destructPairs.emplace_back(item, toAst<Exp_t>(desVar, x));
@@ -7925,15 +8540,35 @@ private:
                                for (auto item : chainList) {
                                        chain->items.push_back(item);
                                }
-                                std::string startValue("1"sv);
+                                std::string startValue;
+                                NumState startStatus = NumState::Unknown;
                                if (auto exp = slice->startValue.as<Exp_t>()) {
                                        transformExp(exp, temp, ExpUsage::Closure);
+                                        if (temp.back().at(0) == '-') {
+                                                if (_parser.match<Num_t>(temp.back().substr(1))) {
+                                                        startStatus = NumState::Negtive;
+                                                }
+                                        } else {
+                                                if (_parser.match<Num_t>(temp.back())) {
+                                                        startStatus = NumState::Positive;
+                                                }
+                                        }
                                        startValue = std::move(temp.back());
                                        temp.pop_back();
                                }
                                std::string stopValue;
+                                NumState stopStatus = NumState::Unknown;
                                if (auto exp = slice->stopValue.as<Exp_t>()) {
                                        transformExp(exp, temp, ExpUsage::Closure);
+                                        if (temp.back().at(0) == '-') {
+                                                if (_parser.match<Num_t>(temp.back().substr(1))) {
+                                                        stopStatus = NumState::Negtive;
+                                                }
+                                        } else {
+                                                if (_parser.match<Num_t>(temp.back())) {
+                                                        stopStatus = NumState::Positive;
+                                                }
+                                        }
                                        stopValue = std::move(temp.back());
                                        temp.pop_back();
                                }
@@ -7947,38 +8582,94 @@ private:
                                        std::string prefix;
                                        if (!inClosure && needScope) {
                                                extraScope = true;
-                                                prefix = indent() + "do"s + nll(x);
+                                                prefix = indent() + "do"s + nl(x);
                                                pushScope();
                                        }
                                        listVar = getUnusedName("_list_"sv);
                                        varBefore.push_back(listVar);
                                        transformChainValue(chain, temp, ExpUsage::Closure);
-                                        _buf << prefix << indent() << "local "sv << listVar << " = "sv << temp.back() << nll(nameList);
+                                        _buf << prefix << indent() << "local "sv << listVar << " = "sv << temp.back() << nl(nameList);
+                                }
+                                if (startValue.empty()) {
+                                        startValue = "1"s;
+                                        startStatus = NumState::Positive;
+                                }
+                                std::string minVar;
+                                if (startStatus != NumState::Positive) {
+                                        std::string prefix;
+                                        if (!extraScope && !inClosure && needScope) {
+                                                extraScope = true;
+                                                prefix = indent() + "do"s + nl(x);
+                                                pushScope();
+                                        }
+                                        minVar = getUnusedName("_min_"sv);
+                                        varBefore.push_back(minVar);
+                                        if (startStatus == NumState::Negtive) {
+                                                _buf << prefix << indent() << "local "sv << minVar << " = "sv << "#"sv << listVar << " + "sv << startValue << " + 1"sv << nl(nameList);
+                                        } else {
+                                                _buf << prefix << indent() << "local "sv << minVar << " = "sv << startValue << nl(nameList);
+                                        }
+                                }
+                                bool defaultStop = false;
+                                if (stopValue.empty()) {
+                                        stopValue = "#"s + listVar;
+                                        defaultStop = true;
                                }
                                std::string maxVar;
-                                if (!stopValue.empty()) {
+                                if (stopStatus != NumState::Positive) {
                                        std::string prefix;
                                        if (!extraScope && !inClosure && needScope) {
                                                extraScope = true;
-                                                prefix = indent() + "do"s + nll(x);
+                                                prefix = indent() + "do"s + nl(x);
                                                pushScope();
                                        }
                                        maxVar = getUnusedName("_max_"sv);
                                        varBefore.push_back(maxVar);
-                                        _buf << prefix << indent() << "local "sv << maxVar << " = "sv << stopValue << nll(nameList);
+                                        if (stopStatus == NumState::Negtive) {
+                                                _buf << indent() << "local "sv << maxVar << " = "sv << "#"sv << listVar << " + "sv << stopValue << " + 1"sv << nl(nameList);
+                                        } else {
+                                                _buf << prefix << indent() << "local "sv << maxVar << " = "sv << stopValue << nl(nameList);
+                                        }
+                                }
+                                if (startStatus == NumState::Unknown) {
+                                        _buf << indent() << minVar << " = "sv << minVar << " < 0 and #"sv << listVar << " + "sv << minVar << " + 1 or "sv << minVar << nl(nameList);
+                                }
+                                if (!defaultStop && stopStatus == NumState::Unknown) {
+                                        _buf << indent() << maxVar << " = "sv << maxVar << " < 0 and #"sv << listVar << " + "sv << maxVar << " + 1 or "sv << maxVar << nl(nameList);
                                }
                                _buf << indent() << "for "sv << indexVar << " = "sv;
-                                _buf << startValue << ", "sv;
+                                if (startValue.empty()) {
+                                        _buf << "1"sv;
+                                } else {
+                                        switch (startStatus) {
+                                                case NumState::Unknown:
+                                                case NumState::Negtive:
+                                                        _buf << minVar;
+                                                        break;
+                                                case NumState::Positive:
+                                                        _buf << startValue;
+                                                        break;
+                                        }
+                                }
+                                _buf << ", "sv;
                                if (stopValue.empty()) {
                                        _buf << "#"sv << listVar;
                                } else {
-                                        _buf << maxVar << " < 0 and #"sv << listVar << " + "sv << maxVar << " or "sv << maxVar;
+                                        switch (stopStatus) {
+                                                case NumState::Unknown:
+                                                case NumState::Negtive:
+                                                        _buf << maxVar;
+                                                        break;
+                                                case NumState::Positive:
+                                                        _buf << stopValue;
+                                                        break;
+                                        }
                                }
                                if (!stepValue.empty()) {
                                        _buf << ", "sv << stepValue;
                                }
-                                _buf << " do"sv << nlr(loopTarget);
+                                _buf << " do"sv << nl(loopTarget);
-                                _buf << indent(1) << "local "sv << join(vars, ", "sv) << " = "sv << listVar << "["sv << indexVar << "]"sv << nll(nameList);
+                                _buf << indent(1) << "local "sv << join(vars, ", "sv) << " = "sv << listVar << "["sv << indexVar << "]"sv << nl(nameList);
                                out.push_back(clearBuf());
                                BLOCK_END
                                bool newListVal = false;
@@ -7989,21 +8680,21 @@ private:
                                }
                                if (!endWithSlice) {
                                        transformExp(star_exp->value, temp, ExpUsage::Closure);
-                                        if (newListVal) _buf << indent() << "local "sv << listVar << " = "sv << temp.back() << nll(nameList);
+                                        if (newListVal) _buf << indent() << "local "sv << listVar << " = "sv << temp.back() << nl(nameList);
-                                        _buf << indent() << "for "sv << indexVar << " = 1, #"sv << listVar << " do"sv << nlr(loopTarget);
+                                        _buf << indent() << "for "sv << indexVar << " = 1, #"sv << listVar << " do"sv << nl(loopTarget);
-                                        _buf << indent(1) << "local "sv << join(vars, ", "sv) << " = "sv << listVar << "["sv << indexVar << "]"sv << nll(nameList);
+                                        _buf << indent(1) << "local "sv << join(vars, ", "sv) << " = "sv << listVar << "["sv << indexVar << "]"sv << nl(nameList);
                                        out.push_back(clearBuf());
                                }
                                break;
                        }
                        case id<Exp_t>():
                                transformExp(static_cast<Exp_t*>(loopTarget), temp, ExpUsage::Closure);
-                                _buf << indent() << "for "sv << join(vars, ", "sv) << " in "sv << temp.back() << " do"sv << nlr(loopTarget);
+                                _buf << indent() << "for "sv << join(vars, ", "sv) << " in "sv << temp.back() << " do"sv << nl(loopTarget);
                                out.push_back(clearBuf());
                                break;
                        case id<ExpList_t>():
                                transformExpList(static_cast<ExpList_t*>(loopTarget), temp);
-                                _buf << indent() << "for "sv << join(vars, ", "sv) << " in "sv << temp.back() << " do"sv << nlr(loopTarget);
+                                _buf << indent() << "for "sv << join(vars, ", "sv) << " in "sv << temp.back() << " do"sv << nl(loopTarget);
                                out.push_back(clearBuf());
                                break;
                        default: YUEE("AST node mismatch", loopTarget); break;
@@ -8012,15 +8703,22 @@ private:
                pushScope();
                for (const auto& var : vars) forceAddToScope(var);
                for (const auto& var : varAfter) addToScope(var);
-                if (!varConstAfter.empty()) markVarConst(varConstAfter);
+                if (!varConstAfter.empty()) markVarLocalConst(varConstAfter);
                if (!destructPairs.empty()) {
                        temp.clear();
                        for (auto& pair : destructPairs) {
-                                auto sValue = x->new_ptr<SimpleValue_t>();
-                                sValue->value.set(pair.first);
-                                auto exp = newExp(sValue, x);
                                auto expList = x->new_ptr<ExpList_t>();
-                                expList->exprs.push_back(exp);
+                                if (ast_is<SimpleTable_t>(pair.first)) {
+                                        auto value = x->new_ptr<Value_t>();
+                                        value->item.set(pair.first);
+                                        auto exp = newExp(value, x);
+                                        expList->exprs.push_back(exp);
+                                } else {
+                                        auto sValue = x->new_ptr<SimpleValue_t>();
+                                        sValue->value.set(pair.first);
+                                        auto exp = newExp(sValue, x);
+                                        expList->exprs.push_back(exp);
+                                }
                                auto assign = x->new_ptr<Assign_t>();
                                assign->values.push_back(pair.second);
                                auto assignment = x->new_ptr<ExpListAssign_t>();
@@ -8080,7 +8778,7 @@ private:
                out.push_back('(' + join(temp, ", "sv) + ')');
        }
-        void transformForHead(Variable_t* var, Exp_t* startVal, Exp_t* stopVal, ForStepValue_t* stepVal, str_list& out) {
+        void transformForNumHead(Variable_t* var, Exp_t* startVal, Exp_t* stopVal, ForStepValue_t* stepVal, str_list& out) {
                str_list temp;
                std::string varName = variableToString(var);
                transformExp(startVal, temp, ExpUsage::Closure);
@@ -8094,37 +8792,70 @@ private:
                const auto& start = *it;
                const auto& stop = *(++it);
                const auto& step = *(++it);
-                _buf << indent() << "for "sv << varName << " = "sv << start << ", "sv << stop << (step.empty() ? Empty : ", "s + step) << " do"sv << nll(var);
+                _buf << indent() << "for "sv << varName << " = "sv << start << ", "sv << stop << (step.empty() ? Empty : ", "s + step) << " do"sv << nl(var);
                pushScope();
                forceAddToScope(varName);
-                markVarConst(varName);
+                markVarLocalConst(varName);
                out.push_back(clearBuf());
        }
-        void transformForHead(For_t* forNode, str_list& out) {
+        void transformForNumHead(ForNum_t* forNum, str_list& out) {
-                transformForHead(forNode->varName, forNode->startValue, forNode->stopValue, forNode->stepValue, out);
+                transformForNumHead(forNum->varName, forNum->startValue, forNum->stopValue, forNum->stepValue, out);
        }
-        void transform_plain_body(ast_node* body, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
+        void transform_plain_body(ast_node* bodyOrStmt, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
-                switch (body->get_id()) {
+                switch (bodyOrStmt->get_id()) {
                        case id<Block_t>():
-                                transformBlock(static_cast<Block_t*>(body), out, usage, assignList);
+                                transformBlock(static_cast<Block_t*>(bodyOrStmt), out, usage, assignList);
                                break;
                        case id<Statement_t>(): {
-                                auto newBlock = body->new_ptr<Block_t>();
+                                auto newBlock = bodyOrStmt->new_ptr<Block_t>();
-                                newBlock->statements.push_back(body);
+                                newBlock->statementOrComments.push_back(bodyOrStmt);
                                transformBlock(newBlock, out, usage, assignList);
                                break;
                        }
-                        default: YUEE("AST node mismatch", body); break;
+                        default: YUEE("AST node mismatch", bodyOrStmt); break;
                }
        }
-        bool hasContinueStatement(ast_node* body) {
+        enum class BreakLoopType {
-                return traversal::Stop == body->traverse([&](ast_node* node) {
+                None = 0,
+                Break = 1,
+                BreakWithValue = 1 << 1,
+                Continue = 1 << 2
+        };
+        bool hasBreak(uint32_t breakLoopType) const {
+                return (breakLoopType & int(BreakLoopType::Break)) != 0;
+        }
+        bool hasBreakWithValue(uint32_t breakLoopType) const {
+                return (breakLoopType & int(BreakLoopType::BreakWithValue)) != 0;
+        }
+        bool hasContinue(uint32_t breakLoopType) const {
+                return (breakLoopType & int(BreakLoopType::Continue)) != 0;
+        }
+        uint32_t getBreakLoopType(ast_node* body, const std::string& varBWV) {
+                uint32_t type = 0;
+                body->traverse([&](ast_node* node) {
                        if (auto stmt = ast_cast<Statement_t>(node)) {
-                                if (stmt->content.is<BreakLoop_t>()) {
+                                if (auto breakLoop = stmt->content.as<BreakLoop_t>()) {
-                                        return _parser.toString(stmt->content) == "continue"sv ? traversal::Stop : traversal::Return;
+                                        if (breakLoop->type.is<Continue_t>()) {
+                                                type |= int(BreakLoopType::Continue);
+                                                return traversal::Return;
+                                        } else {
+                                                if (breakLoop->value) {
+                                                        if (varBWV.empty()) {
+                                                                throw CompileError("break with a value is not allowed here"sv, breakLoop->value);
+                                                        }
+                                                        type |= int(BreakLoopType::BreakWithValue);
+                                                        breakLoop->varBWV = varBWV;
+                                                } else {
+                                                        type |= int(BreakLoopType::Break);
+                                                }
+                                        }
                                } else if (auto expList = expListFrom(stmt)) {
                                        BLOCK_START
                                        auto value = singleValueFrom(expList);
@@ -8135,40 +8866,30 @@ private:
                                        switch (sVal->get_id()) {
                                                case id<With_t>(): {
                                                        auto withNode = static_cast<With_t*>(sVal);
-                                                        if (hasContinueStatement(withNode->body)) {
+                                                        type |= getBreakLoopType(withNode->body, varBWV);
-                                                                return traversal::Stop;
+                                                        return traversal::Return;
-                                                        }
-                                                        break;
                                                }
                                                case id<Do_t>(): {
                                                        auto doNode = static_cast<Do_t*>(sVal);
-                                                        if (hasContinueStatement(doNode->body)) {
+                                                        type |= getBreakLoopType(doNode->body, varBWV);
-                                                                return traversal::Stop;
+                                                        return traversal::Return;
-                                                        }
-                                                        break;
                                                }
                                                case id<If_t>(): {
                                                        auto ifNode = static_cast<If_t*>(sVal);
                                                        for (auto n : ifNode->nodes.objects()) {
-                                                                if (hasContinueStatement(n)) {
+                                                                type |= getBreakLoopType(n, varBWV);
-                                                                        return traversal::Stop;
-                                                                }
                                                        }
-                                                        break;
+                                                        return traversal::Return;
                                                }
                                                case id<Switch_t>(): {
                                                        auto switchNode = static_cast<Switch_t*>(sVal);
                                                        for (auto branch : switchNode->branches.objects()) {
-                                                                if (hasContinueStatement(static_cast<SwitchCase_t*>(branch)->body)) {
+                                                                type |= getBreakLoopType(static_cast<SwitchCase_t*>(branch)->body, varBWV);
-                                                                        return traversal::Stop;
-                                                                }
                                                        }
                                                        if (switchNode->lastBranch) {
-                                                                if (hasContinueStatement(switchNode->lastBranch)) {
+                                                                type |= getBreakLoopType(switchNode->lastBranch, varBWV);
-                                                                        return traversal::Stop;
-                                                                }
                                                        }
-                                                        break;
+                                                        return traversal::Return;
                                                }
                                        }
                                        BLOCK_END
@@ -8182,12 +8903,13 @@ private:
                        }
                        return traversal::Return;
                });
+                return type;
        }
        void addDoToLastLineReturn(ast_node* body) {
-                if (auto block = ast_cast<Block_t>(body); block && !block->statements.empty()) {
+                if (auto block = ast_cast<Block_t>(body); block && !block->statementOrComments.empty()) {
-                        auto last = static_cast<Statement_t*>(block->statements.back());
+                        auto last = lastStatementFrom(block);
-                        if (last->content.is<Return_t>()) {
+                        if (last && last->content.is<Return_t>()) {
                                auto doNode = last->new_ptr<Do_t>();
                                auto newBody = last->new_ptr<Body_t>();
                                auto newStmt = last->new_ptr<Statement_t>();
@@ -8205,30 +8927,30 @@ private:
                }
        }
-        void transformLoopBody(ast_node* body, str_list& out, const std::string& appendContent, ExpUsage usage, ExpList_t* assignList = nullptr) {
+        void transformLoopBody(ast_node* body, str_list& out, uint32_t breakLoopType, ExpUsage usage, ExpList_t* assignList = nullptr) {
                str_list temp;
                bool extraDo = false;
-                bool withContinue = hasContinueStatement(body);
+                bool withContinue = hasContinue(breakLoopType);
                int target = getLuaTarget(body);
                std::string extraLabel;
                if (withContinue) {
                        if (target < 502) {
                                if (auto block = ast_cast<Block_t>(body)) {
-                                        if (!block->statements.empty()) {
+                                        if (!block->statementOrComments.empty()) {
-                                                auto stmt = static_cast<Statement_t*>(block->statements.back());
+                                                auto stmt = lastStatementFrom(block);
                                                if (auto breakLoop = ast_cast<BreakLoop_t>(stmt->content)) {
-                                                        extraDo = _parser.toString(breakLoop) == "break"sv;
+                                                        extraDo = breakLoop->type.is<Break_t>();
                                                }
                                        }
                                }
                                auto continueVar = getUnusedName("_continue_"sv);
                                addToScope(continueVar);
                                _continueVars.push({continueVar, nullptr});
-                                _buf << indent() << "local "sv << continueVar << " = false"sv << nll(body);
+                                _buf << indent() << "local "sv << continueVar << " = false"sv << nl(body);
-                                _buf << indent() << "repeat"sv << nll(body);
+                                _buf << indent() << "repeat"sv << nl(body);
                                pushScope();
                                if (extraDo) {
-                                        _buf << indent() << "do"sv << nll(body);
+                                        _buf << indent() << "do"sv << nl(body);
                                        pushScope();
                                }
                                temp.push_back(clearBuf());
@@ -8248,28 +8970,20 @@ private:
                        if (target < 502) {
                                if (extraDo) {
                                        popScope();
-                                        _buf << indent() << "end"sv << nll(body);
+                                        _buf << indent() << "end"sv << nl(body);
-                                }
-                                if (!appendContent.empty()) {
-                                        _buf << indent() << appendContent;
                                }
-                                _buf << indent() << _continueVars.top().var << " = true"sv << nll(body);
+                                _buf << indent() << _continueVars.top().var << " = true"sv << nl(body);
                                popScope();
-                                _buf << indent() << "until true"sv << nlr(body);
+                                _buf << indent() << "until true"sv << nl(body);
-                                _buf << indent() << "if not "sv << _continueVars.top().var << " then"sv << nlr(body);
+                                _buf << indent() << "if not "sv << _continueVars.top().var << " then"sv << nl(body);
-                                _buf << indent(1) << "break"sv << nlr(body);
+                                _buf << indent(1) << "break"sv << nl(body);
-                                _buf << indent() << "end"sv << nlr(body);
+                                _buf << indent() << "end"sv << nl(body);
                                temp.push_back(clearBuf());
                                _continueVars.pop();
                        } else {
-                                if (!appendContent.empty()) {
-                                        temp.push_back(indent() + appendContent);
-                                }
                                temp.push_back(extraLabel);
                                _continueVars.pop();
                        }
-                } else if (!appendContent.empty()) {
-                        temp.back().append(indent() + appendContent);
                }
                out.push_back(join(temp));
        }
@@ -8277,8 +8991,9 @@ private:
        std::string transformRepeatBody(Repeat_t* repeatNode, str_list& out) {
                str_list temp;
                bool extraDo = false;
-                auto body = repeatNode->body->content.get();
+                auto body = repeatNode->body.get();
-                bool withContinue = hasContinueStatement(body);
+                auto breakLoopType = getBreakLoopType(body, Empty);
+                bool withContinue = hasContinue(breakLoopType);
                std::string conditionVar;
                std::string extraLabel;
                ast_ptr<false, ExpListAssign_t> condAssign;
@@ -8286,10 +9001,10 @@ private:
                if (withContinue) {
                        if (target < 502) {
                                if (auto block = ast_cast<Block_t>(body)) {
-                                        if (!block->statements.empty()) {
+                                        if (!block->statementOrComments.empty()) {
-                                                auto stmt = static_cast<Statement_t*>(block->statements.back());
+                                                auto stmt = lastStatementFrom(block);
                                                if (auto breakLoop = ast_cast<BreakLoop_t>(stmt->content)) {
-                                                        extraDo = _parser.toString(breakLoop) == "break"sv;
+                                                        extraDo = breakLoop->type.is<Break_t>();
                                                }
                                        }
                                }
@@ -8304,12 +9019,12 @@ private:
                                        assign->values.push_back(repeatNode->condition);
                                        _continueVars.push({continueVar, assignment.get()});
                                }
-                                _buf << indent() << "local "sv << conditionVar << " = false"sv << nll(body);
+                                _buf << indent() << "local "sv << conditionVar << " = false"sv << nl(body);
-                                _buf << indent() << "local "sv << continueVar << " = false"sv << nll(body);
+                                _buf << indent() << "local "sv << continueVar << " = false"sv << nl(body);
-                                _buf << indent() << "repeat"sv << nll(body);
+                                _buf << indent() << "repeat"sv << nl(body);
                                pushScope();
                                if (extraDo) {
-                                        _buf << indent() << "do"sv << nll(body);
+                                        _buf << indent() << "do"sv << nl(body);
                                        pushScope();
                                }
                                temp.push_back(clearBuf());
@@ -8330,14 +9045,14 @@ private:
                                transformAssignment(_continueVars.top().condAssign, temp);
                                if (extraDo) {
                                        popScope();
-                                        _buf << indent() << "end"sv << nll(body);
+                                        _buf << indent() << "end"sv << nl(body);
                                }
-                                _buf << indent() << _continueVars.top().var << " = true"sv << nll(body);
+                                _buf << indent() << _continueVars.top().var << " = true"sv << nl(body);
                                popScope();
-                                _buf << indent() << "until true"sv << nlr(body);
+                                _buf << indent() << "until true"sv << nl(body);
-                                _buf << indent() << "if not "sv << _continueVars.top().var << " then"sv << nlr(body);
+                                _buf << indent() << "if not "sv << _continueVars.top().var << " then"sv << nl(body);
-                                _buf << indent(1) << "break"sv << nlr(body);
+                                _buf << indent(1) << "break"sv << nl(body);
-                                _buf << indent() << "end"sv << nlr(body);
+                                _buf << indent() << "end"sv << nl(body);
                                temp.push_back(clearBuf());
                                _continueVars.pop();
                        } else {
@@ -8349,34 +9064,48 @@ private:
                return conditionVar;
        }
-        void transformFor(For_t* forNode, str_list& out) {
+        void transformForNum(ForNum_t* forNum, str_list& out) {
                str_list temp;
-                transformForHead(forNode, temp);
+                transformForNumHead(forNum, temp);
-                transformLoopBody(forNode->body, temp, Empty, ExpUsage::Common);
+                auto breakLoopType = getBreakLoopType(forNum->body, Empty);
+                transformLoopBody(forNum->body, temp, breakLoopType, ExpUsage::Common);
                popScope();
-                out.push_back(join(temp) + indent() + "end"s + nlr(forNode));
+                out.push_back(join(temp) + indent() + "end"s + nl(forNum));
        }
-        std::string transformForInner(For_t* forNode, str_list& out) {
+        std::string transformForNumInner(ForNum_t* forNum, str_list& out) {
-                auto x = forNode;
+                auto x = forNum;
                std::string accum = getUnusedName("_accum_"sv);
                addToScope(accum);
                std::string len = getUnusedName("_len_"sv);
                addToScope(len);
-                _buf << indent() << "local "sv << accum << " = { }"sv << nll(forNode);
+                auto breakLoopType = getBreakLoopType(forNum->body, accum);
-                _buf << indent() << "local "sv << len << " = 1"sv << nll(forNode);
+                _buf << indent() << "local "sv << accum << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(forNum);
-                out.push_back(clearBuf());
+                out.emplace_back(clearBuf());
-                transformForHead(forNode, out);
+                _buf << indent() << "local "sv << len << " = 1"sv << nl(forNum);
-                auto expList = toAst<ExpList_t>(accum + '[' + len + ']', x);
+                auto& lenAssign = out.emplace_back(clearBuf());
-                auto lenLine = len + " = "s + len + " + 1"s + nlr(forNode->body);
+                transformForNumHead(forNum, out);
-                transformLoopBody(forNode->body, out, lenLine, ExpUsage::Assignment, expList);
+                if (hasBreakWithValue(breakLoopType)) {
+                        lenAssign.clear();
+                        transformLoopBody(forNum->body, out, breakLoopType, ExpUsage::Common);
+                } else {
+                        auto expList = toAst<ExpList_t>(accum + '[' + len + ']', x);
+                        auto followStmt = toAst<Statement_t>(len + "+=1"s, forNum->body);
+                        expList->followStmt = followStmt.get();
+                        transformLoopBody(forNum->body, out, breakLoopType, ExpUsage::Assignment, expList);
+                        if (!expList->followStmtProcessed) {
+                                lenAssign.clear();
+                        }
+                }
                popScope();
-                out.push_back(indent() + "end"s + nlr(forNode));
+                out.push_back(indent() + "end"s + nl(forNum));
                return accum;
        }
-        void transformForClosure(For_t* forNode, str_list& out) {
+        void transformForNumClosure(ForNum_t* forNum, str_list& out) {
-                auto simpleValue = forNode->new_ptr<SimpleValue_t>();
+                auto forNode = forNum->new_ptr<For_t>();
+                forNode->forLoop.set(forNum);
+                auto simpleValue = forNum->new_ptr<SimpleValue_t>();
                simpleValue->value.set(forNode);
                if (transformAsUpValueFunc(newExp(simpleValue, forNode), out)) {
                        return;
@@ -8386,26 +9115,26 @@ private:
                pushAnonVarArg();
                std::string& funcStart = temp.emplace_back();
                pushScope();
-                auto accum = transformForInner(forNode, temp);
+                auto accum = transformForNumInner(forNum, temp);
-                temp.push_back(indent() + "return "s + accum + nlr(forNode));
+                temp.push_back(indent() + "return "s + accum + nl(forNum));
                popScope();
-                funcStart = anonFuncStart() + nll(forNode);
+                funcStart = anonFuncStart() + nl(forNum);
                temp.push_back(indent() + anonFuncEnd());
                popAnonVarArg();
                popFunctionScope();
                out.push_back(join(temp));
        }
-        void transformForInPlace(For_t* forNode, str_list& out, ExpList_t* assignExpList = nullptr) {
+        void transformForNumInPlace(ForNum_t* forNum, str_list& out, ExpList_t* assignExpList) {
-                auto x = forNode;
+                auto x = forNum;
                str_list temp;
                bool isScoped = !currentScope().lastStatement;
                if (assignExpList) {
                        if (isScoped) {
-                                _buf << indent() << "do"sv << nll(forNode);
+                                _buf << indent() << "do"sv << nl(forNum);
                                pushScope();
                        }
-                        auto accum = transformForInner(forNode, temp);
+                        auto accum = transformForNumInner(forNum, temp);
                        auto assign = x->new_ptr<Assign_t>();
                        assign->values.push_back(toAst<Exp_t>(accum, x));
                        auto assignment = x->new_ptr<ExpListAssign_t>();
@@ -8414,14 +9143,11 @@ private:
                        transformAssignment(assignment, temp);
                        if (isScoped) {
                                popScope();
-                                temp.push_back(indent() + "end"s + nlr(forNode));
+                                temp.push_back(indent() + "end"s + nl(forNum));
                        }
                } else {
-                        auto accum = transformForInner(forNode, temp);
+                        auto accum = transformForNumInner(forNum, temp);
-                        auto returnNode = x->new_ptr<Return_t>();
+                        auto returnNode = newReturn(toAst<Exp_t>(accum, forNum));
-                        returnNode->explicitReturn = false;
-                        auto expListLow = toAst<ExpListLow_t>(accum, x);
-                        returnNode->valueList.set(expListLow);
                        transformReturn(returnNode, temp);
                }
                out.push_back(join(temp));
@@ -8448,12 +9174,13 @@ private:
        void transformForEach(ForEach_t* forEach, str_list& out) {
                str_list temp;
                bool extraScoped = transformForEachHead(forEach->nameList, forEach->loopValue, temp, false);
-                transformLoopBody(forEach->body, temp, Empty, ExpUsage::Common);
+                auto breakLoopType = getBreakLoopType(forEach->body, Empty);
+                transformLoopBody(forEach->body, temp, breakLoopType, ExpUsage::Common);
                popScope();
-                out.push_back(temp.front() + temp.back() + indent() + "end"s + nlr(forEach));
+                out.push_back(temp.front() + temp.back() + indent() + "end"s + nl(forEach));
                if (extraScoped) {
                        popScope();
-                        out.back().append(indent() + "end"s + nlr(forEach));
+                        out.back().append(indent() + "end"s + nl(forEach));
                }
        }
@@ -8463,22 +9190,35 @@ private:
                addToScope(accum);
                std::string len = getUnusedName("_len_"sv);
                addToScope(len);
-                _buf << indent() << "local "sv << accum << " = { }"sv << nll(forEach);
+                auto breakLoopType = getBreakLoopType(forEach->body, accum);
-                _buf << indent() << "local "sv << len << " = 1"sv << nll(forEach);
+                _buf << indent() << "local "sv << accum << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(forEach);
-                out.push_back(clearBuf());
+                out.emplace_back(clearBuf());
+                _buf << indent() << "local "sv << len << " = 1"sv << nl(forEach);
+                auto& lenAssign = out.emplace_back(clearBuf());
                transformForEachHead(forEach->nameList, forEach->loopValue, out, true);
-                auto expList = toAst<ExpList_t>(accum + '[' + len + ']', x);
+                if (hasBreakWithValue(breakLoopType)) {
-                auto lenLine = len + " = "s + len + " + 1"s + nlr(forEach->body);
+                        lenAssign.clear();
-                transformLoopBody(forEach->body, out, lenLine, ExpUsage::Assignment, expList);
+                        transformLoopBody(forEach->body, out, breakLoopType, ExpUsage::Common);
+                } else {
+                        auto expList = toAst<ExpList_t>(accum + '[' + len + ']', x);
+                        auto followStmt = toAst<Statement_t>(len + "+=1"s, forEach->body);
+                        expList->followStmt = followStmt.get();
+                        transformLoopBody(forEach->body, out, breakLoopType, ExpUsage::Assignment, expList);
+                        if (!expList->followStmtProcessed) {
+                                lenAssign.clear();
+                        }
+                }
                popScope();
-                out.push_back(indent() + "end"s + nlr(forEach));
+                out.push_back(indent() + "end"s + nl(forEach));
                return accum;
        }
        void transformForEachClosure(ForEach_t* forEach, str_list& out) {
+                auto forNode = forEach->new_ptr<For_t>();
+                forNode->forLoop.set(forEach);
                auto simpleValue = forEach->new_ptr<SimpleValue_t>();
-                simpleValue->value.set(forEach);
+                simpleValue->value.set(forNode);
-                if (transformAsUpValueFunc(newExp(simpleValue, forEach), out)) {
+                if (transformAsUpValueFunc(newExp(simpleValue, forNode), out)) {
                        return;
                }
                str_list temp;
@@ -8487,22 +9227,22 @@ private:
                std::string& funcStart = temp.emplace_back();
                pushScope();
                auto accum = transformForEachInner(forEach, temp);
-                temp.push_back(indent() + "return "s + accum + nlr(forEach));
+                temp.push_back(indent() + "return "s + accum + nl(forEach));
                popScope();
-                funcStart = anonFuncStart() + nll(forEach);
+                funcStart = anonFuncStart() + nl(forEach);
                temp.push_back(indent() + anonFuncEnd());
                popAnonVarArg();
                popFunctionScope();
                out.push_back(join(temp));
        }
-        void transformForEachInPlace(ForEach_t* forEach, str_list& out, ExpList_t* assignExpList = nullptr) {
+        void transformForEachInPlace(ForEach_t* forEach, str_list& out, ExpList_t* assignExpList) {
                auto x = forEach;
                str_list temp;
                bool isScoped = !currentScope().lastStatement;
                if (assignExpList) {
                        if (isScoped) {
-                                _buf << indent() << "do"sv << nll(forEach);
+                                _buf << indent() << "do"sv << nl(forEach);
                                pushScope();
                        }
                        auto accum = transformForEachInner(forEach, temp);
@@ -8514,19 +9254,58 @@ private:
                        transformAssignment(assignment, temp);
                        if (isScoped) {
                                popScope();
-                                temp.push_back(indent() + "end"s + nlr(forEach));
+                                temp.push_back(indent() + "end"s + nl(forEach));
                        }
                } else {
                        auto accum = transformForEachInner(forEach, temp);
-                        auto returnNode = x->new_ptr<Return_t>();
+                        auto returnNode = newReturn(toAst<Exp_t>(accum, forEach));
-                        returnNode->explicitReturn = false;
-                        auto expListLow = toAst<ExpListLow_t>(accum, x);
-                        returnNode->valueList.set(expListLow);
                        transformReturn(returnNode, temp);
                }
                out.push_back(join(temp));
        }
+        void transformFor(For_t* forNode, str_list& out) {
+                switch (forNode->forLoop->get_id()) {
+                        case id<ForNum_t>():
+                                transformForNum(static_cast<ForNum_t*>(forNode->forLoop.get()), out);
+                                break;
+                        case id<ForEach_t>():
+                                transformForEach(static_cast<ForEach_t*>(forNode->forLoop.get()), out);
+                                break;
+                        default:
+                                YUEE("AST node mismatch", forNode->forLoop.get());
+                                break;
+                }
+        }
+        void transformForClosure(For_t* forNode, str_list& out) {
+                switch (forNode->forLoop->get_id()) {
+                        case id<ForNum_t>():
+                                transformForNumClosure(static_cast<ForNum_t*>(forNode->forLoop.get()), out);
+                                break;
+                        case id<ForEach_t>():
+                                transformForEachClosure(static_cast<ForEach_t*>(forNode->forLoop.get()), out);
+                                break;
+                        default:
+                                YUEE("AST node mismatch", forNode->forLoop.get());
+                                break;
+                }
+        }
+        void transformForInPlace(For_t* forNode, str_list& out, ExpList_t* assignExpList) {
+                switch (forNode->forLoop->get_id()) {
+                        case id<ForNum_t>():
+                                transformForNumInPlace(static_cast<ForNum_t*>(forNode->forLoop.get()), out, assignExpList);
+                                break;
+                        case id<ForEach_t>():
+                                transformForEachInPlace(static_cast<ForEach_t*>(forNode->forLoop.get()), out, assignExpList);
+                                break;
+                        default:
+                                YUEE("AST node mismatch", forNode->forLoop.get());
+                                break;
+                }
+        }
        void transform_variable_pair(VariablePair_t* pair, str_list& out) {
                auto name = _parser.toString(pair->name);
                if (pair->name->name.is<UnicodeName_t>()) {
@@ -8536,10 +9315,12 @@ private:
                } else {
                        out.push_back(name + " = "s + name);
                }
-                if (_config.lintGlobalVariable && !isLocal(name)) {
+                if (_importedGlobal) {
+                        markGlobalImported(name);
+                } else if (_config.lintGlobalVariable && !isLocal(name)) {
                        auto key = name + ':' + std::to_string(pair->name->m_begin.m_line) + ':' + std::to_string(pair->name->m_begin.m_col);
-                        if (_globals.find(key) != _globals.end()) {
+                        if (_globals.find(key) == _globals.end()) {
-                                _globals[key] = {name, pair->name->m_begin.m_line, pair->name->m_begin.m_col, _funcLevel > 1 ? AccessType::Capture : AccessType::Read};
+                                _globals[key] = {name, pair->name->m_begin.m_line, pair->name->m_begin.m_col, _funcLevel > 1 ? AccessType::Capture : AccessType::Read, isSolidDefined(name)};
                        }
                }
        }
@@ -8653,12 +9434,64 @@ private:
                out.push_back(temp.empty() ? "\"\""s : join(temp, " .. "sv));
        }
+        void transformYAMLMultiline(YAMLMultiline_t* multiline, str_list& out) {
+                std::optional<std::string> indent;
+                str_list temp;
+                for (auto line_ : multiline->lines.objects()) {
+                        auto line = static_cast<YAMLLine_t*>(line_);
+                        auto indentStr = _parser.toString(line->indent);
+                        if (!indent) {
+                                indent = indentStr;
+                        }
+                        if (std::string_view{indentStr.c_str(), indent.value().size()} != indent.value()) {
+                                throw CompileError("inconsistent indent"sv, line);
+                        }
+                        indentStr = indentStr.substr(indent.value().size());
+                        str_list segs;
+                        bool firstSeg = true;
+                        for (auto seg_ : line->segments.objects()) {
+                                auto content = static_cast<YAMLLineContent_t*>(seg_)->content.get();
+                                switch (content->get_id()) {
+                                        case id<YAMLLineInner_t>(): {
+                                                auto seqStr = _parser.toString(content);
+                                                Utils::replace(seqStr, "\\#"sv, "#"sv);
+                                                if (firstSeg) {
+                                                        firstSeg = false;
+                                                        seqStr.insert(0, indentStr);
+                                                }
+                                                segs.push_back(Utils::toLuaDoubleString(seqStr));
+                                                break;
+                                        }
+                                        case id<Exp_t>(): {
+                                                if (firstSeg) {
+                                                        firstSeg = false;
+                                                        if (!indentStr.empty()) {
+                                                                segs.push_back(Utils::toLuaDoubleString(indentStr));
+                                                        }
+                                                }
+                                                transformExp(static_cast<Exp_t*>(content), segs, ExpUsage::Closure);
+                                                segs.back() = globalVar("tostring"sv, content, AccessType::Read) + '(' + segs.back() + ')';
+                                                break;
+                                        }
+                                        default: YUEE("AST node mismatch", content); break;
+                                }
+                        }
+                        temp.push_back(join(segs, " .. "sv));
+                }
+                auto str = join(temp, " .. '\\n' .. "sv);
+                Utils::replace(str, "\" .. '\\n' .. \""sv, "\\n"sv);
+                Utils::replace(str, "\" .. '\\n'"sv, "\\n\""sv);
+                Utils::replace(str, "'\\n' .. \""sv, "\"\\n"sv);
+                out.push_back(str);
+        }
        void transformString(String_t* string, str_list& out) {
                auto str = string->str.get();
                switch (str->get_id()) {
                        case id<SingleString_t>(): transformSingleString(static_cast<SingleString_t*>(str), out); break;
                        case id<DoubleString_t>(): transformDoubleString(static_cast<DoubleString_t*>(str), out); break;
                        case id<LuaString_t>(): transformLuaString(static_cast<LuaString_t*>(str), out); break;
+                        case id<YAMLMultiline_t>(): transformYAMLMultiline(static_cast<YAMLMultiline_t*>(str), out); break;
                        default: YUEE("AST node mismatch", str); break;
                }
        }
@@ -8689,7 +9522,7 @@ private:
                pushScope();
                transformClassDecl(classDecl, temp, ExpUsage::Return);
                popScope();
-                funcStart = anonFuncStart() + nll(classDecl);
+                funcStart = anonFuncStart() + nl(classDecl);
                temp.push_back(indent() + anonFuncEnd());
                popAnonVarArg();
                popFunctionScope();
@@ -8713,7 +9546,7 @@ private:
                        bool newDefined = false;
                        std::tie(className, newDefined, classTextName) = defineClassVariable(assignable);
                        if (newDefined) {
-                                temp.push_back(indent() + "local "s + className + nll(classDecl));
+                                temp.push_back(indent() + "local "s + className + nl(classDecl));
                        }
                        if (classTextName.empty()) {
                                if (auto chain = ast_cast<AssignableChain_t>(assignable->item)) {
@@ -8750,12 +9583,12 @@ private:
                        }
                }
                if (isScoped) {
-                        temp.push_back(indent() + "do"s + nll(classDecl));
+                        temp.push_back(indent() + "do"s + nl(classDecl));
                        pushScope();
                }
                auto classVar = getUnusedName("_class_"sv);
                addToScope(classVar);
-                temp.push_back(indent() + "local "s + classVar + nll(classDecl));
+                temp.push_back(indent() + "local "s + classVar + nl(classDecl));
                auto block = classDecl->new_ptr<Block_t>();
                str_list classConstVars;
                if (body) {
@@ -8764,7 +9597,7 @@ private:
                                if (auto statement = ast_cast<Statement_t>(item)) {
                                        ClassDecl_t* clsDecl = nullptr;
                                        if (auto assignment = assignmentFrom(statement)) {
-                                                block->statements.push_back(statement);
+                                                block->statementOrComments.push_back(statement);
                                                auto names = transformAssignDefs(assignment->expList.get(), DefOp::Mark);
                                                for (const auto& name : names) {
                                                        varDefs.push_back(name.first);
@@ -8794,12 +9627,12 @@ private:
                                                clsDecl = value->get_by_path<SimpleValue_t, ClassDecl_t>();
                                                BLOCK_END
                                        } else if (auto expList = expListFrom(statement)) {
-                                                block->statements.push_back(statement);
+                                                block->statementOrComments.push_back(statement);
                                                if (auto value = singleValueFrom(expList)) {
                                                        clsDecl = value->get_by_path<SimpleValue_t, ClassDecl_t>();
                                                }
                                        } else if (auto local = statement->content.as<Local_t>()) {
-                                                block->statements.push_back(statement);
+                                                block->statementOrComments.push_back(statement);
                                                if (auto values = local->item.as<LocalValues_t>()) {
                                                        for (auto name : values->nameList->names.objects()) {
                                                                auto varName = variableToString(static_cast<Variable_t*>(name));
@@ -8840,7 +9673,7 @@ private:
                                                auto names = transformAssignDefs(assignment->expList.get(), DefOp::Get);
                                                for (const auto& name : names) {
                                                        forceAddToScope(name.first);
-                                                        markVarConst(name.first);
+                                                        markVarLocalConst(name.first);
                                                        varDefs.push_back(name.first);
                                                        classConstVars.push_back(name.first);
                                                }
@@ -8854,7 +9687,7 @@ private:
                                                                for (const auto& item : destruct.items) {
                                                                        if (!item.targetVar.empty()) {
                                                                                forceAddToScope(item.targetVar);
-                                                                                markVarConst(item.targetVar);
+                                                                                markVarLocalConst(item.targetVar);
                                                                                varDefs.push_back(item.targetVar);
                                                                                classConstVars.push_back(item.targetVar);
                                                                        }
@@ -8862,7 +9695,6 @@ private:
                                                        }
                                                }
                                                auto stmt = statement->new_ptr<Statement_t>();
-                                                stmt->comments.dup(statement->comments);
                                                auto newAttrib = localAttrib->new_ptr<LocalAttrib_t>();
                                                newAttrib->attrib.set(localAttrib->attrib);
                                                newAttrib->leftList.dup(localAttrib->leftList);
@@ -8870,7 +9702,7 @@ private:
                                                newAttrib->forceLocal = false;
                                                stmt->content.set(newAttrib);
                                                stmt->appendix.set(statement->appendix);
-                                                block->statements.push_back(stmt);
+                                                block->statementOrComments.push_back(stmt);
                                        } else if (statement->content.is<Global_t>()) {
                                                throw CompileError("global statement is not allowed here"sv, statement->content);
                                        }
@@ -8884,7 +9716,7 @@ private:
                                }
                        }
                        if (!varDefs.empty()) {
-                                temp.push_back(indent() + "local "s + join(varDefs, ", "sv) + nll(body));
+                                temp.push_back(indent() + "local "s + join(varDefs, ", "sv) + nl(body));
                        }
                }
                std::string parent, parentVar;
@@ -8894,7 +9726,7 @@ private:
                        transformExp(extend, temp, ExpUsage::Closure);
                        parent = std::move(temp.back());
                        temp.pop_back();
-                        temp.push_back(indent() + "local "s + parentVar + " = "s + parent + nll(classDecl));
+                        temp.push_back(indent() + "local "s + parentVar + " = "s + parent + nl(classDecl));
                }
                auto baseVar = getUnusedName("_base_"sv);
                addToScope(baseVar);
@@ -8913,7 +9745,7 @@ private:
                                                for (; it != members.end(); ++it) {
                                                        auto& member = *it;
                                                        if (member.type == MemType::Property) {
-                                                                statements.push_back(indent() + member.item + nll(content));
+                                                                statements.push_back(indent() + member.item + nl(content));
                                                        } else {
                                                                member.item = indent(1) + member.item;
                                                        }
@@ -8925,32 +9757,34 @@ private:
                                }
                        }
                        for (const auto& classVar : classConstVars) {
-                                auto& scope = _scopes.back();
+                                forceAddToScope(classVar);
-                                scope.vars->insert_or_assign(classVar, VarType::Local);
                        }
-                        for (auto stmt_ : block->statements.objects()) {
+                        forceAddToScope("self"s);
-                                transformStatement(static_cast<Statement_t*>(stmt_), statements);
+                        for (auto stmt_ : block->statementOrComments.objects()) {
+                                if (auto stmt = ast_cast<Statement_t>(stmt_)) {
+                                        transformStatement(stmt, statements);
+                                }
                        }
                        for (auto& member : members) {
                                switch (member.type) {
                                        case MemType::Common:
-                                                commons.push_back((commons.empty() ? Empty : ',' + nll(member.node)) + member.item);
+                                                commons.push_back((commons.empty() ? Empty : ',' + nl(member.node)) + member.item);
                                                break;
                                        case MemType::Builtin:
-                                                builtins.push_back((builtins.empty() ? Empty : ',' + nll(member.node)) + member.item);
+                                                builtins.push_back((builtins.empty() ? Empty : ',' + nl(member.node)) + member.item);
                                                break;
                                        default: break;
                                }
                        }
                        if (!commons.empty()) {
-                                temp.back() += '{' + nll(body);
+                                temp.back() += '{' + nl(body);
-                                temp.push_back(join(commons) + nll(body));
+                                temp.push_back(join(commons) + nl(body));
-                                temp.push_back(indent() + '}' + nll(body));
+                                temp.push_back(indent() + '}' + nl(body));
                        } else {
-                                temp.back() += "{ }"s + nll(body);
+                                temp.back() += "{ }"s + nl(body);
                        }
                } else {
-                        temp.back() += "{ }"s + nll(classDecl);
+                        temp.back() += "{ }"s + nl(classDecl);
                }
                if (classDecl->mixes) {
                        auto item = getUnusedName("_item_"sv);
@@ -8983,72 +9817,72 @@ private:
                        transformAssignment(assignment, tmp);
                }
                if (extend) {
-                        _buf << indent() << "setmetatable("sv << baseVar << ", "sv << parentVar << ".__base)"sv << nll(classDecl);
+                        _buf << indent() << "setmetatable("sv << baseVar << ", "sv << parentVar << ".__base)"sv << nl(classDecl);
                }
-                _buf << indent() << classVar << " = "sv << globalVar("setmetatable"sv, classDecl, AccessType::Read) << "({"sv << nll(classDecl);
+                _buf << indent() << classVar << " = "sv << globalVar("setmetatable"sv, classDecl, AccessType::Read) << "({"sv << nl(classDecl);
                if (!builtins.empty()) {
-                        _buf << join(builtins) << ',' << nll(classDecl);
+                        _buf << join(builtins) << ',' << nl(classDecl);
                } else {
                        if (extend) {
-                                _buf << indent(1) << "__init = function(self, ...)"sv << nll(classDecl);
+                                _buf << indent(1) << "__init = function(self, ...)"sv << nl(classDecl);
-                                _buf << indent(2) << "return "sv << classVar << ".__parent.__init(self, ...)"sv << nll(classDecl);
+                                _buf << indent(2) << "return "sv << classVar << ".__parent.__init(self, ...)"sv << nl(classDecl);
-                                _buf << indent(1) << "end,"sv << nll(classDecl);
+                                _buf << indent(1) << "end,"sv << nl(classDecl);
                        } else {
-                                _buf << indent(1) << "__init = function() end,"sv << nll(classDecl);
+                                _buf << indent(1) << "__init = function() end,"sv << nl(classDecl);
                        }
                }
                _buf << indent(1) << "__base = "sv << baseVar;
                if (!classTextName.empty()) {
-                        _buf << ","sv << nll(classDecl);
+                        _buf << ","sv << nl(classDecl);
                        _buf << indent(1) << "__name = "sv << classTextName;
                }
                if (extend) {
-                        _buf << ","sv << nll(classDecl);
+                        _buf << ","sv << nl(classDecl);
                        _buf << indent(1) << "__parent = "sv << parentVar;
                }
-                _buf << nll(classDecl);
+                _buf << nl(classDecl);
-                _buf << indent() << "}, {"sv << nll(classDecl);
+                _buf << indent() << "}, {"sv << nl(classDecl);
                if (extend) {
-                        _buf << indent(1) << "__index = function(cls, name)"sv << nll(classDecl);
+                        _buf << indent(1) << "__index = function(cls, name)"sv << nl(classDecl);
-                        _buf << indent(2) << "local val = rawget("sv << baseVar << ", name)"sv << nll(classDecl);
+                        _buf << indent(2) << "local val = rawget("sv << baseVar << ", name)"sv << nl(classDecl);
-                        _buf << indent(2) << "if val == nil then"sv << nll(classDecl);
+                        _buf << indent(2) << "if val == nil then"sv << nl(classDecl);
-                        _buf << indent(3) << "local parent = rawget(cls, \"__parent\")"sv << nll(classDecl);
+                        _buf << indent(3) << "local parent = rawget(cls, \"__parent\")"sv << nl(classDecl);
-                        _buf << indent(3) << "if parent then"sv << nll(classDecl);
+                        _buf << indent(3) << "if parent then"sv << nl(classDecl);
-                        _buf << indent(4) << "return parent[name]"sv << nll(classDecl);
+                        _buf << indent(4) << "return parent[name]"sv << nl(classDecl);
-                        _buf << indent(3) << "end"sv << nll(classDecl);
+                        _buf << indent(3) << "end"sv << nl(classDecl);
-                        _buf << indent(2) << "else"sv << nll(classDecl);
+                        _buf << indent(2) << "else"sv << nl(classDecl);
-                        _buf << indent(3) << "return val"sv << nll(classDecl);
+                        _buf << indent(3) << "return val"sv << nl(classDecl);
-                        _buf << indent(2) << "end"sv << nll(classDecl);
+                        _buf << indent(2) << "end"sv << nl(classDecl);
-                        _buf << indent(1) << "end,"sv << nll(classDecl);
+                        _buf << indent(1) << "end,"sv << nl(classDecl);
                } else {
-                        _buf << indent(1) << "__index = "sv << baseVar << ","sv << nll(classDecl);
+                        _buf << indent(1) << "__index = "sv << baseVar << ","sv << nl(classDecl);
                }
-                _buf << indent(1) << "__call = function(cls, ...)"sv << nll(classDecl);
+                _buf << indent(1) << "__call = function(cls, ...)"sv << nl(classDecl);
                pushScope();
                auto selfVar = getUnusedName("_self_"sv);
                addToScope(selfVar);
-                _buf << indent(1) << "local "sv << selfVar << " = setmetatable({ }, "sv << baseVar << ")"sv << nll(classDecl);
+                _buf << indent(1) << "local "sv << selfVar << " = setmetatable({ }, "sv << baseVar << ")"sv << nl(classDecl);
-                _buf << indent(1) << "cls.__init("sv << selfVar << ", ...)"sv << nll(classDecl);
+                _buf << indent(1) << "cls.__init("sv << selfVar << ", ...)"sv << nl(classDecl);
-                _buf << indent(1) << "return "sv << selfVar << nll(classDecl);
+                _buf << indent(1) << "return "sv << selfVar << nl(classDecl);
                popScope();
-                _buf << indent(1) << "end"sv << nll(classDecl);
+                _buf << indent(1) << "end"sv << nl(classDecl);
-                _buf << indent() << "})"sv << nll(classDecl);
+                _buf << indent() << "})"sv << nl(classDecl);
-                _buf << indent() << baseVar << ".__class = "sv << classVar << nll(classDecl);
+                _buf << indent() << baseVar << ".__class = "sv << classVar << nl(classDecl);
                if (!statements.empty()) {
-                        _buf << indent() << "local self = "sv << classVar << ';' << nll(classDecl);
+                        _buf << indent() << "local self = "sv << classVar << ';' << nl(classDecl);
                }
                _buf << join(statements);
                if (extend) {
-                        _buf << indent() << "if "sv << parentVar << ".__inherited then"sv << nll(classDecl);
+                        _buf << indent() << "if "sv << parentVar << ".__inherited then"sv << nl(classDecl);
-                        _buf << indent(1) << parentVar << ".__inherited("sv << parentVar << ", "sv << classVar << ")"sv << nll(classDecl);
+                        _buf << indent(1) << parentVar << ".__inherited("sv << parentVar << ", "sv << classVar << ")"sv << nl(classDecl);
-                        _buf << indent() << "end"sv << nll(classDecl);
+                        _buf << indent() << "end"sv << nl(classDecl);
                }
                if (!assignItem.empty()) {
-                        _buf << indent() << assignItem << " = "sv << classVar << nll(classDecl);
+                        _buf << indent() << assignItem << " = "sv << classVar << nl(classDecl);
                }
                switch (usage) {
                        case ExpUsage::Return: {
-                                _buf << indent() << "return "sv << classVar << nlr(classDecl);
+                                _buf << indent() << "return "sv << classVar << nl(classDecl);
                                break;
                        }
                        case ExpUsage::Assignment: {
@@ -9060,7 +9894,7 @@ private:
                temp.push_back(clearBuf());
                if (isScoped) {
                        popScope();
-                        temp.push_back(indent() + "end"s + nlr(classDecl));
+                        temp.push_back(indent() + "end"s + nl(classDecl));
                }
                out.push_back(join(temp));
        }
@@ -9223,7 +10057,7 @@ private:
                pushScope();
                transformWith(with, temp, nullptr, true);
                popScope();
-                funcStart = anonFuncStart() + nll(with);
+                funcStart = anonFuncStart() + nl(with);
                temp.push_back(indent() + anonFuncEnd());
                popAnonVarArg();
                popFunctionScope();
@@ -9236,11 +10070,11 @@ private:
                std::string withVar;
                bool needScope = !currentScope().lastStatement && !returnValue;
                bool extraScope = false;
-                if (with->assigns) {
+                if (with->assign) {
                        auto vars = getAssignVars(with);
                        if (vars.front().empty() || isDeclaredAsGlobal(vars.front())) {
-                                if (with->assigns->values.objects().size() == 1) {
+                                if (with->assign->values.objects().size() == 1) {
-                                        auto var = singleVariableFrom(with->assigns->values.objects().front(), AccessType::Read);
+                                        auto var = singleVariableFrom(with->assign->values.objects().front(), AccessType::Read);
                                        if (!var.empty() && isLocal(var)) {
                                                withVar = var;
                                        }
@@ -9250,11 +10084,11 @@ private:
                                        auto assignment = x->new_ptr<ExpListAssign_t>();
                                        assignment->expList.set(toAst<ExpList_t>(withVar, x));
                                        auto assign = x->new_ptr<Assign_t>();
-                                        assign->values.push_back(with->assigns->values.objects().front());
+                                        assign->values.push_back(with->assign->values.objects().front());
                                        assignment->action.set(assign);
                                        if (needScope) {
                                                extraScope = true;
-                                                temp.push_back(indent() + "do"s + nll(with));
+                                                temp.push_back(indent() + "do"s + nl(with));
                                                pushScope();
                                        }
                                        transformAssignment(assignment, temp);
@@ -9264,7 +10098,7 @@ private:
                                auto assign = x->new_ptr<Assign_t>();
                                assign->values.push_back(toAst<Exp_t>(withVar, x));
                                bool skipFirst = true;
-                                for (auto value : with->assigns->values.objects()) {
+                                for (auto value : with->assign->values.objects()) {
                                        if (skipFirst) {
                                                skipFirst = false;
                                                continue;
@@ -9277,10 +10111,10 @@ private:
                                withVar = vars.front();
                                auto assignment = x->new_ptr<ExpListAssign_t>();
                                assignment->expList.set(with->valueList);
-                                assignment->action.set(with->assigns);
+                                assignment->action.set(with->assign);
                                if (needScope) {
                                        extraScope = true;
-                                        temp.push_back(indent() + "do"s + nll(with));
+                                        temp.push_back(indent() + "do"s + nl(with));
                                        pushScope();
                                }
                                transformAssignment(assignment, temp);
@@ -9296,7 +10130,7 @@ private:
                                assignment->action.set(assign);
                                if (needScope) {
                                        extraScope = true;
-                                        temp.push_back(indent() + "do"s + nll(with));
+                                        temp.push_back(indent() + "do"s + nl(with));
                                        pushScope();
                                }
                                transformAssignment(assignment, temp);
@@ -9350,27 +10184,69 @@ private:
                        });
                        popScope();
                        if (extraScope) {
-                                temp.push_back(indent() + "do"s + nll(with));
+                                temp.push_back(indent() + "do"s + nl(with));
                                pushScope();
                        }
                }
                _withVars.push(withVar);
+                std::string breakWithVar;
+                if (assignList || returnValue) {
+                        auto breakLoopType = getBreakLoopType(with->body, withVar);
+                        if (hasBreakWithValue(breakLoopType)) {
+                                breakWithVar = withVar;
+                        }
+                }
                if (with->eop) {
                        auto ifNode = x->new_ptr<If_t>();
                        ifNode->type.set(toAst<IfType_t>("if"sv, x));
                        ifNode->nodes.push_back(toAst<IfCond_t>(withVar + "~=nil"s, x));
                        ifNode->nodes.push_back(with->body);
-                        transformIf(ifNode, temp, ExpUsage::Common);
+                        if (breakWithVar.empty()) {
+                                transformIf(ifNode, temp, ExpUsage::Common);
+                        } else {
+                                auto simpleValue = x->new_ptr<SimpleValue_t>();
+                                simpleValue->value.set(ifNode);
+                                auto exp = newExp(simpleValue, x);
+                                auto expList = x->new_ptr<ExpList_t>();
+                                expList->exprs.push_back(exp);
+                                auto expListAssign = x->new_ptr<ExpListAssign_t>();
+                                expListAssign->expList.set(expList);
+                                auto stmt = x->new_ptr<Statement_t>();
+                                stmt->content.set(expListAssign);
+                                auto repeatNode = toAst<Repeat_t>("repeat\n\t--\nuntil true"s, x);
+                                auto block = x->new_ptr<Block_t>();
+                                block->statementOrComments.push_back(stmt);
+                                repeatNode->body.set(block);
+                                auto sVal = x->new_ptr<SimpleValue_t>();
+                                sVal->value.set(repeatNode);
+                                auto asmt = assignmentFrom(toAst<Exp_t>(breakWithVar, x), newExp(sVal, x), x);
+                                transformAssignment(asmt, temp);
+                        }
                } else {
                        bool transformed = false;
-                        if (!extraScope && assignList) {
+                        if (!breakWithVar.empty()) {
+                                auto repeatNode = toAst<Repeat_t>("repeat\n\t--\nuntil true"s, x);
+                                auto block = x->new_ptr<Block_t>();
+                                if (auto blk = with->body.as<Block_t>()) {
+                                        block->statementOrComments.dup(blk->statementOrComments);
+                                } else {
+                                        auto stmt = with->body.to<Statement_t>();
+                                        block->statementOrComments.push_back(stmt);
+                                }
+                                repeatNode->body.set(block);
+                                auto sVal = x->new_ptr<SimpleValue_t>();
+                                sVal->value.set(repeatNode);
+                                auto asmt = assignmentFrom(toAst<Exp_t>(breakWithVar, x), newExp(sVal, x), x);
+                                transformAssignment(asmt, temp);
+                                transformed = true;
+                        } else if (!extraScope && assignList) {
                                if (auto block = with->body.as<Block_t>()) {
-                                        if (!block->statements.empty()) {
+                                        if (!block->statementOrComments.empty()) {
-                                                Statement_t* stmt = static_cast<Statement_t*>(block->statements.back());
+                                                Statement_t* stmt = lastStatementFrom(block);
-                                                if (stmt->content.is<Return_t>()) {
+                                                if (stmt && stmt->content.is<Return_t>()) {
                                                        auto newBlock = with->body->new_ptr<Block_t>();
-                                                        newBlock->statements.dup(block->statements);
+                                                        newBlock->statementOrComments.dup(block->statementOrComments);
-                                                        newBlock->statements.pop_back();
+                                                        newBlock->statementOrComments.pop_back();
                                                        transform_plain_body(newBlock, temp, ExpUsage::Common);
                                                        auto newBody = stmt->new_ptr<Body_t>();
                                                        newBody->content.set(stmt);
@@ -9408,12 +10284,12 @@ private:
                if (returnValue) {
                        auto last = lastStatementFrom(with->body);
                        if (last && !last->content.is<Return_t>()) {
-                                temp.push_back(indent() + "return "s + withVar + nll(with));
+                                temp.push_back(indent() + "return "s + withVar + nl(with));
                        }
                }
                if (extraScope) {
                        popScope();
-                        temp.push_back(indent() + "end"s + nll(with));
+                        temp.push_back(indent() + "end"s + nl(with));
                }
                out.push_back(join(temp));
        }
@@ -9428,12 +10304,18 @@ private:
                switch (item->get_id()) {
                        case id<ClassDecl_t>(): {
                                auto classDecl = static_cast<ClassDecl_t*>(item);
+                                std::string varName;
                                if (classDecl->name) {
                                        if (auto var = classDecl->name->item.as<Variable_t>()) {
-                                                addGlobalVar(variableToString(var), classDecl->name->item);
+                                                varName = variableToString(var);
+                                                addGlobalVar(varName, var);
                                        }
                                }
+                                if (varName.empty()) {
+                                        throw CompileError("missing name for class", classDecl);
+                                }
                                transformClassDecl(classDecl, out, ExpUsage::Common);
+                                markVarGlobalConst(varName);
                                break;
                        }
                        case id<GlobalOp_t>():
@@ -9447,9 +10329,11 @@ private:
                                auto values = global->item.to<GlobalValues_t>();
                                if (values->valueList) {
                                        auto expList = x->new_ptr<ExpList_t>();
+                                        str_list varNames;
                                        for (auto name : values->nameList->names.objects()) {
                                                auto var = static_cast<Variable_t*>(name);
-                                                addGlobalVar(variableToString(var), var);
+                                                varNames.emplace_back(variableToString(var));
+                                                addGlobalVar(varNames.back(), var);
                                                auto callable = x->new_ptr<Callable_t>();
                                                callable->item.set(name);
                                                auto chainValue = x->new_ptr<ChainValue_t>();
@@ -9460,18 +10344,27 @@ private:
                                        auto assignment = x->new_ptr<ExpListAssign_t>();
                                        assignment->expList.set(expList);
                                        auto assign = x->new_ptr<Assign_t>();
-                                        if (auto expListLow = values->valueList.as<ExpListLow_t>()) {
+                                        if (auto expList = values->valueList.as<ExpList_t>()) {
-                                                assign->values.dup(expListLow->exprs);
+                                                assign->values.dup(expList->exprs);
                                        } else {
                                                auto tableBlock = values->valueList.to<TableBlock_t>();
                                                assign->values.push_back(tableBlock);
                                        }
                                        assignment->action.set(assign);
                                        transformAssignment(assignment, out);
+                                        if (global->constAttrib) {
+                                                for (const auto& name : varNames) {
+                                                        markVarGlobalConst(name);
+                                                }
+                                        }
                                } else {
                                        for (auto name : values->nameList->names.objects()) {
                                                auto var = static_cast<Variable_t*>(name);
-                                                addGlobalVar(variableToString(var), var);
+                                                auto varName = variableToString(var);
+                                                addGlobalVar(varName, var);
+                                                if (global->constAttrib) {
+                                                        markVarGlobalConst(varName);
+                                                }
                                        }
                                }
                                break;
@@ -9608,7 +10501,7 @@ private:
                                        }
                                }
                                if (_info.exportDefault) {
-                                        out.back().append(indent() + _info.moduleName + " = "s + names.back().first + nlr(exportNode));
+                                        out.back().append(indent() + _info.moduleName + " = "s + names.back().first + nl(exportNode));
                                } else {
                                        str_list lefts, rights;
                                        for (const auto& name : names) {
@@ -9621,7 +10514,7 @@ private:
                                                lefts.push_back(_info.moduleName + "[\""s + realName + "\"]"s);
                                                rights.push_back(name.first);
                                        }
-                                        out.back().append(indent() + join(lefts, ", "sv) + " = "s + join(rights, ", "sv) + nlr(exportNode));
+                                        out.back().append(indent() + join(lefts, ", "sv) + " = "s + join(rights, ", "sv) + nl(exportNode));
                                }
                        }
                } else {
@@ -9705,12 +10598,12 @@ private:
                                case id<CompForEach_t>():
                                        transformCompForEach(static_cast<CompForEach_t*>(item), temp);
                                        break;
-                                case id<CompFor_t>():
+                                case id<CompForNum_t>():
-                                        transformCompFor(static_cast<CompFor_t*>(item), temp);
+                                        transformCompForNum(static_cast<CompForNum_t*>(item), temp);
                                        break;
                                case id<Exp_t>():
                                        transformExp(static_cast<Exp_t*>(item), temp, ExpUsage::Closure);
-                                        temp.back() = indent() + "if "s + temp.back() + " then"s + nll(item);
+                                        temp.back() = indent() + "if "s + temp.back() + " then"s + nl(item);
                                        pushScope();
                                        break;
                                default: YUEE("AST node mismatch", item); break;
@@ -9723,27 +10616,27 @@ private:
                for (size_t i = 0; i < compInner->items.objects().size(); ++i) {
                        popScope();
                }
-                _buf << indent() << "local "sv << tbl << " = { }"sv << nll(comp);
+                _buf << indent() << "local "sv << tbl << " = { }"sv << nl(comp);
                _buf << join(temp);
                pushScope();
                if (!comp->value) {
                        auto keyVar = getUnusedName("_key_"sv);
                        auto valVar = getUnusedName("_val_"sv);
-                        _buf << indent(int(temp.size()) - 1) << "local "sv << keyVar << ", "sv << valVar << " = "sv << kv.front() << nll(comp);
+                        _buf << indent(int(temp.size()) - 1) << "local "sv << keyVar << ", "sv << valVar << " = "sv << kv.front() << nl(comp);
                        kv.front() = keyVar;
                        kv.push_back(valVar);
                }
-                _buf << indent(int(temp.size()) - 1) << tbl << "["sv << kv.front() << "] = "sv << kv.back() << nll(comp);
+                _buf << indent(int(temp.size()) - 1) << tbl << "["sv << kv.front() << "] = "sv << kv.back() << nl(comp);
                for (int ind = int(temp.size()) - 2; ind > -1; --ind) {
-                        _buf << indent(ind) << "end"sv << nll(comp);
+                        _buf << indent(ind) << "end"sv << nl(comp);
                }
                popScope();
-                _buf << indent() << "end"sv << nll(comp);
+                _buf << indent() << "end"sv << nl(comp);
                switch (usage) {
                        case ExpUsage::Closure:
-                                out.push_back(clearBuf() + indent() + "return "s + tbl + nlr(comp));
+                                out.push_back(clearBuf() + indent() + "return "s + tbl + nl(comp));
                                popScope();
-                                out.back().insert(0, anonFuncStart() + nll(comp));
+                                out.back().insert(0, anonFuncStart() + nl(comp));
                                out.back().append(indent() + anonFuncEnd());
                                popAnonVarArg();
                                popFunctionScope();
@@ -9759,21 +10652,21 @@ private:
                                out.back().append(temp.back());
                                if (extraScope) {
                                        popScope();
-                                        out.back().insert(0, indent() + "do"s + nll(comp));
+                                        out.back().insert(0, indent() + "do"s + nl(comp));
-                                        out.back().append(indent() + "end"s + nlr(comp));
+                                        out.back().append(indent() + "end"s + nl(comp));
                                }
                                break;
                        }
                        case ExpUsage::Return:
-                                out.push_back(clearBuf() + indent() + "return "s + tbl + nlr(comp));
+                                out.push_back(clearBuf() + indent() + "return "s + tbl + nl(comp));
                                break;
                        default:
                                break;
                }
        }
-        void transformCompFor(CompFor_t* comp, str_list& out) {
+        void transformCompForNum(CompForNum_t* comp, str_list& out) {
-                transformForHead(comp->varName, comp->startValue, comp->stopValue, comp->stepValue, out);
+                transformForNumHead(comp->varName, comp->startValue, comp->stopValue, comp->stepValue, out);
        }
        void transformTableBlockIndent(TableBlockIndent_t* table, str_list& out) {
@@ -9803,25 +10696,64 @@ private:
                        funcStart = &temp.emplace_back();
                        pushScope();
                } else {
-                        temp.push_back(indent() + "do"s + nll(doNode));
+                        temp.push_back(indent() + "do"s + nl(doNode));
                        pushScope();
                }
                transformBody(doNode->body, temp, usage, assignList);
                if (usage == ExpUsage::Closure) {
                        popScope();
-                        *funcStart = anonFuncStart() + nll(doNode);
+                        *funcStart = anonFuncStart() + nl(doNode);
                        temp.push_back(indent() + anonFuncEnd());
                        popAnonVarArg();
                        popFunctionScope();
                } else {
                        popScope();
-                        temp.push_back(indent() + "end"s + nlr(doNode));
+                        temp.push_back(indent() + "end"s + nl(doNode));
                }
                out.push_back(join(temp));
        }
-        void transformTry(Try_t* tryNode, str_list& out, ExpUsage usage) {
+        void transformTry(Try_t* tryNode, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
                auto x = tryNode;
+                if (tryNode->eop && usage == ExpUsage::Assignment) {
+                        str_list rets;
+                        pushScope();
+                        auto okVar = getUnusedName("_ok_"sv);
+                        for (size_t i = 0; i < assignList->exprs.size(); i++) {
+                                auto retVar = getUnusedName("_ret_"sv);
+                                rets.emplace_back(retVar);
+                                addToScope(retVar);
+                        }
+                        popScope();
+                        auto varList = join(rets, ","sv);
+                        auto ifNode = toAst<If_t>("if "s + okVar + ',' + varList + ":=try nil then "s + varList, x);
+                        auto exp = ast_to<IfCond_t>(ifNode->nodes.front())->assignment->assign->values.front();
+                        auto sVal = simpleSingleValueFrom(exp);
+                        auto newTry = sVal->value.to<Try_t>();
+                        newTry->func.set(tryNode->func);
+                        newTry->catchBlock.set(tryNode->catchBlock);
+                        auto assignment = x->new_ptr<ExpListAssign_t>();
+                        assignment->expList.set(assignList);
+                        auto assign = x->new_ptr<Assign_t>();
+                        assign->values.push_back(ifNode);
+                        assignment->action.set(assign);
+                        transformAssignment(assignment, out);
+                        return;
+                }
+                if (tryNode->eop && usage != ExpUsage::Common) {
+                        auto okVar = getUnusedName("_ok_"sv);
+                        auto code = "do\n\t"s + okVar + ", ... = try nil\n\t... if "s + okVar;
+                        auto doNode = toAst<Do_t>(code, x);
+                        auto block = doNode->body->content.to<Block_t>();
+                        auto asmt = static_cast<Statement_t*>(block->statementOrComments.front())->content.to<ExpListAssign_t>();
+                        auto assign = asmt->action.to<Assign_t>();
+                        auto sVal = simpleSingleValueFrom(assign->values.back());
+                        auto newTry = sVal->value.to<Try_t>();
+                        newTry->func.set(tryNode->func);
+                        newTry->catchBlock.set(tryNode->catchBlock);
+                        transformDo(doNode, out, usage);
+                        return;
+                }
                ast_ptr<true, Exp_t> errHandler;
                if (tryNode->catchBlock) {
                        auto catchBlock = tryNode->catchBlock.get();
@@ -9837,8 +10769,8 @@ private:
                tryFunc.set(tryNode->func);
                if (auto tryBlock = tryFunc.as<Block_t>()) {
                        BLOCK_START
-                        BREAK_IF(tryBlock->statements.size() != 1);
+                        BREAK_IF(countStatementFrom(tryBlock) != 1);
-                        auto stmt = static_cast<Statement_t*>(tryBlock->statements.front());
+                        auto stmt = firstStatementFrom(tryBlock);
                        auto expListAssign = stmt->content.as<ExpListAssign_t>();
                        BREAK_IF(!expListAssign);
                        BREAK_IF(expListAssign->action);
@@ -9902,7 +10834,7 @@ private:
                                auto stmt = x->new_ptr<Statement_t>();
                                stmt->content.set(expListAssign);
                                auto block = x->new_ptr<Block_t>();
-                                block->statements.push_back(stmt);
+                                block->statementOrComments.push_back(stmt);
                                tryFunc.set(block);
                        }
                }
@@ -9930,7 +10862,7 @@ private:
                                        }
                                        if (usage == ExpUsage::Common) {
                                                out.back().insert(0, indent());
-                                                out.back().append(nlr(x));
+                                                out.back().append(nl(x));
                                        }
                                        return;
                                }
@@ -9955,7 +10887,7 @@ private:
                        }
                        if (usage == ExpUsage::Common) {
                                out.back().insert(0, indent());
-                                out.back().append(nlr(x));
+                                out.back().append(nl(x));
                        }
                        return;
                } else if (auto value = singleValueFrom(tryFunc)) {
@@ -10016,7 +10948,7 @@ private:
                        }
                        if (usage == ExpUsage::Common) {
                                out.back().insert(0, indent());
-                                out.back().append(nlr(x));
+                                out.back().append(nl(x));
                        }
                        return;
                        BLOCK_END
@@ -10035,13 +10967,13 @@ private:
                }
                if (usage == ExpUsage::Common) {
                        out.back().insert(0, indent());
-                        out.back().append(nlr(x));
+                        out.back().append(nl(x));
                }
        }
        void transformImportFrom(ImportFrom_t* importNode, str_list& out) {
                str_list temp;
-                auto x = importNode;
+                auto x = importNode->item.get();
                auto objVar = singleVariableFrom(importNode->item, AccessType::Read);
                ast_ptr<false, ExpListAssign_t> objAssign;
                if (objVar.empty()) {
@@ -10111,11 +11043,11 @@ private:
                if (objAssign) {
                        auto preDef = toLocalDecl(transformAssignDefs(expList, DefOp::Mark));
                        if (!preDef.empty()) {
-                                temp.push_back(preDef + nll(importNode));
+                                temp.push_back(preDef + nl(importNode));
                        }
                        if (!currentScope().lastStatement) {
                                extraScope = true;
-                                temp.push_back(indent() + "do"s + nll(importNode));
+                                temp.push_back(indent() + "do"s + nl(importNode));
                                pushScope();
                        }
                        transformAssignment(objAssign, temp);
@@ -10127,13 +11059,13 @@ private:
                if (objAssign) {
                        if (extraScope) {
                                popScope();
-                                temp.push_back(indent() + "end"s + nlr(importNode));
+                                temp.push_back(indent() + "end"s + nl(importNode));
                        }
                }
                out.push_back(join(temp));
                auto vars = getAssignVars(assignment);
                for (const auto& var : vars) {
-                        markVarConst(var);
+                        markVarLocalConst(var);
                }
        }
@@ -10361,12 +11293,36 @@ private:
                transformAssignment(assignment, out);
                if (auto var = ast_cast<Variable_t>(target)) {
                        auto moduleName = variableToString(var);
-                        markVarConst(moduleName);
+                        markVarLocalConst(moduleName);
                } else {
                        markDestructureConst(assignment);
                }
        }
+        void transformImportGlobal(ImportGlobal_t* importNode, str_list& out) {
+                auto uname = static_cast<UnicodeName_t*>(importNode->segs.front());
+                auto var = _parser.toString(uname);
+                auto isNormal = _parser.match<Name_t>(var) && _parser.match<Variable_t>(var);
+                auto varName = unicodeVariableFrom(uname);
+                str_list temp;
+                auto it = ++importNode->segs.objects().begin();
+                for (; it != importNode->segs.objects().end(); ++it) {
+                        temp.emplace_back(_parser.toString(*it));
+                }
+                temp.emplace_front(var);
+                if (isLocal(varName) || !isNormal) {
+                        temp.emplace_front("_G"s);
+                }
+                std::string stmt;
+                if (importNode->target) {
+                        stmt = "const "s + _parser.toString(importNode->target) + '=' + join(temp, "."sv);
+                } else {
+                        stmt = "const "s + temp.back() + '=' + join(temp, "."sv);
+                }
+                auto localAttrib = toAst<LocalAttrib_t>(stmt, importNode);
+                transformLocalAttrib(localAttrib, out);
+        }
        void transformImport(Import_t* import, str_list& out) {
                auto content = import->content.get();
                switch (content->get_id()) {
@@ -10379,6 +11335,9 @@ private:
                        case id<FromImport_t>():
                                transformFromImport(static_cast<FromImport_t*>(content), out);
                                break;
+                        case id<ImportGlobal_t>():
+                                transformImportGlobal(static_cast<ImportGlobal_t*>(content), out);
+                                break;
                        default: YUEE("AST node mismatch", content); break;
                }
        }
@@ -10390,7 +11349,7 @@ private:
                if (expList) {
                        if (!currentScope().lastStatement) {
                                extraScope = true;
-                                temp.push_back(indent() + "do"s + nll(whileNode));
+                                temp.push_back(indent() + "do"s + nl(whileNode));
                                pushScope();
                        }
                }
@@ -10398,17 +11357,29 @@ private:
                addToScope(accumVar);
                auto lenVar = getUnusedName("_len_"sv);
                addToScope(lenVar);
-                temp.push_back(indent() + "local "s + accumVar + " = { }"s + nll(whileNode));
+                auto breakLoopType = getBreakLoopType(whileNode->body, accumVar);
-                temp.push_back(indent() + "local "s + lenVar + " = 1"s + nll(whileNode));
+                _buf << indent() << "local "sv << accumVar << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(whileNode);
+                temp.emplace_back(clearBuf());
+                _buf << indent() << "local "s << lenVar << " = 1"s << nl(whileNode);
+                auto& lenAssign = temp.emplace_back(clearBuf());
                bool isUntil = _parser.toString(whileNode->type) == "until"sv;
                auto condStr = transformCondExp(whileNode->condition, isUntil);
-                temp.push_back(indent() + "while "s + condStr + " do"s + nll(whileNode));
+                temp.push_back(indent() + "while "s + condStr + " do"s + nl(whileNode));
                pushScope();
-                auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                if (hasBreakWithValue(breakLoopType)) {
-                auto lenLine = lenVar + " = "s + lenVar + " + 1"s + nlr(whileNode);
+                        lenAssign.clear();
-                transformLoopBody(whileNode->body, temp, lenLine, ExpUsage::Assignment, assignLeft);
+                        transformLoopBody(whileNode->body, temp, breakLoopType, ExpUsage::Common);
+                } else {
+                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                        auto followStmt = toAst<Statement_t>(lenVar + "+=1"s, whileNode);
+                        assignLeft->followStmt = followStmt.get();
+                        transformLoopBody(whileNode->body, temp, breakLoopType, ExpUsage::Assignment, assignLeft);
+                        if (!assignLeft->followStmtProcessed) {
+                                lenAssign.clear();
+                        }
+                }
                popScope();
-                temp.push_back(indent() + "end"s + nlr(whileNode));
+                temp.push_back(indent() + "end"s + nl(whileNode));
                if (expList) {
                        auto assign = x->new_ptr<Assign_t>();
                        assign->values.push_back(toAst<Exp_t>(accumVar, x));
@@ -10418,10 +11389,10 @@ private:
                        transformAssignment(assignment, temp);
                        if (extraScope) popScope();
                } else {
-                        temp.push_back(indent() + "return "s + accumVar + nlr(whileNode));
+                        temp.push_back(indent() + "return "s + accumVar + nl(whileNode));
                }
                if (expList && extraScope) {
-                        temp.push_back(indent() + "end"s + nlr(whileNode));
+                        temp.push_back(indent() + "end"s + nl(whileNode));
                }
                out.push_back(join(temp));
        }
@@ -10442,20 +11413,31 @@ private:
                addToScope(accumVar);
                auto lenVar = getUnusedName("_len_"sv);
                addToScope(lenVar);
-                temp.push_back(indent() + "local "s + accumVar + " = { }"s + nll(whileNode));
+                auto breakLoopType = getBreakLoopType(whileNode->body, accumVar);
-                temp.push_back(indent() + "local "s + lenVar + " = 1"s + nll(whileNode));
+                _buf << indent() << "local "sv << accumVar << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(whileNode);
+                temp.emplace_back(clearBuf());
+                auto& lenAssign = temp.emplace_back(indent() + "local "s + lenVar + " = 1"s + nl(whileNode));
                bool isUntil = _parser.toString(whileNode->type) == "until"sv;
                auto condStr = transformCondExp(whileNode->condition, isUntil);
-                temp.push_back(indent() + "while "s + condStr + " do"s + nll(whileNode));
+                temp.push_back(indent() + "while "s + condStr + " do"s + nl(whileNode));
                pushScope();
-                auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                if (hasBreakWithValue(breakLoopType)) {
-                auto lenLine = lenVar + " = "s + lenVar + " + 1"s + nlr(whileNode);
+                        lenAssign.clear();
-                transformLoopBody(whileNode->body, temp, lenLine, ExpUsage::Assignment, assignLeft);
+                        transformLoopBody(whileNode->body, temp, breakLoopType, ExpUsage::Common);
+                } else {
+                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                        auto followStmt = toAst<Statement_t>(lenVar + "+=1"s, whileNode);
+                        assignLeft->followStmt = followStmt.get();
+                        transformLoopBody(whileNode->body, temp, breakLoopType, ExpUsage::Assignment, assignLeft);
+                        if (!assignLeft->followStmtProcessed) {
+                                lenAssign.clear();
+                        }
+                }
                popScope();
-                temp.push_back(indent() + "end"s + nlr(whileNode));
+                temp.push_back(indent() + "end"s + nl(whileNode));
-                temp.push_back(indent() + "return "s + accumVar + nlr(whileNode));
+                temp.push_back(indent() + "return "s + accumVar + nl(whileNode));
                popScope();
-                funcStart = anonFuncStart() + nll(whileNode);
+                funcStart = anonFuncStart() + nl(whileNode);
                temp.push_back(indent() + anonFuncEnd());
                popAnonVarArg();
                popFunctionScope();
@@ -10485,9 +11467,7 @@ private:
                        expListAssign->expList.set(expList);
                        auto stmt = x->new_ptr<Statement_t>();
                        stmt->content.set(expListAssign);
-                        auto body = x->new_ptr<Body_t>();
+                        repeat->body.set(stmt);
-                        body->content.set(stmt);
-                        repeat->body.set(body);
                        transformRepeat(repeat, out);
                        return;
                }
@@ -10495,14 +11475,115 @@ private:
                pushScope();
                bool isUntil = _parser.toString(whileNode->type) == "until"sv;
                auto condStr = transformCondExp(whileNode->condition, isUntil);
-                transformLoopBody(whileNode->body, temp, Empty, ExpUsage::Common);
+                auto breakLoopType = getBreakLoopType(whileNode->body, Empty);
+                transformLoopBody(whileNode->body, temp, breakLoopType, ExpUsage::Common);
                popScope();
-                _buf << indent() << "while "sv << condStr << " do"sv << nll(whileNode);
+                _buf << indent() << "while "sv << condStr << " do"sv << nl(whileNode);
                _buf << temp.back();
-                _buf << indent() << "end"sv << nlr(whileNode);
+                _buf << indent() << "end"sv << nl(whileNode);
                out.push_back(clearBuf());
        }
+        void transformRepeatInPlace(Repeat_t* repeatNode, str_list& out, ExpList_t* expList = nullptr) {
+                auto x = repeatNode;
+                str_list temp;
+                bool extraScope = false;
+                if (expList) {
+                        if (!currentScope().lastStatement) {
+                                extraScope = true;
+                                temp.push_back(indent() + "do"s + nl(repeatNode));
+                                pushScope();
+                        }
+                }
+                auto accumVar = getUnusedName("_accum_"sv);
+                addToScope(accumVar);
+                auto lenVar = getUnusedName("_len_"sv);
+                addToScope(lenVar);
+                auto breakLoopType = getBreakLoopType(repeatNode->body, accumVar);
+                _buf << indent() << "local "sv << accumVar << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(repeatNode);
+                temp.emplace_back(clearBuf());
+                _buf << indent() << "local "s << lenVar << " = 1"s << nl(repeatNode);
+                auto& lenAssign = temp.emplace_back(clearBuf());
+                auto condStr = transformCondExp(repeatNode->condition, false);
+                temp.push_back(indent() + "repeat"s + nl(repeatNode));
+                pushScope();
+                if (hasBreakWithValue(breakLoopType)) {
+                        lenAssign.clear();
+                        transformLoopBody(repeatNode->body, temp, breakLoopType, ExpUsage::Common);
+                } else {
+                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                        auto followStmt = toAst<Statement_t>(lenVar + "+=1"s, repeatNode);
+                        assignLeft->followStmt = followStmt.get();
+                        transformLoopBody(repeatNode->body, temp, breakLoopType, ExpUsage::Assignment, assignLeft);
+                        if (!assignLeft->followStmtProcessed) {
+                                lenAssign.clear();
+                        }
+                }
+                popScope();
+                temp.push_back(indent() + "until "s + condStr + nl(repeatNode));
+                if (expList) {
+                        auto assign = x->new_ptr<Assign_t>();
+                        assign->values.push_back(toAst<Exp_t>(accumVar, x));
+                        auto assignment = x->new_ptr<ExpListAssign_t>();
+                        assignment->expList.set(expList);
+                        assignment->action.set(assign);
+                        transformAssignment(assignment, temp);
+                        if (extraScope) popScope();
+                } else {
+                        temp.push_back(indent() + "return "s + accumVar + nl(repeatNode));
+                }
+                if (expList && extraScope) {
+                        temp.push_back(indent() + "end"s + nl(repeatNode));
+                }
+                out.push_back(join(temp));
+        }
+        void transformRepeatClosure(Repeat_t* repeatNode, str_list& out) {
+                auto x = repeatNode;
+                auto simpleValue = x->new_ptr<SimpleValue_t>();
+                simpleValue->value.set(repeatNode);
+                if (transformAsUpValueFunc(newExp(simpleValue, x), out)) {
+                        return;
+                }
+                str_list temp;
+                pushAnonFunctionScope();
+                pushAnonVarArg();
+                std::string& funcStart = temp.emplace_back();
+                pushScope();
+                auto accumVar = getUnusedName("_accum_"sv);
+                addToScope(accumVar);
+                auto lenVar = getUnusedName("_len_"sv);
+                addToScope(lenVar);
+                auto breakLoopType = getBreakLoopType(repeatNode->body, accumVar);
+                _buf << indent() << "local "sv << accumVar << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(repeatNode);
+                temp.emplace_back(clearBuf());
+                auto& lenAssign = temp.emplace_back(indent() + "local "s + lenVar + " = 1"s + nl(repeatNode));
+                auto condStr = transformCondExp(repeatNode->condition, false);
+                temp.push_back(indent() + "repeat"s + nl(repeatNode));
+                pushScope();
+                if (hasBreakWithValue(breakLoopType)) {
+                        lenAssign.clear();
+                        transformLoopBody(repeatNode->body, temp, breakLoopType, ExpUsage::Common);
+                } else {
+                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                        auto followStmt = toAst<Statement_t>(lenVar + "+=1"s, repeatNode);
+                        assignLeft->followStmt = followStmt.get();
+                        transformLoopBody(repeatNode->body, temp, breakLoopType, ExpUsage::Assignment, assignLeft);
+                        if (!assignLeft->followStmtProcessed) {
+                                lenAssign.clear();
+                        }
+                }
+                popScope();
+                temp.push_back(indent() + "until "s + condStr + nl(repeatNode));
+                temp.push_back(indent() + "return "s + accumVar + nl(repeatNode));
+                popScope();
+                funcStart = anonFuncStart() + nl(repeatNode);
+                temp.push_back(indent() + anonFuncEnd());
+                popAnonVarArg();
+                popFunctionScope();
+                out.push_back(join(temp));
+        }
        void transformRepeat(Repeat_t* repeat, str_list& out) {
                str_list temp;
                pushScope();
@@ -10513,9 +11594,9 @@ private:
                        temp.push_back(condVar);
                }
                popScope();
-                _buf << indent() << "repeat"sv << nll(repeat);
+                _buf << indent() << "repeat"sv << nl(repeat);
                _buf << temp.front();
-                _buf << indent() << "until "sv << temp.back() << nlr(repeat);
+                _buf << indent() << "until "sv << temp.back() << nl(repeat);
                out.push_back(clearBuf());
        }
@@ -10536,12 +11617,28 @@ private:
                        pushScope();
                }
                bool extraScope = false;
+                if (switchNode->assignment) {
+                        if (needScope) {
+                                extraScope = true;
+                                temp.push_back(indent() + "do"s + nl(x));
+                                pushScope();
+                        }
+                        auto asmt = x->new_ptr<ExpListAssign_t>();
+                        auto expList = x->new_ptr<ExpList_t>();
+                        expList->exprs.push_back(switchNode->target);
+                        if (switchNode->assignment->expList) {
+                                expList->exprs.dup(switchNode->assignment->expList->exprs);
+                        }
+                        asmt->expList.set(expList);
+                        asmt->action.set(switchNode->assignment->assign);
+                        transformAssignment(asmt, temp);
+                }
                auto objVar = singleVariableFrom(switchNode->target, AccessType::Read);
                if (objVar.empty() || !isLocal(objVar)) {
                        if (usage == ExpUsage::Common || usage == ExpUsage::Assignment) {
-                                if (needScope) {
+                                if (needScope && !extraScope) {
                                        extraScope = true;
-                                        temp.push_back(indent() + "do"s + nll(x));
+                                        temp.push_back(indent() + "do"s + nl(x));
                                        pushScope();
                                }
                        }
@@ -10571,13 +11668,13 @@ private:
                        }
                        if (tableMatching) {
                                if (!firstBranch) {
-                                        temp.push_back(indent() + "else"s + nll(branch));
+                                        temp.push_back(indent() + "else"s + nl(branch));
                                        pushScope();
                                        addScope++;
                                }
                                if (tabCheckVar.empty()) {
                                        if (!extraScope && needScope) {
-                                                temp.push_back(indent() + "do"s + nll(branch));
+                                                temp.push_back(indent() + "do"s + nl(branch));
                                                pushScope();
                                                extraScope = true;
                                        }
@@ -10585,20 +11682,21 @@ private:
                                        forceAddToScope(typeVar);
                                        tabCheckVar = getUnusedName("_tab_"sv);
                                        forceAddToScope(tabCheckVar);
-                                        temp.push_back(indent() + "local "s + typeVar + " = "s + globalVar("type"sv, branch, AccessType::Read) + '(' + objVar + ')' + nll(branch));
+                                        temp.push_back(indent() + "local "s + typeVar + " = "s + globalVar("type"sv, branch, AccessType::Read) + '(' + objVar + ')' + nl(branch));
-                                        temp.push_back(indent() + "local "s + tabCheckVar + " = \"table\" == "s + typeVar + " or \"userdata\" == "s + typeVar + nll(branch));
+                                        temp.push_back(indent() + "local "s + tabCheckVar + " = \"table\" == "s + typeVar + " or \"userdata\" == "s + typeVar + nl(branch));
                                }
                                std::string matchVar;
                                bool lastBranch = branches.back() == branch_ && !switchNode->lastBranch;
                                if (!lastBranch) {
                                        matchVar = getUnusedName("_match_"sv);
                                        forceAddToScope(matchVar);
-                                        temp.push_back(indent() + "local "s + matchVar + " = false"s + nll(branch));
+                                        temp.push_back(indent() + "local "s + matchVar + " = false"s + nl(branch));
                                }
-                                temp.back().append(indent() + "if "s + tabCheckVar + " then"s + nll(branch));
+                                temp.back().append(indent() + "if "s + tabCheckVar + " then"s + nl(branch));
                                pushScope();
-                                auto assignment = assignmentFrom(static_cast<Exp_t*>(valueList->exprs.front()), toAst<Exp_t>(objVar, branch), branch);
+                                auto chainValue = toAst<ChainValue_t>(objVar, branch);
-                                auto info = extractDestructureInfo(assignment, true, false);
+                                auto assignment = assignmentFrom(static_cast<Exp_t*>(valueList->exprs.front()), newExp(chainValue, branch), branch);
+                                auto info = extractDestructureInfo(assignment, true, true);
                                transformAssignment(assignment, temp, true);
                                str_list conds;
                                for (const auto& des : info.destructures) {
@@ -10608,27 +11706,50 @@ private:
                                        const auto& destruct = std::get<Destructure>(des);
                                        for (const auto& item : destruct.items) {
                                                if (!item.defVal) {
-                                                        transformExp(item.target, conds, ExpUsage::Closure);
+                                                        if (!isAssignable(item.target)) {
-                                                        conds.back().append(" ~= nil"s);
+                                                                auto callable = chainValue->items.front();
+                                                                auto chain = callable->new_ptr<ChainValue_t>();
+                                                                chain->items.push_back(callable);
+                                                                chain->items.dup(item.structure->items);
+                                                                if (specialChainValue(chain) == ChainType::Common) {
+                                                                        transformChainValue(chain, conds, ExpUsage::Closure);
+                                                                        auto vStr = conds.back();
+                                                                        conds.pop_back();
+                                                                        transformExp(item.target, conds, ExpUsage::Closure);
+                                                                        conds.back().append(" == "s);
+                                                                        conds.back().append(vStr);
+                                                                } else {
+                                                                        auto varName = getUnusedName("_val_"sv);
+                                                                        auto vExp = toAst<Exp_t>(varName, chain);
+                                                                        auto asmt = assignmentFrom(vExp, newExp(chain, chain), chain);
+                                                                        transformAssignment(asmt, temp);
+                                                                        transformExp(item.target, conds, ExpUsage::Closure);
+                                                                        conds.back().append(" == "s);
+                                                                        conds.back().append(varName);
+                                                                }
+                                                        } else {
+                                                                transformExp(item.target, conds, ExpUsage::Closure);
+                                                                conds.back().append(" ~= nil"s);
+                                                        }
                                                }
                                        }
                                }
                                if (!conds.empty()) {
-                                        temp.push_back(indent() + "if "s + join(conds, " and "sv) + " then"s + nll(branch));
+                                        temp.push_back(indent() + "if "s + join(conds, " and "sv) + " then"s + nl(branch));
                                        pushScope();
                                }
                                if (!lastBranch) {
-                                        temp.push_back(indent() + matchVar + " = true"s + nll(branch));
+                                        temp.push_back(indent() + matchVar + " = true"s + nl(branch));
                                }
                                transform_plain_body(branch->body, temp, usage, assignList);
                                if (!conds.empty()) {
                                        popScope();
-                                        temp.push_back(indent() + "end"s + nll(branch));
+                                        temp.push_back(indent() + "end"s + nl(branch));
                                }
                                if (!lastBranch) {
                                        popScope();
-                                        temp.push_back(indent() + "end"s + nll(branch));
+                                        temp.push_back(indent() + "end"s + nl(branch));
-                                        temp.push_back(indent() + "if not "s + matchVar + " then"s + nll(branch));
+                                        temp.push_back(indent() + "if not "s + matchVar + " then"s + nl(branch));
                                        pushScope();
                                        addScope++;
                                } else {
@@ -10648,7 +11769,7 @@ private:
                                        }
                                        temp.back().append(' ' + tmp.back() + " == "s + (exp == exprs.back() ? objVar : objVar + " or"s));
                                }
-                                temp.back().append(" then"s + nll(branch));
+                                temp.back().append(" then"s + nl(branch));
                                pushScope();
                                transform_plain_body(branch->body, temp, usage, assignList);
                                popScope();
@@ -10656,7 +11777,7 @@ private:
                }
                if (switchNode->lastBranch) {
                        if (!firstBranch) {
-                                temp.push_back(indent() + "else"s + nll(switchNode->lastBranch));
+                                temp.push_back(indent() + "else"s + nl(switchNode->lastBranch));
                                pushScope();
                        } else {
                                addScope--;
@@ -10666,20 +11787,20 @@ private:
                }
                while (addScope > 0) {
                        addScope--;
-                        temp.push_back(indent() + "end"s + nlr(switchNode));
+                        temp.push_back(indent() + "end"s + nl(switchNode));
                        popScope();
                }
-                temp.push_back(indent() + "end"s + nlr(switchNode));
+                temp.push_back(indent() + "end"s + nl(switchNode));
                if (usage == ExpUsage::Closure) {
                        popFunctionScope();
                        popScope();
-                        *funcStart = anonFuncStart() + nll(switchNode);
+                        *funcStart = anonFuncStart() + nl(switchNode);
                        temp.push_back(indent() + anonFuncEnd());
                        popAnonVarArg();
                }
                if (extraScope) {
                        popScope();
-                        temp.push_back(indent() + "end"s + nlr(switchNode));
+                        temp.push_back(indent() + "end"s + nl(switchNode));
                }
                out.push_back(join(temp));
        }
@@ -10698,7 +11819,7 @@ private:
                        }
                        auto preDefine = toLocalDecl(defs);
                        if (!preDefine.empty()) {
-                                out.push_back(preDefine + nll(local));
+                                out.push_back(preDefine + nl(local));
                        }
                }
        }
@@ -10727,8 +11848,8 @@ private:
                                        auto assignment = x->new_ptr<ExpListAssign_t>();
                                        assignment->expList.set(expList);
                                        auto assign = x->new_ptr<Assign_t>();
-                                        if (auto expListLow = values->valueList.as<ExpListLow_t>()) {
+                                        if (auto expList = values->valueList.as<ExpList_t>()) {
-                                                assign->values.dup(expListLow->exprs);
+                                                assign->values.dup(expList->exprs);
                                        } else {
                                                auto tableBlock = values->valueList.to<TableBlock_t>();
                                                assign->values.push_back(tableBlock);
@@ -10736,7 +11857,7 @@ private:
                                        assignment->action.set(assign);
                                        bool oneLined = transformAssignment(assignment, temp);
                                        for (auto val : assign->values.objects()) {
-                                                if (auto value = singleValueFrom(val)) {
+                                                if (auto value = singleValueFrom(val, true)) {
                                                        if (auto spValue = value->item.as<SimpleValue_t>()) {
                                                                if (auto funLit = spValue->value.as<FunLit_t>()) {
                                                                        if (!funLit->noRecursion) {
@@ -10903,11 +12024,11 @@ private:
                        }
                        str_list temp;
                        if (localAttrib->forceLocal) {
-                                temp.push_back(indent() + "local "s + join(vars, ", "sv) + nll(x));
+                                temp.push_back(indent() + "local "s + join(vars, ", "sv) + nl(x));
                        }
                        transformAssignment(assignment, temp);
                        for (const auto& name : vars) {
-                                markVarConst(name);
+                                markVarLocalConst(name);
                        }
                        if (localAttrib->attrib.is<CloseAttrib_t>()) {
                                str_list leftVars, rightVars;
@@ -10949,13 +12070,13 @@ private:
                                        auto rit = items.begin();
                                        str_list tmp;
                                        while (lit != vars.end()) {
-                                                tmp.push_back(indent() + "local "s + *lit + (target >= 504 ? " <close> = "s : " = "s) + *rit + nll(x));
+                                                tmp.push_back(indent() + "local "s + *lit + (target >= 504 ? " <close> = "s : " = "s) + *rit + nl(x));
                                                lit++;
                                                rit++;
                                        }
                                        temp.push_back(join(tmp));
                                } else {
-                                        temp.push_back(indent() + "local "s + join(vars, ", "sv) + " = "s + join(items, ", "sv) + nll(x));
+                                        temp.push_back(indent() + "local "s + join(vars, ", "sv) + " = "s + join(items, ", "sv) + nl(x));
                                        str_list leftVars;
                                        pushScope();
                                        for (size_t i = 0; i < vars.size(); i++) {
@@ -10976,10 +12097,10 @@ private:
                                for (auto item : assignA->values.objects()) {
                                        transformAssignItem(item, items);
                                }
-                                temp.push_back(indent() + "local "s + join(leftVars, ", "sv) + " = "s + join(items, ", "sv) + nll(x));
+                                temp.push_back(indent() + "local "s + join(leftVars, ", "sv) + " = "s + join(items, ", "sv) + nl(x));
                        }
                        for (const auto& var : vars) {
-                                markVarConst(var);
+                                markVarLocalConst(var);
                        }
                }
                if (!listB->exprs.empty()) {
@@ -11001,22 +12122,28 @@ private:
                                        vars.push_back(item.targetVar);
                                }
                        }
-                        temp.push_back(indent() + "local "s + join(vars, ", "sv) + nll(x));
+                        temp.push_back(indent() + "local "s + join(vars, ", "sv) + nl(x));
                        transformAssignment(assignment, temp);
                        for (const auto& name : vars) {
-                                markVarConst(name);
+                                markVarLocalConst(name);
                        }
                }
                out.push_back(join(temp));
        }
        void transformBreakLoop(BreakLoop_t* breakLoop, str_list& out) {
-                auto keyword = _parser.toString(breakLoop);
+                auto isBreak = breakLoop->type.is<Break_t>();
+                auto keyword = isBreak ? "break"s : "continue"s;
                if (_enableBreakLoop.empty() || !_enableBreakLoop.top()) {
                        throw CompileError(keyword + " is not inside a loop"s, breakLoop);
                }
-                if (keyword == "break"sv) {
+                if (isBreak) {
-                        out.push_back(indent() + keyword + nll(breakLoop));
+                        if (breakLoop->value) {
+                                auto exp = toAst<Exp_t>(breakLoop->varBWV, breakLoop->value);
+                                auto assignment = assignmentFrom(exp, breakLoop->value, breakLoop);
+                                transformAssignment(assignment, out);
+                        }
+                        out.push_back(indent() + keyword + nl(breakLoop));
                        return;
                }
                if (_continueVars.empty()) throw CompileError("continue is not inside a loop"sv, breakLoop);
@@ -11029,8 +12156,8 @@ private:
                        if (!temp.empty()) {
                                _buf << temp.back();
                        }
-                        _buf << indent() << item.var << " = true"sv << nll(breakLoop);
+                        _buf << indent() << item.var << " = true"sv << nl(breakLoop);
-                        _buf << indent() << "break"sv << nll(breakLoop);
+                        _buf << indent() << "break"sv << nl(breakLoop);
                        out.push_back(clearBuf());
                } else {
                        transformGoto(toAst<Goto_t>("goto "s + item.var, breakLoop), temp);
@@ -11042,7 +12169,7 @@ private:
                if (getLuaTarget(label) < 502) {
                        throw CompileError("label statement is not available when not targeting Lua version 5.2 or higher"sv, label);
                }
-                auto labelStr = unicodeVariableFrom(label->label->name);
+                auto labelStr = unicodeVariableFrom(label->label);
                int currentScope = _gotoScopes.top();
                if (static_cast<int>(_labels.size()) <= currentScope) {
                        _labels.resize(currentScope + 1, std::nullopt);
@@ -11056,16 +12183,16 @@ private:
                        throw CompileError("label '"s + labelStr + "' already defined at line "s + std::to_string(it->second.line), label);
                }
                scope[labelStr] = {label->m_begin.m_line, static_cast<int>(_scopes.size())};
-                out.push_back(indent() + "::"s + labelStr + "::"s + nll(label));
+                out.push_back(indent() + "::"s + labelStr + "::"s + nl(label));
        }
        void transformGoto(Goto_t* gotoNode, str_list& out) {
                if (getLuaTarget(gotoNode) < 502) {
                        throw CompileError("goto statement is not available when not targeting Lua version 5.2 or higher"sv, gotoNode);
                }
-                auto labelStr = unicodeVariableFrom(gotoNode->label->name);
+                auto labelStr = unicodeVariableFrom(gotoNode->label);
                gotos.push_back({gotoNode, labelStr, _gotoScopes.top(), static_cast<int>(_scopes.size())});
-                out.push_back(indent() + "goto "s + labelStr + nll(gotoNode));
+                out.push_back(indent() + "goto "s + labelStr + nl(gotoNode));
        }
        void transformShortTabAppending(ShortTabAppending_t* tab, str_list& out) {
@@ -11129,13 +12256,13 @@ private:
                        temp.push_back(getPreDefineLine(assignment));
                }
                assignments.push_front(assignmentFrom(newValue, value, value));
-                temp.push_back(indent() + "do"s + nll(x));
+                temp.push_back(indent() + "do"s + nl(x));
                pushScope();
                for (auto item : assignments.objects()) {
                        transformAssignment(static_cast<ExpListAssign_t*>(item), temp);
                }
                popScope();
-                temp.push_back(indent() + "end"s + nll(x));
+                temp.push_back(indent() + "end"s + nl(x));
                out.push_back(join(temp));
        }
 };
diff --git a/src/yuescript/yue_compiler.h b/src/yuescript/yue_compiler.h
index d352636..eb5fb16 100644
--- a/src/yuescript/yue_compiler.h
+++ b/src/yuescript/yue_compiler.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -31,6 +31,7 @@ struct YueConfig {
        bool reserveLineNumber = true;
        bool useSpaceOverTab = false;
        bool reserveComment = false;
+        bool lax = false;
        // internal options
        bool exporting = false;
        bool profiling = false;
@@ -51,6 +52,7 @@ struct GlobalVar {
        int line;
        int col;
        AccessType accessType;
+        bool defined;
 };
 using GlobalVars = std::vector<GlobalVar>;
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 77c5901..f564f6a 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -41,6 +41,24 @@ public:
        int col;
 };
+#define RaiseError(msg, item) \
+        do { \
+                if (reinterpret_cast<State*>(item.user_data)->lax) { \
+                        return false; \
+                } else { \
+                        throw ParserError(msg, item.begin); \
+                } \
+        } while (false)
+#define RaiseErrorI(msg, item) \
+        do { \
+                if (reinterpret_cast<State*>(item.user_data)->lax) { \
+                        return -1; \
+                } else { \
+                        throw ParserError(msg, item.begin); \
+                } \
+        } while (false)
 // clang-format off
 YueParser::YueParser() {
        plain_space = *set(" \t");
@@ -57,18 +75,20 @@ YueParser::YueParser() {
        space = -(and_(set(" \t-\\")) >> *space_one >> -comment);
        space_break = space >> line_break;
        white = space >> *(line_break >> space);
+        plain_white = plain_space >> *(line_break >> plain_space);
        alpha_num = range('a', 'z') | range('A', 'Z') | range('0', '9') | '_';
        not_alpha_num = not_(alpha_num);
        Name = (range('a', 'z') | range('A', 'Z') | '_') >> *alpha_num >> not_(larger(255));
        UnicodeName = (range('a', 'z') | range('A', 'Z') | '_' | larger(255)) >> *(larger(255) | alpha_num);
-        num_expo = set("eE") >> -set("+-") >> num_char;
+        must_num_char = num_char | invalid_number_literal_error;
-        num_expo_hex = set("pP") >> -set("+-") >> num_char;
+        num_expo = set("eE") >> -set("+-") >> must_num_char;
+        num_expo_hex = set("pP") >> -set("+-") >> must_num_char;
        lj_num = -set("uU") >> set("lL") >> set("lL");
        num_char = range('0', '9') >> *(range('0', '9') | '_' >> and_(range('0', '9')));
        num_char_hex = range('0', '9') | range('a', 'f') | range('A', 'F');
        num_lit = num_char_hex >> *(num_char_hex | '_' >> and_(num_char_hex));
        num_bin_lit = set("01") >> *(set("01") | '_' >> and_(set("01")));
-        Num =
+        Num = (
                '0' >> (
                        set("xX") >> (
                                num_lit >> (
@@ -78,50 +98,122 @@ YueParser::YueParser() {
                                        true_()
                                ) | (
                                        '.' >> num_lit >> -num_expo_hex
-                                )
+                                ) | invalid_number_literal_error
                        ) |
-                        set("bB") >> num_bin_lit
+                        set("bB") >> (num_bin_lit | invalid_number_literal_error)
                ) |
                num_char >> (
-                        '.' >> num_char >> -num_expo |
+                        '.' >> must_num_char >> -num_expo |
                        num_expo |
                        lj_num |
                        true_()
-                ) |
+                )
-                '.' >> num_char >> -num_expo;
+        ) >> -(and_(alpha_num) >> invalid_number_literal_error) |
+        '.' >> num_char >> -num_expo >> -(and_(alpha_num) >> invalid_number_literal_error);
        cut = false_();
        Seperator = true_();
-        empty_block_error = pl::user(true_(), [](const item_t& item) {
+        auto expect_error = [](std::string_view msg) {
-                throw ParserError("must be followed by a statement or an indented block"sv, item.begin);
+                return pl::user(true_(), [msg](const item_t& item) {
-                return false;
+                        RaiseError(msg, item);
-        });
+                        return false;
+                });
-        export_expression_error = pl::user(true_(), [](const item_t& item) {
+        };
-                throw ParserError("invalid export expression"sv, item.begin);
-                return false;
-        });
-        invalid_interpolation_error = pl::user(true_(), [](const item_t& item) {
-                throw ParserError("invalid string interpolation"sv, item.begin);
-                return false;
-        });
-        confusing_unary_not_error = pl::user(true_(), [](const item_t& item) {
-                throw ParserError("deprecated use for unary operator 'not' to be here"sv, item.begin);
-                return false;
-        });
-        table_key_pair_error = pl::user(true_(), [](const item_t& item) {
-                throw ParserError("can not put hash pair in a list"sv, item.begin);
-                return false;
-        });
-        if_assignment_syntax_error = pl::user(true_(), [](const item_t& item) {
+        empty_block_error = expect_error(
-                throw ParserError("use := for if-assignment expression"sv, item.begin);
+                "expected a valid statement or indented block"sv
-                return false;
+        );
-        });
+        export_expression_error = expect_error(
+                "invalid export expression"sv
+        );
+        invalid_interpolation_error = expect_error(
+                "invalid string interpolation"sv
+        );
+        confusing_unary_not_error = expect_error(
+                "deprecated use for unary operator 'not' to be here"sv
+        );
+        table_key_pair_error = expect_error(
+                "can not put hash pair in a list"sv
+        );
+        assignment_expression_syntax_error = expect_error(
+                "use := for assignment expression"sv
+        );
+        braces_expression_error = expect_error(
+                "syntax error in brace expression"sv
+        );
+        brackets_expression_error = expect_error(
+                "unclosed bracket expression"sv
+        );
+        slice_expression_error = expect_error(
+                "syntax error in slice expression"sv
+        );
+        unclosed_single_string_error = expect_error(
+                "unclosed single-quoted string"sv
+        );
+        unclosed_double_string_error = expect_error(
+                "unclosed double-quoted string"sv
+        );
+        unclosed_lua_string_error = expect_error(
+                "unclosed Lua string"sv
+        );
+        unexpected_comma_error = expect_error(
+                "got unexpected comma"sv
+        );
+        parenthesis_error = expect_error(
+                "expected only one expression in parenthesis"sv
+        );
+        dangling_clause_error = expect_error(
+                "dangling control clause"sv
+        );
+        keyword_as_label_error = expect_error(
+                "keyword cannot be used as a label name"sv
+        );
+        vararg_position_error = expect_error(
+                "vararg '...' must be the last parameter in function argument list"sv
+        );
+        invalid_import_syntax_error = expect_error(
+                "invalid import syntax, expected `import \"X.mod\"`, `import \"X.mod\" as {:name}`, `from mod import name` or `import mod.name`"sv
+        );
+        invalid_import_as_syntax_error = expect_error(
+                "invalid import syntax, expected `import \"X.mod\" as modname` or `import \"X.mod\" as {:name}`"sv
+        );
+        expected_expression_error = expect_error(
+                "expected valid expression"sv
+        );
+        invalid_from_import_error = expect_error(
+                "invalid import syntax, expected `from \"X.mod\" import name` or `from mod import name`"sv
+        );
+        invalid_export_syntax_error = expect_error(
+                "invalid export syntax, expected `export item`, `export item = x`, `export.item = x` or `export default item`"sv
+        );
+        invalid_macro_definition_error = expect_error(
+                "invalid macro definition, expected `macro Name = -> body` or `macro Name = $Name(...)`"sv
+        );
+        invalid_global_declaration_error = expect_error(
+                "invalid global declaration, expected `global name`, `global name = ...`, `global *`, `global ^` or `global class ...`"sv
+        );
+        invalid_local_declaration_error = expect_error(
+                "invalid local declaration, expected `local name`, `local name = ...`, `local *` or `local ^`"sv
+        );
+        invalid_with_syntax_error = expect_error(
+                "invalid 'with' statement"sv
+        );
+        invalid_try_syntax_error = expect_error(
+                "invalid 'try' expression, expected `try expr` or `try block` optionally followed by `catch err` with a handling block"sv
+        );
+        keyword_as_identifier_syntax_error = expect_error(
+                "can not use keyword as identifier"sv
+        );
+        invalid_number_literal_error = expect_error(
+                "invalid numeric literal"sv
+        );
+        invalid_import_literal_error = expect_error(
+                "invalid import path literal, expected a dotted path like X.Y.Z"sv
+        );
+        expected_indentifier_error = expect_error(
+                "expected valid identifer"sv
+        );
        #define ensure(patt, finally) ((patt) >> (finally) | (finally) >> cut)
@@ -162,6 +254,13 @@ YueParser::YueParser() {
                ) \
        )
+        #define disable_until_rule(patt) ( \
+                disable_until >> ( \
+                        (patt) >> enable_until | \
+                        enable_until >> cut \
+                ) \
+        )
        #define body_with(str) ( \
                key(str) >> space >> (in_block | Statement) | \
                in_block | \
@@ -194,20 +293,6 @@ YueParser::YueParser() {
                return isValid;
        });
-        LabelName = pl::user(UnicodeName, [](const item_t& item) {
-                State* st = reinterpret_cast<State*>(item.user_data);
-                for (auto it = item.begin->m_it; it != item.end->m_it; ++it) {
-                        if (*it > 255) {
-                                st->buffer.clear();
-                                return true;
-                        }
-                        st->buffer += static_cast<char>(*it);
-                }
-                auto isValid = LuaKeywords.find(st->buffer) == LuaKeywords.end();
-                st->buffer.clear();
-                return isValid;
-        });
        LuaKeyword = pl::user(Name, [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
                for (auto it = item.begin->m_it; it != item.end->m_it; ++it) st->buffer += static_cast<char>(*it);
@@ -223,29 +308,46 @@ YueParser::YueParser() {
        SelfItem = SelfClassName | SelfClass | SelfName | Self;
        KeyName = SelfItem | Name | UnicodeName;
+        VarArgDef = "..." >> -(space >> Variable);
        VarArg = "...";
-        check_indent = pl::user(plain_space, [](const item_t& item) {
+        auto getIndent = [](const item_t& item) -> int {
+                if (item.begin->m_it == item.end->m_it) return 0;
+                State* st = reinterpret_cast<State*>(item.user_data);
+                bool useTab = false;
+                if (st->useTab) {
+                        useTab = st->useTab.value();
+                } else {
+                        useTab = *item.begin->m_it == '\t';
+                        st->useTab = useTab;
+                }
                int indent = 0;
-                for (input_it i = item.begin->m_it; i != item.end->m_it; ++i) {
+                if (useTab) {
-                        switch (*i) {
+                        for (input_it i = item.begin->m_it; i != item.end->m_it; ++i) {
-                                case ' ': indent++; break;
+                                switch (*i) {
-                                case '\t': indent += 4; break;
+                                        case '\t': indent += 4; break;
+                                        default: RaiseErrorI("can not mix the use of tabs and spaces as indents"sv, item); break;
+                                }
+                        }
+                } else {
+                        for (input_it i = item.begin->m_it; i != item.end->m_it; ++i) {
+                                switch (*i) {
+                                        case ' ': indent++; break;
+                                        default: RaiseErrorI("can not mix the use of tabs and spaces as indents"sv, item); break;
+                                }
                        }
                }
+                return indent;
+        };
+        check_indent = pl::user(plain_space, [getIndent](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                return st->indents.top() == indent;
+                return st->indents.top() == getIndent(item);
        });
        check_indent_match = and_(check_indent);
-        advance = pl::user(plain_space, [](const item_t& item) {
+        advance = pl::user(plain_space, [getIndent](const item_t& item) {
-                int indent = 0;
+                int indent = getIndent(item);
-                for (input_it i = item.begin->m_it; i != item.end->m_it; ++i) {
-                        switch (*i) {
-                                case ' ': indent++; break;
-                                case '\t': indent += 4; break;
-                        }
-                }
                State* st = reinterpret_cast<State*>(item.user_data);
                int top = st->indents.top();
                if (top != -1 && indent > top) {
@@ -265,6 +367,12 @@ YueParser::YueParser() {
                        }
                }
                State* st = reinterpret_cast<State*>(item.user_data);
+                if (st->indents.empty()) {
+                        RaiseError("unknown indent level"sv, item);
+                }
+                if (st->indents.top() > indent) {
+                        RaiseError("unexpected dedent"sv, item);
+                }
                st->indents.push(indent);
                return true;
        });
@@ -285,31 +393,41 @@ YueParser::YueParser() {
        in_block = space_break >> *(*set(" \t") >> line_break) >> advance_match >> ensure(Block, pop_indent);
        LocalFlag = expr('*') | '^';
-        LocalValues = NameList >> -(space >> '=' >> space >> (TableBlock | ExpListLow));
+        LocalValues = NameList >> -(space >> '=' >> space >> (TableBlock | ExpList | expected_expression_error));
-        Local = key("local") >> space >> (LocalFlag | LocalValues);
+        Local = key("local") >> space >> (LocalFlag | LocalValues | invalid_local_declaration_error);
        ConstAttrib = key("const");
        CloseAttrib = key("close");
        local_const_item = Variable | SimpleTable | TableLit | Comprehension;
        LocalAttrib = (
                ConstAttrib >> Seperator >> space >> local_const_item >> *(space >> ',' >> space >> local_const_item) |
-                CloseAttrib >> Seperator >> space >> Variable >> *(space >> ',' >> space >> Variable)
+                CloseAttrib >> Seperator >> space >> must_variable >> *(space >> ',' >> space >> must_variable)
        ) >> space >> Assign;
-        ColonImportName = '\\' >> space >> Variable;
+        ColonImportName = '\\' >> must_variable;
-        import_name = ColonImportName | Variable;
+        import_name = not_(key("from")) >> (ColonImportName | must_variable);
-        import_name_list = Seperator >> *space_break >> space >> import_name >> *((+space_break | space >> ',' >> *space_break) >> space >> import_name);
+        import_name_list = Seperator >> *space_break >> space >> import_name >> *(
-        ImportFrom = import_name_list >> *space_break >> space >> key("from") >> space >> (ImportLiteral | not_(String) >> Exp);
+                (+space_break | space >> ',' >> *space_break) >> space >> import_name
-        from_import_name_list_line = import_name >> *(space >> ',' >> space >> import_name);
+        );
+        ImportFrom = import_name_list >> *space_break >> space >> key("from") >> space >> (ImportLiteral | not_(String) >> must_exp);
+        from_import_name_list_line = import_name >> *(space >> ',' >> space >> not_(line_break) >> import_name);
        from_import_name_in_block = +space_break >> advance_match >> ensure(space >> from_import_name_list_line >> *(-(space >> ',') >> +space_break >> check_indent_match >> space >> from_import_name_list_line), pop_indent);
-        FromImport = key("from") >> space >> (ImportLiteral | not_(String) >> Exp) >> *space_break >> space >> key("import") >> space >> Seperator >> (from_import_name_list_line >> -(space >> ',') >> -from_import_name_in_block | from_import_name_in_block);
+        FromImport = key("from") >> space >> (
+                        ImportLiteral | not_(String) >> Exp | invalid_from_import_error
+                ) >> *space_break >> space >> (
+                        key("import") | invalid_from_import_error
+                ) >> space >> Seperator >> (
+                        from_import_name_in_block |
+                        from_import_name_list_line >> -(space >> ',') >> -from_import_name_in_block |
+                        invalid_from_import_error
+                );
        ImportLiteralInner = (range('a', 'z') | range('A', 'Z') | set("_-") | larger(255)) >> *(alpha_num | '-' | larger(255));
        import_literal_chain = Seperator >> ImportLiteralInner >> *('.' >> ImportLiteralInner);
        ImportLiteral = (
-                        '\'' >> import_literal_chain >> '\''
+                        '\'' >> import_literal_chain >> -(not_('\'') >> invalid_import_literal_error) >> '\''
                ) | (
-                        '"' >> import_literal_chain >> '"'
+                        '"' >> import_literal_chain >> -(not_('"') >> invalid_import_literal_error) >> '"'
                );
        MacroNamePair = MacroName >> ':' >> space >> MacroName;
@@ -325,7 +443,7 @@ YueParser::YueParser() {
                Exp;
        import_tab_list = import_tab_item >> *(space >> ',' >> space >> import_tab_item);
        import_tab_line = (
-                push_indent_match >> (space >> import_tab_list >> pop_indent | pop_indent)
+                push_indent_match >> ensure(space >> import_tab_list, pop_indent)
        ) | space;
        import_tab_lines = space_break >> import_tab_line >> *(-(space >> ',') >> space_break >> import_tab_line) >> -(space >> ',');
        import_tab_key_value = key_value | ':' >> MacroName | MacroNamePair | ImportAllMacro;
@@ -335,28 +453,41 @@ YueParser::YueParser() {
                -(space >> ',') >>
                -import_tab_lines >>
                white >>
-                '}'
+                end_braces_expression
        ) | (
                Seperator >> import_tab_key_value >> *(space >> ',' >> space >> import_tab_key_value)
        );
-        ImportAs = ImportLiteral >> -(space >> key("as") >> space >> (ImportTabLit | Variable | ImportAllMacro));
+        ImportAs = ImportLiteral >> -(space >> key("as") >> space >> (
+                ImportTabLit | Variable | ImportAllMacro | invalid_import_as_syntax_error
+        ));
+        ImportGlobal = Seperator >> UnicodeName >> *('.' >> UnicodeName) >> space >> not_(',' | key("from")) >> -(key("as") >> space >> must_variable);
+        ImportAllGlobal = key("global");
-        Import = key("import") >> space >> (ImportAs | ImportFrom) | FromImport;
+        Import = key("import") >> space >> (ImportAllGlobal | ImportGlobal | ImportAs | ImportFrom | invalid_import_syntax_error) | FromImport;
-        Label = "::" >> LabelName >> "::";
+        Label = "::" >> (and_(LuaKeyword >> "::") >> keyword_as_label_error | UnicodeName >> "::");
-        Goto = key("goto") >> space >> LabelName;
+        Goto = key("goto") >> space >> (and_(LuaKeyword >> not_alpha_num) >> keyword_as_label_error | UnicodeName);
        ShortTabAppending = "[]" >> space >> Assign;
-        BreakLoop = (expr("break") | "continue") >> not_alpha_num;
+        Break = key("break");
+        Continue = key("continue");
+        BreakLoop = (Break >> -(space >> Exp) | Continue) >> not_alpha_num;
-        Return = key("return") >> -(space >> (TableBlock | ExpListLow));
+        Return = key("return") >> -(space >> (TableBlock | ExpList));
-        with_exp = ExpList >> -(space >> Assign);
+        must_exp = Exp | expected_expression_error;
-        With = key("with") >> -ExistentialOp >> space >> disable_do_chain_arg_table_block_rule(with_exp) >> space >> body_with("do");
+        with_exp = ExpList >> -(space >> (':' >> Assign | and_('=') >> assignment_expression_syntax_error)) | expected_expression_error;
+        With = key("with") >> -ExistentialOp >> space >> (
+                disable_do_chain_arg_table_block_rule(with_exp) >> space >> body_with("do") |
+                invalid_with_syntax_error
+        );
        SwitchCase = key("when") >> space >> disable_chain_rule(disable_arg_table_block_rule(SwitchList)) >> space >> body_with("then");
        switch_else = key("else") >> space >> body;
@@ -368,9 +499,11 @@ YueParser::YueParser() {
        SwitchList = Seperator >> (
                and_(SimpleTable | TableLit) >> Exp |
-                exp_not_tab >> *(space >> ',' >> space >> exp_not_tab)
+                exp_not_tab >> *(space >> ',' >> space >> exp_not_tab) |
+                expected_expression_error
        );
-        Switch = key("switch") >> space >> Exp >>
+        Switch = key("switch") >> space >>
+                must_exp >> -(space >> Assignment) >>
                space >> Seperator >> (
                        SwitchCase >> space >> (
                                switch_block |
@@ -379,45 +512,53 @@ YueParser::YueParser() {
                        +space_break >> advance_match >> space >> SwitchCase >> switch_block >> pop_indent
                );
-        Assignment = -(',' >> space >> ExpList >> space) >> (':' >> Assign | and_('=') >> if_assignment_syntax_error);
+        Assignment = -(',' >> space >> ExpList >> space) >> (':' >> Assign | and_('=') >> assignment_expression_syntax_error);
-        IfCond = disable_chain_rule(disable_arg_table_block_rule(Exp >> -(space >> Assignment)));
+        IfCond = disable_chain_rule(disable_arg_table_block_rule(Exp >> -(space >> Assignment))) | expected_expression_error;
        if_else_if = -(line_break >> *space_break >> check_indent_match) >> space >> key("elseif") >> space >> IfCond >> space >> body_with("then");
        if_else = -(line_break >> *space_break >> check_indent_match) >> space >> key("else") >> space >> body;
        IfType = (expr("if") | "unless") >> not_alpha_num;
        If = IfType >> space >> IfCond >> space >> opt_body_with("then") >> *if_else_if >> -if_else;
-        WhileType = (expr("while") | "until") >> not_alpha_num;
+        WhileType = (expr("while") | pl::user("until", [](const item_t& item) {
-        While = WhileType >> space >> disable_do_chain_arg_table_block_rule(Exp >> -(space >> Assignment)) >> space >> opt_body_with("do");
+                State* st = reinterpret_cast<State*>(item.user_data);
-        Repeat = key("repeat") >> space >> Body >> line_break >> *space_break >> check_indent_match >> space >> key("until") >> space >> Exp;
+                return st->noUntilStack.empty() || !st->noUntilStack.back();
+        })) >> not_alpha_num;
+        While = key(WhileType) >> space >> (disable_do_chain_arg_table_block_rule(Exp >> -(space >> Assignment)) | expected_expression_error) >> space >> opt_body_with("do");
+        Repeat = key("repeat") >> space >> (
+                in_block >> line_break >> *space_break >> check_indent_match |
+                disable_until_rule(Statement)
+        ) >> space >> key("until") >> space >> must_exp;
        for_key = pl::user(key("for"), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                return st->noForStack.empty() || !st->noForStack.top();
+                return st->noForStack.empty() || !st->noForStack.back();
        });
-        ForStepValue = ',' >> space >> Exp;
+        ForStepValue = ',' >> space >> must_exp;
-        for_args = Variable >> space >> '=' >> space >> Exp >> space >> ',' >> space >> Exp >> space >> -ForStepValue;
+        for_args = Variable >> space >> '=' >> space >> must_exp >> space >> ',' >> space >> must_exp >> space >> -ForStepValue;
-        For = for_key >> space >> disable_do_chain_arg_table_block_rule(for_args) >> space >> opt_body_with("do");
+        ForNum = disable_do_chain_arg_table_block_rule(for_args) >> space >> opt_body_with("do");
-        for_in = StarExp | ExpList;
+        for_in = StarExp | ExpList | expected_expression_error;
-        ForEach = for_key >> space >> AssignableNameList >> space >> key("in") >> space >>
+        ForEach = AssignableNameList >> space >> key("in") >> space >>
                disable_do_chain_arg_table_block_rule(for_in) >> space >> opt_body_with("do");
+        For = for_key >> space >> (ForNum | ForEach);
        Do = pl::user(key("do"), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                return st->noDoStack.empty() || !st->noDoStack.top();
+                return st->noDoStack.empty() || !st->noDoStack.back();
        }) >> space >> Body;
        disable_do = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noDoStack.push(true);
+                st->noDoStack.push_back(true);
                return true;
        });
        enable_do = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noDoStack.pop();
+                st->noDoStack.pop_back();
                return true;
        });
@@ -435,46 +576,58 @@ YueParser::YueParser() {
        disable_do_chain_arg_table_block = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noDoStack.push(true);
+                st->noDoStack.push_back(true);
-                st->noChainBlockStack.push(true);
+                st->noChainBlockStack.push_back(true);
-                st->noTableBlockStack.push(true);
+                st->noTableBlockStack.push_back(true);
                return true;
        });
        enable_do_chain_arg_table_block = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noDoStack.pop();
+                st->noDoStack.pop_back();
-                st->noChainBlockStack.pop();
+                st->noChainBlockStack.pop_back();
-                st->noTableBlockStack.pop();
+                st->noTableBlockStack.pop_back();
                return true;
        });
        disable_arg_table_block = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noTableBlockStack.push(true);
+                st->noTableBlockStack.push_back(true);
                return true;
        });
        enable_arg_table_block = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noTableBlockStack.pop();
+                st->noTableBlockStack.pop_back();
                return true;
        });
        disable_for = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noForStack.push(true);
+                st->noForStack.push_back(true);
                return true;
        });
        enable_for = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noForStack.pop();
+                st->noForStack.pop_back();
+                return true;
+        });
+        disable_until = pl::user(true_(), [](const item_t& item) {
+                State* st = reinterpret_cast<State*>(item.user_data);
+                st->noUntilStack.push_back(true);
+                return true;
+        });
+        enable_until = pl::user(true_(), [](const item_t& item) {
+                State* st = reinterpret_cast<State*>(item.user_data);
+                st->noUntilStack.pop_back();
                return true;
        });
-        CatchBlock = line_break >> *space_break >> check_indent_match >> space >> key("catch") >> space >> Variable >> space >> in_block;
+        CatchBlock = line_break >> *space_break >> check_indent_match >> space >> key("catch") >> space >> must_variable >> space >> (in_block | invalid_try_syntax_error);
-        Try = key("try") >> space >> (in_block | Exp) >> -CatchBlock;
+        Try = key("try") >> -ExistentialOp >> space >> (in_block | Exp | invalid_try_syntax_error) >> -CatchBlock;
        list_value =
                and_(
@@ -496,28 +649,33 @@ YueParser::YueParser() {
        list_lit_lines = +space_break >> list_lit_line >> *(-(space >> ',') >> space_break >> list_lit_line) >> -(space >> ',');
+        end_brackets_expression = ']' | brackets_expression_error;
        Comprehension = '[' >> not_('[') >>
                Seperator >> space >> (
                        disable_for_rule(list_value) >> space >> (
-                                CompInner >> space >> ']' |
+                                CompFor >> space >> end_brackets_expression |
-                                (list_value_list >> -(space >> ',') | space >> ',')  >> -list_lit_lines >> white >> ']'
+                                (list_value_list >> -(space >> ',') | space >> ',')  >> -list_lit_lines >> white >> end_brackets_expression
                        ) |
-                        list_lit_lines >> white >> ']' |
+                        list_lit_lines >> white >> end_brackets_expression |
                        white >> ']' >> not_(space >> '=')
                );
-        CompValue = ',' >> space >> Exp;
+        end_braces_expression = '}' | braces_expression_error;
-        TblComprehension = and_('{') >> ('{' >> space >> disable_for_rule(Exp >> space >> -(CompValue >> space)) >> CompInner >> space >> '}' | braces_expression_error);
+        CompValue = ',' >> space >> must_exp;
+        TblComprehension = '{' >> space >> disable_for_rule(Exp >> space >> -(CompValue >> space)) >> (CompFor | braces_expression_error) >> space >> end_braces_expression;
-        CompInner = Seperator >> (CompForEach | CompFor) >> *(space >> comp_clause);
+        CompFor = key("for") >> space >> Seperator >> (CompForNum | CompForEach) >> *(space >> comp_clause);
-        StarExp = '*' >> space >> Exp;
+        StarExp = '*' >> space >> must_exp;
-        CompForEach = key("for") >> space >> AssignableNameList >> space >> key("in") >> space >> (StarExp | Exp);
+        CompForEach = AssignableNameList >> space >> key("in") >> space >> (StarExp | must_exp);
-        CompFor = key("for") >> space >> Variable >> space >> '=' >> space >> Exp >> space >> ',' >> space >> Exp >> -ForStepValue;
+        CompForNum = Variable >> space >> '=' >> space >> must_exp >> space >> ',' >> space >> must_exp >> -ForStepValue;
-        comp_clause = CompFor | CompForEach | key("when") >> space >> Exp;
+        comp_clause = key("when") >> space >> must_exp | key("for") >> space >> (CompForNum | CompForEach);
        Assign = '=' >> space >> Seperator >> (
                With | If | Switch | TableBlock |
-                Exp >> *(space >> set(",;") >> space >> Exp)
+                (SpreadListExp | Exp) >> *(space >> set(",") >> space >> (SpreadListExp | Exp)) |
+                expected_expression_error
        );
        UpdateOp =
@@ -525,7 +683,7 @@ YueParser::YueParser() {
                ">>" | "<<" | "??" |
                set("+-*/%&|^");
-        Update = UpdateOp >> '=' >> space >> Exp;
+        Update = UpdateOp >> '=' >> space >> must_exp;
        Assignable = AssignableChain | Variable | SelfItem;
@@ -546,35 +704,38 @@ YueParser::YueParser() {
        UnaryExp = *(UnaryOperator >> space) >> expo_exp >> -(space >> In);
        pipe_operator = "|>";
-        pipe_value = pipe_operator >> *space_break >> space >> UnaryExp;
+        pipe_value = pipe_operator >> *space_break >> space >> must_unary_exp;
        pipe_exp = UnaryExp >> *(space >> pipe_value);
-        BinaryOperator =
+        BinaryOperator = (
                key("or") |
                key("and") |
                "<=" | ">=" | "~=" | "!=" | "==" |
                ".." | "<<" | ">>" | "//" |
-                set("+-*/%><|&~");
+                set("+*/%>|&~") |
+                '-' >> not_('>') |
+                '<' >> not_('-')
+        ) >> not_('=');
-        ExpOpValue = BinaryOperator >> *space_break >> space >> pipe_exp;
+        ExpOpValue = BinaryOperator >> *space_break >> space >> (pipe_exp | expected_expression_error);
-        Exp = Seperator >> pipe_exp >> *(space >> ExpOpValue) >> -(space >> "??" >> space >> Exp);
+        Exp = Seperator >> pipe_exp >> *(space >> ExpOpValue) >> -(space >> "??" >> not_('=') >> *space_break >> space >> must_exp);
        disable_chain = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noChainBlockStack.push(true);
+                st->noChainBlockStack.push_back(true);
                return true;
        });
        enable_chain = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                st->noChainBlockStack.pop();
+                st->noChainBlockStack.pop_back();
                return true;
        });
        chain_line = check_indent_match >> space >> (chain_dot_chain | colon_chain) >> -InvokeArgs;
        chain_block = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                return st->noChainBlockStack.empty() || !st->noChainBlockStack.top();
+                return st->noChainBlockStack.empty() || !st->noChainBlockStack.back();
        }) >> +space_break >> advance_match >> ensure(
                chain_line >> *(+space_break >> chain_line), pop_indent);
        ChainValue =
@@ -589,7 +750,7 @@ YueParser::YueParser() {
                st->expLevel++;
                const int max_exp_level = 100;
                if (st->expLevel > max_exp_level) {
-                        throw ParserError("nesting expressions exceeds 100 levels"sv, item.begin);
+                        RaiseError("nesting expressions exceeds 100 levels"sv, item);
                }
                return true;
        });
@@ -604,14 +765,22 @@ YueParser::YueParser() {
        Value = inc_exp_level >> ensure(SimpleValue | SimpleTable | ChainValue | String, dec_exp_level);
        single_string_inner = '\\' >> set("'\\") | not_('\'') >> any_char;
-        SingleString = '\'' >> *single_string_inner >> '\'';
+        SingleString = '\'' >> *single_string_inner >> ('\'' | unclosed_single_string_error);
        interp = "#{" >> space >> (Exp >> space >> '}' | invalid_interpolation_error);
        double_string_plain = '\\' >> set("\"\\#") | not_('"') >> any_char;
        DoubleStringInner = +(not_("#{") >> double_string_plain);
        DoubleStringContent = DoubleStringInner | interp;
-        DoubleString = '"' >> Seperator >> *DoubleStringContent >> '"';
+        DoubleString = '"' >> Seperator >> *DoubleStringContent >> ('"' | unclosed_double_string_error);
-        String = DoubleString | SingleString | LuaString;
+        YAMLIndent = +set(" \t");
+        YAMLLineInner = +('\\' >> set("\"\\#") | not_("#{" | stop) >> any_char);
+        YAMLLineContent = YAMLLineInner | interp;
+        YAMLLine = check_indent_match >> YAMLIndent >> +(YAMLLineContent) |
+                advance_match >> YAMLIndent >> ensure(+YAMLLineContent, pop_indent);
+        YAMLMultiline = '|' >> space >> Seperator >> +(*set(" \t") >> line_break) >> advance_match >> ensure(YAMLLine >> *(+(*set(" \t") >> line_break) >> YAMLLine), pop_indent);
+        String = DoubleString | SingleString | LuaString | YAMLMultiline;
        lua_string_open = '[' >> *expr('=') >> '[';
        lua_string_close = ']' >> *expr('=') >> ']';
@@ -631,15 +800,15 @@ YueParser::YueParser() {
        LuaStringContent = *(not_(LuaStringClose) >> any_char);
-        LuaString = LuaStringOpen >> -line_break >> LuaStringContent >> LuaStringClose;
+        LuaString = LuaStringOpen >> -line_break >> LuaStringContent >> (LuaStringClose | unclosed_lua_string_error);
-        Parens = '(' >> *space_break >> space >> Exp >> *space_break >> space >> ')';
+        Parens = '(' >> (*space_break >> space >> Exp >> *space_break >> space >> ')' | parenthesis_error);
        Callable = Variable | SelfItem | MacroName | Parens;
        fn_args_value_list = Exp >> *(space >> ',' >> space >> Exp);
        fn_args_lit_line = (
-                push_indent_match >> (space >> fn_args_value_list >> pop_indent | pop_indent)
+                push_indent_match >> ensure(space >> fn_args_value_list, pop_indent)
        ) | (
                space
        );
@@ -649,14 +818,14 @@ YueParser::YueParser() {
        fn_args =
                '(' >> -(space >> fn_args_value_list >> -(space >> ',')) >>
                -fn_args_lit_lines >>
-                white >> ')' | space >> '!' >> not_('=');
+                white >> -(and_(',') >> unexpected_comma_error) >>')' | space >> '!' >> not_('=');
        meta_index = Name | index | String;
        Metatable = '<' >> space >> '>';
        Metamethod = '<' >> space >> meta_index >> space >> '>';
        ExistentialOp = '?' >> not_('?');
-        TableAppendingOp = and_('[') >> ("[]" | brackets_expression_error);
+        TableAppendingOp = and_('[') >> "[]";
        PlainItem = +any_char;
        chain_call = (
@@ -681,7 +850,8 @@ YueParser::YueParser() {
        chain_with_colon = +chain_item >> -colon_chain;
        chain_items = chain_with_colon | colon_chain;
-        index = '[' >> not_('[') >> space >> Exp >> space >> ']';
+        index = '[' >> not_('[') >> space >> (ReversedIndex >> and_(space >> ']') | Exp) >> space >> ']';
+        ReversedIndex = '#' >> space >> -('-' >> space >> Exp);
        chain_item =
                Invoke >> -ExistentialOp |
                DotChainItem >> -ExistentialOp |
@@ -720,10 +890,8 @@ YueParser::YueParser() {
                SpreadExp |
                NormalDef;
-        table_value_list = table_value >> *(space >> ',' >> space >> table_value);
        table_lit_line = (
-                push_indent_match >> (space >> table_value_list >> pop_indent | pop_indent)
+                push_indent_match >> (space >> not_(line_break | '}') >> (table_value | expected_expression_error) >> *(space >> ',' >> space >> table_value) >> pop_indent | pop_indent)
        ) | (
                space
        );
@@ -732,13 +900,15 @@ YueParser::YueParser() {
        TableLit =
                '{' >> Seperator >>
-                -(space >> table_value_list >> -(space >> ',')) >>
+                -(space >> table_value >> *(space >> ',' >> space >> table_value) >> -(space >> ',')) >>
-                -table_lit_lines >>
+                (
-                white >> '}';
+                        table_lit_lines >> white >> end_braces_expression |
+                        white >> '}'
+                );
        table_block_inner = Seperator >> key_value_line >> *(+space_break >> key_value_line);
        TableBlock = +space_break >> advance_match >> ensure(table_block_inner, pop_indent);
-        TableBlockIndent = '*' >> Seperator >> disable_arg_table_block_rule(
+        TableBlockIndent = ('*' | '-' >> space_one) >> Seperator >> disable_arg_table_block_rule(
                space >> key_value_list >> -(space >> ',') >>
                -(+space_break >> advance_match >> space >> ensure(key_value_list >> -(space >> ',') >> *(+space_break >> key_value_line), pop_indent)));
@@ -753,13 +923,18 @@ YueParser::YueParser() {
        ClassDecl =
                key("class") >> not_(':') >> disable_arg_table_block_rule(
                        -(space >> Assignable) >>
-                        -(space >> key("extends") >> prevent_indent >> space >> ensure(Exp, pop_indent)) >>
+                        -(space >> key("extends") >> prevent_indent >> space >> ensure(must_exp, pop_indent)) >>
-                        -(space >> key("using") >> prevent_indent >> space >> ensure(ExpList, pop_indent))
+                        -(space >> key("using") >> prevent_indent >> space >> ensure(ExpList | expected_expression_error, pop_indent))
                ) >> -ClassBlock;
-        GlobalValues = NameList >> -(space >> '=' >> space >> (TableBlock | ExpListLow));
+        GlobalValues = NameList >> -(space >> '=' >> space >> (TableBlock | ExpList | expected_expression_error));
        GlobalOp = expr('*') | '^';
-        Global = key("global") >> space >> (ClassDecl | GlobalOp | GlobalValues);
+        Global = key("global") >> space >> (
+                -(ConstAttrib >> space) >> ClassDecl |
+                GlobalOp |
+                -(ConstAttrib >> space) >> GlobalValues |
+                invalid_global_declaration_error
+        );
        ExportDefault = key("default");
@@ -771,10 +946,10 @@ YueParser::YueParser() {
                pl::user(space >> ExportDefault >> space >> Exp, [](const item_t& item) {
                        State* st = reinterpret_cast<State*>(item.user_data);
                        if (st->exportDefault) {
-                                throw ParserError("export default has already been declared"sv, item.begin);
+                                RaiseError("export default has already been declared"sv, item);
                        }
                        if (st->exportCount > 1) {
-                                throw ParserError("there are items already being exported"sv, item.begin);
+                                RaiseError("there are items already being exported"sv, item);
                        }
                        st->exportDefault = true;
                        return true;
@@ -782,17 +957,17 @@ YueParser::YueParser() {
                not_(space >> ExportDefault) >> pl::user(true_(), [](const item_t& item) {
                        State* st = reinterpret_cast<State*>(item.user_data);
                        if (st->exportDefault && st->exportCount > 1) {
-                                throw ParserError("can not export any more items when 'export default' is declared"sv, item.begin);
+                                RaiseError("can not export any more items when 'export default' is declared"sv, item);
                        }
                        return true;
                }) >> (
                        and_(set(".[")) >> ((pl::user(and_('.' >> Metatable), [](const item_t& item) {
                                State* st = reinterpret_cast<State*>(item.user_data);
                                if (st->exportMetatable) {
-                                        throw ParserError("module metatable duplicated"sv, item.begin);
+                                        RaiseError("module metatable duplicated"sv, item);
                                }
                                if (st->exportMetamethod) {
-                                        throw ParserError("metatable should be exported before metamethod"sv, item.begin);
+                                        RaiseError("metatable should be exported before metamethod"sv, item);
                                }
                                st->exportMetatable = true;
                                return true;
@@ -807,8 +982,9 @@ YueParser::YueParser() {
                        State* st = reinterpret_cast<State*>(item.user_data);
                        st->exportMacro = true;
                        return true;
-                })
+                }) |
-        ) >> not_(space >> StatementAppendix);
+                invalid_export_syntax_error
+        );
        VariablePair = ':' >> Variable;
@@ -817,13 +993,13 @@ YueParser::YueParser() {
                        KeyName |
                        '[' >> not_('[') >> space >> Exp >> space >> ']' |
                        String
-                ) >> ':' >> not_(':') >> space >>
+                ) >> ':' >> not_(':' | '=' >> not_('>')) >> space >>
-                (Exp | TableBlock | +space_break >> space >> Exp);
+                (Exp | TableBlock | +space_break >> space >> Exp | expected_expression_error);
-        MetaVariablePair = ":<" >> space >> Variable >> space >> '>';
+        MetaVariablePair = ":<" >> space >> must_variable >> space >> '>';
        MetaNormalPair = '<' >> space >> -meta_index >> space >> ">:" >> space >>
-                (Exp | TableBlock | +space_break >> space >> Exp);
+                (Exp | TableBlock | +space_break >> space >> Exp | expected_expression_error);
        destruct_def = -(space >> '=' >> space >> Exp);
        VariablePairDef = VariablePair >> destruct_def;
@@ -841,66 +1017,83 @@ YueParser::YueParser() {
        key_value_line = check_indent_match >> space >> (
                key_value_list >> -(space >> ',') |
                TableBlockIndent |
-                '*' >> space >> (SpreadExp | Exp | TableBlock)
+                ('*' | '-' >> space_one) >> space >> (SpreadExp | Exp | TableBlock)
        );
        fn_arg_def_list = FnArgDef >> *(space >> ',' >> space >> FnArgDef);
        fn_arg_def_lit_line = (
-                push_indent_match >> (space >> fn_arg_def_list >> pop_indent | pop_indent)
+                push_indent_match >> ensure(space >> fn_arg_def_list, pop_indent)
        ) | (
                space
        );
        fn_arg_def_lit_lines = fn_arg_def_lit_line >> *(-(space >> ',') >> space_break >> fn_arg_def_lit_line);
-        FnArgDef = (Variable | SelfItem >> -ExistentialOp) >> -(space >> '=' >> space >> Exp);
+        FnArgDef = (Variable | SelfItem >> -ExistentialOp) >> -(space >> '`' >> space >> Name) >> -(space >> '=' >> space >> Exp) | TableLit | SimpleTable;
-        FnArgDefList = Seperator >> (
+        check_vararg_position = and_(white >> (')' | key("using"))) | white >> -(',' >> white) >> vararg_position_error;
-                fn_arg_def_lit_lines >> -(-(space >> ',') >> white >> VarArg) |
-                white >> VarArg
+        var_arg_def = (
-        );
+                VarArgDef |
+                +space_break >> push_indent_match >> ensure(space >> VarArgDef >> -(space >> '`' >> space >> Name), pop_indent)
+        ) >> check_vararg_position;
+        FnArgDefList = Seperator >>
+                -fn_arg_def_list >>
+                -(-(space >> ',') >> +space_break >> fn_arg_def_lit_lines) >>
+                -(-(space >> ',') >> space >> var_arg_def);
-        OuterVarShadow = key("using") >> space >> (NameList | key("nil"));
+        OuterVarShadow = key("using") >> space >> (key("nil") | NameList);
-        FnArgsDef = '(' >> *space_break >> -FnArgDefList >> -(white >> OuterVarShadow) >> white >> ')';
+        outer_var_shadow_def = OuterVarShadow |
+                +space_break >> push_indent_match >> ensure(space >> OuterVarShadow, pop_indent);
+        FnArgsDef = '(' >> space >> -FnArgDefList >> -(space >> outer_var_shadow_def) >> white >> -(and_(',') >> unexpected_comma_error) >> ')';
        FnArrow = expr("->") | "=>";
        FunLit = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
                return st->fnArrowAvailable;
        }) >> -(FnArgsDef >>
                -(':' >> space >>
-                        disable_fun_lit >> ensure(ExpListLow | DefaultValue, enable_fun_lit)
+                        disable_fun_lit >> ensure(ExpList | DefaultValue, enable_fun_lit)
                )
        ) >> space >> FnArrow >> -(space >> Body);
        MacroName = '$' >> UnicodeName;
-        macro_args_def = '(' >> white >> -FnArgDefList >> white >> ')';
+        macro_args_def = '(' >> space >> -FnArgDefList >> white >> -(and_(',') >> unexpected_comma_error) >> ')';
        MacroLit = -(macro_args_def >> space) >> "->" >> space >> Body;
        MacroFunc = MacroName >> (Invoke | InvokeArgs);
-        Macro = key("macro") >> space >> UnicodeName >> space >> '=' >> space >> (MacroLit | MacroFunc);
+        Macro = key("macro") >> space >> (
+                UnicodeName >> space >> '=' >> space >> (MacroLit | MacroFunc | invalid_macro_definition_error) |
+                invalid_macro_definition_error
+        );
        MacroInPlace = '$' >> space >> "->" >> space >> Body;
-        NameList = Seperator >> Variable >> *(space >> ',' >> space >> Variable);
+        must_variable = Variable | and_(LuaKeyword >> not_alpha_num) >> keyword_as_identifier_syntax_error | expected_indentifier_error;
-        NameOrDestructure = Variable | TableLit | Comprehension;
+        NameList = Seperator >> must_variable >> *(space >> ',' >> space >> must_variable);
+        NameOrDestructure = Variable | TableLit | Comprehension | SimpleTable | expected_expression_error;
        AssignableNameList = Seperator >> NameOrDestructure >> *(space >> ',' >> space >> NameOrDestructure);
        FnArrowBack = '<' >> set("-=");
        Backcall = -(FnArgsDef >> space) >> FnArrowBack >> space >> ChainValue;
+        SubBackcall = FnArrowBack >> space >> ChainValue;
+        must_unary_exp = UnaryExp | expected_expression_error;
        PipeBody = Seperator >>
-                pipe_operator >> space >> UnaryExp >>
+                pipe_operator >> space >> must_unary_exp >>
-                *(+space_break >> check_indent_match >> space >> pipe_operator >> space >> UnaryExp);
+                *(+space_break >> check_indent_match >> space >> pipe_operator >> space >> must_unary_exp);
        ExpList = Seperator >> Exp >> *(space >> ',' >> space >> Exp);
-        ExpListLow = Seperator >> Exp >> *(space >> set(",;") >> space >> Exp);
        arg_line = check_indent_match >> space >> Exp >> *(space >> ',' >> space >> Exp);
        arg_block = arg_line >> *(space >> ',' >> space_break >> arg_line) >> pop_indent;
        arg_table_block = pl::user(true_(), [](const item_t& item) {
                State* st = reinterpret_cast<State*>(item.user_data);
-                return st->noTableBlockStack.empty() || !st->noTableBlockStack.top();
+                return st->noTableBlockStack.empty() || !st->noTableBlockStack.back();
        }) >> TableBlock;
        invoke_args_with_table =
@@ -909,103 +1102,84 @@ YueParser::YueParser() {
                        space_break >> advance_match >> arg_block >> -(-(space >> ',') >> arg_table_block)
                ) | arg_table_block;
-        leading_spaces_error = pl::user(+space_one >> '(' >> space >> Exp >> +(space >> ',' >> space >> Exp) >> space >> ')', [](const item_t& item) {
-                throw ParserError("write invoke arguments in parentheses without leading spaces or just leading spaces without parentheses"sv, item.begin);
-                return false;
-        });
        InvokeArgs =
                not_(set("-~") | "[]") >> space >> Seperator >> (
                        Exp >> *(space >> ',' >> space >> Exp) >> -(space >> invoke_args_with_table) |
-                        arg_table_block |
+                        arg_table_block
-                        leading_spaces_error
                );
        ConstValue = (expr("nil") | "true" | "false") >> not_alpha_num;
-        braces_expression_error = pl::user(true_(), [](const item_t& item) {
-                throw ParserError("syntax error in brace expression"sv, item.begin);
-                return false;
-        });
-        brackets_expression_error = pl::user(true_(), [](const item_t& item) {
-                throw ParserError("syntax error in bracket expression"sv, item.begin);
-                return false;
-        });
-        slice_expression_error = pl::user(true_(), [](const item_t& item) {
-                throw ParserError("syntax error in slice expression"sv, item.begin);
-                return false;
-        });
        SimpleValue =
                TableLit | ConstValue | If | Switch | Try | With |
-                ClassDecl | ForEach | For | While | Do |
+                ClassDecl | For | While | Repeat | Do |
                UnaryValue | TblComprehension | Comprehension |
                FunLit | Num | VarArg;
-        ExpListAssign = ExpList >> -(space >> (Update | Assign)) >> not_(space >> '=');
+        ExpListAssign = ExpList >> -(space >> (Update | Assign | SubBackcall)) >> not_(space >> '=');
        IfLine = IfType >> space >> IfCond;
        WhileLine = WhileType >> space >> Exp;
-        YueLineComment = *(not_(set("\r\n")) >> any_char);
-        yue_line_comment = "--" >> YueLineComment >> and_(stop);
-        MultilineCommentInner = multi_line_content;
-        YueMultilineComment = multi_line_open >> MultilineCommentInner >> multi_line_close;
-        yue_comment = check_indent >> (
-                (
-                        YueMultilineComment >>
-                        *(set(" \t") | YueMultilineComment) >>
-                        -yue_line_comment
-                ) | yue_line_comment
-        ) >> and_(line_break);
        ChainAssign = Seperator >> Exp >> +(space >> '=' >> space >> Exp >> space >> and_('=')) >> space >> Assign;
-        StatementAppendix = (IfLine | WhileLine | CompInner) >> space;
+        StatementAppendix = IfLine | WhileLine | CompFor;
-        Statement =
+        Statement = (
-                Seperator >>
+                (
-                -(
+                        Import | Export | Global | Macro | MacroInPlace | Label
-                        yue_comment >>
+                ) | (
-                        *(line_break >> yue_comment) >>
+                        Local | While | Repeat | For | Return |
-                        line_break >>
+                        BreakLoop | Goto | ShortTabAppending |
-                        check_indent_match
-                ) >>
-                space >> (
-                        Import | While | Repeat | For | ForEach |
-                        Return | Local | Global | Export | Macro |
-                        MacroInPlace | BreakLoop | Label | Goto | ShortTabAppending |
                        LocalAttrib | Backcall | PipeBody | ExpListAssign | ChainAssign |
-                        StatementAppendix >> empty_block_error
+                        StatementAppendix >> empty_block_error |
-                ) >>
+                        and_(key("else") | key("elseif") | key("when")) >> dangling_clause_error
-                space >>
+                ) >> space >> -StatementAppendix
-                -StatementAppendix;
+        ) >> space;
        StatementSep = white >> (set("('\"") | "[[" | "[=");
        Body = in_block | Statement;
-        empty_line_break =
+        YueLineComment = *(not_(set("\r\n")) >> any_char);
-                check_indent >> (multi_line_comment >> space | comment) >> and_(stop) |
+        yue_line_comment = "--" >> YueLineComment >> and_(stop);
-                advance >> ensure(multi_line_comment >> space | comment, pop_indent) >> and_(stop) |
+        YueMultilineComment = multi_line_content;
-                plain_space >> and_(line_break);
+        yue_multiline_comment = multi_line_open >> YueMultilineComment >> multi_line_close;
+        comment_line =
+                yue_multiline_comment >> *(set(" \t") | yue_multiline_comment) >> plain_space >> -yue_line_comment |
+                yue_line_comment;
+        YueComment =
+                check_indent >> comment_line >> and_(stop) |
+                advance >> ensure(comment_line, pop_indent) >> and_(stop);
+        EmptyLine = plain_space >> and_(stop);
        indentation_error = pl::user(not_(pipe_operator | eof()), [](const item_t& item) {
-                throw ParserError("unexpected indent"sv, item.begin);
+                RaiseError("unexpected indent"sv, item);
                return false;
        });
-        line = (
+        is_lax = pl::user(true_(), [](const item_t& item) {
-                check_indent_match >> Statement |
+                State* st = reinterpret_cast<State*>(item.user_data);
-                empty_line_break |
+                return st->lax;
+        });
+        line = *(EmptyLine >> line_break) >> (
+                check_indent_match >> space >> Statement >> *(';' >> space >> (Statement | not_(';'))) |
+                YueComment |
                advance_match >> ensure(space >> (indentation_error | Statement), pop_indent)
        );
-        Block = Seperator >> line >> *(+line_break >> line);
+        Block = Seperator >> (
+                is_lax >> lax_line >> *(line_break >> lax_line) |
+                line >> *(line_break >> line)
+        );
        shebang = "#!" >> *(not_(stop) >> any_char);
-        BlockEnd = Block >> white >> stop;
+        BlockEnd = Block >> plain_white >> stop;
-        File = -shebang >> -Block >> white >> stop;
+        File = -shebang >> -Block >> plain_white >> stop;
+        lax_line = advance_match >> ensure(*(not_(stop) >> any()), pop_indent) |
+                line >> and_(stop) |
+                check_indent_match >> *(not_(stop) >> any());
 }
 // clang-format on
@@ -1016,7 +1190,7 @@ bool YueParser::startWith(std::string_view codes, rule& r) {
        }
        try {
                if (!codes.empty()) {
-                        converted = std::make_unique<input>(_converter.from_bytes(&codes.front(), &codes.back() + 1));
+                        converted = std::make_unique<input>(utf8_decode({&codes.front(), &codes.back() + 1}));
                } else {
                        converted = std::make_unique<input>();
                }
@@ -1035,24 +1209,25 @@ bool YueParser::startWith(std::string_view codes, rule& r) {
        return true;
 }
-ParseInfo YueParser::parse(std::string_view codes, rule& r) {
+ParseInfo YueParser::parse(std::string_view codes, rule& r, bool lax) {
        ParseInfo res;
        if (codes.substr(0, 3) == "\xEF\xBB\xBF"sv) {
                codes = codes.substr(3);
        }
        try {
                if (!codes.empty()) {
-                        res.codes = std::make_unique<input>(_converter.from_bytes(&codes.front(), &codes.back() + 1));
+                        res.codes = std::make_unique<input>(utf8_decode({&codes.front(), &codes.back() + 1}));
                } else {
                        res.codes = std::make_unique<input>();
                }
-        } catch (const std::range_error&) {
+        } catch (const std::exception&) {
                res.error = {"invalid text encoding"s, 1, 1};
                return res;
        }
        error_list errors;
        try {
                State state;
+                state.lax = lax;
                res.node.set(::yue::parse(*(res.codes), r, errors, &state));
                if (state.exportCount > 0) {
                        int index = 0;
@@ -1090,29 +1265,31 @@ ParseInfo YueParser::parse(std::string_view codes, rule& r) {
        return res;
 }
-ParseInfo YueParser::parse(std::string_view astName, std::string_view codes) {
+ParseInfo YueParser::parse(std::string_view astName, std::string_view codes, bool lax) {
        auto it = _rules.find(astName);
        if (it != _rules.end()) {
-                return parse(codes, *it->second);
+                return parse(codes, *it->second, lax);
        }
-        return {};
+        ParseInfo info{};
+        info.error = ParseInfo::Error{"invalid rule: "s + std::string{astName}, 1, 1};
+        return info;
 }
 bool YueParser::match(std::string_view astName, std::string_view codes) {
        auto it = _rules.find(astName);
        if (it != _rules.end()) {
                auto rEnd = rule(*it->second >> eof());
-                return parse(codes, rEnd).node;
+                return parse(codes, rEnd, false).node;
        }
        return false;
 }
 std::string YueParser::toString(ast_node* node) {
-        return _converter.to_bytes(std::wstring(node->m_begin.m_it, node->m_end.m_it));
+        return utf8_encode({node->m_begin.m_it, node->m_end.m_it});
 }
 std::string YueParser::toString(input::iterator begin, input::iterator end) {
-        return _converter.to_bytes(std::wstring(begin, end));
+        return utf8_encode({begin, end});
 }
 bool YueParser::hasAST(std::string_view name) const {
@@ -1138,6 +1315,24 @@ void trim(std::string& str) {
        str.erase(0, str.find_first_not_of(" \t\r\n"));
        str.erase(str.find_last_not_of(" \t\r\n") + 1);
 }
+std::string toLuaDoubleString(const std::string& input) {
+        std::string luaStr = "\"";
+        for (char c : input) {
+                switch (c) {
+                        case '\"': luaStr += "\\\""; break;
+                        case '\\': luaStr += "\\\\"; break;
+                        case '\n': luaStr += "\\n"; break;
+                        case '\r': luaStr += "\\r"; break;
+                        case '\t': luaStr += "\\t"; break;
+                        default:
+                                luaStr += c;
+                                break;
+                }
+        }
+        luaStr += "\"";
+        return luaStr;
+}
 } // namespace Utils
 std::string ParseInfo::errorMessage(std::string_view msg, int errLine, int errCol, int lineOffset) const {
@@ -1171,7 +1366,7 @@ std::string ParseInfo::errorMessage(std::string_view msg, int errLine, int errCo
                }
                ++it;
        }
-        auto line = Converter{}.to_bytes(std::wstring(begin, end));
+        auto line = utf8_encode({begin, end});
        while (col < static_cast<int>(line.size())
                   && (line[col] == ' ' || line[col] == '\t')) {
                col++;
diff --git a/src/yuescript/yue_parser.h b/src/yuescript/yue_parser.h
index 7281ec3..df9f39c 100644
--- a/src/yuescript/yue_parser.h
+++ b/src/yuescript/yue_parser.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -74,16 +74,16 @@ extern std::unordered_set<std::string> Keywords;
 class YueParser {
 public:
        template <class AST>
-        ParseInfo parse(std::string_view codes) {
+        ParseInfo parse(std::string_view codes, bool lax) {
-                return parse(codes, getRule<AST>());
+                return parse(codes, getRule<AST>(), lax);
        }
-        ParseInfo parse(std::string_view astName, std::string_view codes);
+        ParseInfo parse(std::string_view astName, std::string_view codes, bool lax);
        template <class AST>
        bool match(std::string_view codes) {
                auto rEnd = rule(getRule<AST>() >> eof());
-                return parse(codes, rEnd).node;
+                return parse(codes, rEnd, false).node;
        }
        bool match(std::string_view astName, std::string_view codes);
@@ -102,13 +102,14 @@ public:
 protected:
        YueParser();
-        ParseInfo parse(std::string_view codes, rule& r);
+        ParseInfo parse(std::string_view codes, rule& r, bool lax);
        bool startWith(std::string_view codes, rule& r);
        struct State {
                State() {
                        indents.push(0);
                }
+                bool lax = false;
                bool exportDefault = false;
                bool exportMacro = false;
                bool exportMetatable = false;
@@ -118,11 +119,13 @@ protected:
                int expLevel = 0;
                size_t stringOpen = 0;
                std::string buffer;
+                std::optional<bool> useTab;
                std::stack<int> indents;
-                std::stack<bool> noDoStack;
+                std::vector<bool> noDoStack;
-                std::stack<bool> noChainBlockStack;
+                std::vector<bool> noChainBlockStack;
-                std::stack<bool> noTableBlockStack;
+                std::vector<bool> noTableBlockStack;
-                std::stack<bool> noForStack;
+                std::vector<bool> noForStack;
+                std::vector<bool> noUntilStack;
                std::unordered_set<std::string> usedNames;
        };
@@ -132,7 +135,6 @@ protected:
        }
 private:
-        Converter _converter;
        std::unordered_map<std::string_view, rule*> _rules;
        template <class T>
@@ -147,7 +149,6 @@ private:
        }
        NONE_AST_RULE(empty_block_error);
-        NONE_AST_RULE(leading_spaces_error);
        NONE_AST_RULE(indentation_error);
        NONE_AST_RULE(braces_expression_error);
        NONE_AST_RULE(brackets_expression_error);
@@ -156,12 +157,42 @@ private:
        NONE_AST_RULE(invalid_interpolation_error);
        NONE_AST_RULE(confusing_unary_not_error);
        NONE_AST_RULE(table_key_pair_error);
-        NONE_AST_RULE(if_assignment_syntax_error);
+        NONE_AST_RULE(assignment_expression_syntax_error);
+        NONE_AST_RULE(unclosed_single_string_error);
+        NONE_AST_RULE(unclosed_double_string_error);
+        NONE_AST_RULE(unclosed_lua_string_error);
+        NONE_AST_RULE(unexpected_comma_error);
+        NONE_AST_RULE(parenthesis_error);
+        NONE_AST_RULE(dangling_clause_error);
+        NONE_AST_RULE(keyword_as_label_error);
+        NONE_AST_RULE(check_vararg_position);
+        NONE_AST_RULE(vararg_position_error);
+        NONE_AST_RULE(invalid_import_syntax_error);
+        NONE_AST_RULE(invalid_import_as_syntax_error);
+        NONE_AST_RULE(expected_expression_error);
+        NONE_AST_RULE(invalid_from_import_error);
+        NONE_AST_RULE(invalid_export_syntax_error);
+        NONE_AST_RULE(invalid_macro_definition_error);
+        NONE_AST_RULE(invalid_global_declaration_error);
+        NONE_AST_RULE(invalid_local_declaration_error);
+        NONE_AST_RULE(invalid_with_syntax_error);
+        NONE_AST_RULE(invalid_try_syntax_error);
+        NONE_AST_RULE(keyword_as_identifier_syntax_error);
+        NONE_AST_RULE(invalid_number_literal_error);
+        NONE_AST_RULE(invalid_import_literal_error);
+        NONE_AST_RULE(expected_indentifier_error);
+        NONE_AST_RULE(must_exp);
+        NONE_AST_RULE(must_unary_exp);
+        NONE_AST_RULE(must_variable);
+        NONE_AST_RULE(end_braces_expression);
+        NONE_AST_RULE(end_brackets_expression);
        NONE_AST_RULE(inc_exp_level);
        NONE_AST_RULE(dec_exp_level);
        NONE_AST_RULE(num_char);
+        NONE_AST_RULE(must_num_char);
        NONE_AST_RULE(num_char_hex);
        NONE_AST_RULE(num_lit);
        NONE_AST_RULE(num_bin_lit);
@@ -172,6 +203,7 @@ private:
        NONE_AST_RULE(line_break);
        NONE_AST_RULE(any_char);
        NONE_AST_RULE(white);
+        NONE_AST_RULE(plain_white);
        NONE_AST_RULE(stop);
        NONE_AST_RULE(comment);
        NONE_AST_RULE(multi_line_open);
@@ -217,6 +249,8 @@ private:
        NONE_AST_RULE(enable_for);
        NONE_AST_RULE(enable_fun_lit);
        NONE_AST_RULE(disable_fun_lit);
+        NONE_AST_RULE(disable_until);
+        NONE_AST_RULE(enable_until);
        NONE_AST_RULE(switch_else);
        NONE_AST_RULE(switch_block);
        NONE_AST_RULE(if_else_if);
@@ -246,6 +280,8 @@ private:
        NONE_AST_RULE(fn_arg_def_lit_lines);
        NONE_AST_RULE(destruct_def);
        NONE_AST_RULE(macro_args_def);
+        NONE_AST_RULE(var_arg_def);
+        NONE_AST_RULE(outer_var_shadow_def);
        NONE_AST_RULE(chain_call);
        NONE_AST_RULE(chain_call_list);
        NONE_AST_RULE(chain_index_chain);
@@ -262,7 +298,6 @@ private:
        NONE_AST_RULE(table_value);
        NONE_AST_RULE(table_lit_lines);
        NONE_AST_RULE(table_lit_line);
-        NONE_AST_RULE(table_value_list);
        NONE_AST_RULE(table_block_inner);
        NONE_AST_RULE(class_line);
        NONE_AST_RULE(key_value_line);
@@ -279,17 +314,18 @@ private:
        NONE_AST_RULE(expo_exp);
        NONE_AST_RULE(exp_not_tab);
        NONE_AST_RULE(local_const_item);
-        NONE_AST_RULE(empty_line_break);
+        NONE_AST_RULE(comment_line);
-        NONE_AST_RULE(yue_comment);
        NONE_AST_RULE(yue_line_comment);
+        NONE_AST_RULE(yue_multiline_comment);
        NONE_AST_RULE(line);
        NONE_AST_RULE(shebang);
+        NONE_AST_RULE(is_lax);
+        NONE_AST_RULE(lax_line);
        AST_RULE(Num);
        AST_RULE(Name);
        AST_RULE(UnicodeName);
        AST_RULE(Variable);
-        AST_RULE(LabelName);
        AST_RULE(LuaKeyword);
        AST_RULE(Self);
        AST_RULE(SelfName);
@@ -298,6 +334,7 @@ private:
        AST_RULE(SelfItem);
        AST_RULE(KeyName);
        AST_RULE(VarArg);
+        AST_RULE(VarArgDef);
        AST_RULE(Seperator);
        AST_RULE(NameList);
        AST_RULE(LocalFlag);
@@ -315,14 +352,16 @@ private:
        AST_RULE(ImportAllMacro);
        AST_RULE(ImportTabLit);
        AST_RULE(ImportAs);
+        AST_RULE(ImportGlobal);
+        AST_RULE(ImportAllGlobal);
        AST_RULE(Import);
        AST_RULE(Label);
        AST_RULE(Goto);
        AST_RULE(ShortTabAppending);
        AST_RULE(FnArrowBack);
        AST_RULE(Backcall);
+        AST_RULE(SubBackcall);
        AST_RULE(PipeBody);
-        AST_RULE(ExpListLow);
        AST_RULE(ExpList);
        AST_RULE(Return);
        AST_RULE(With);
@@ -338,6 +377,7 @@ private:
        AST_RULE(Repeat);
        AST_RULE(ForStepValue);
        AST_RULE(For);
+        AST_RULE(ForNum);
        AST_RULE(ForEach);
        AST_RULE(Do);
        AST_RULE(CatchBlock);
@@ -347,8 +387,8 @@ private:
        AST_RULE(TblComprehension);
        AST_RULE(StarExp);
        AST_RULE(CompForEach);
+        AST_RULE(CompForNum);
        AST_RULE(CompFor);
-        AST_RULE(CompInner);
        AST_RULE(Assign);
        AST_RULE(UpdateOp);
        AST_RULE(Update);
@@ -359,6 +399,7 @@ private:
        AST_RULE(ExpOpValue);
        AST_RULE(Exp);
        AST_RULE(Callable);
+        AST_RULE(ReversedIndex);
        AST_RULE(ChainValue);
        AST_RULE(SimpleTable);
        AST_RULE(SimpleValue);
@@ -371,6 +412,11 @@ private:
        AST_RULE(DoubleStringInner);
        AST_RULE(DoubleStringContent);
        AST_RULE(DoubleString);
+        AST_RULE(YAMLIndent);
+        AST_RULE(YAMLLineInner);
+        AST_RULE(YAMLLineContent);
+        AST_RULE(YAMLLine);
+        AST_RULE(YAMLMultiline);
        AST_RULE(String);
        AST_RULE(Parens);
        AST_RULE(DotChainItem);
@@ -427,13 +473,16 @@ private:
        AST_RULE(ExpListAssign);
        AST_RULE(IfLine);
        AST_RULE(WhileLine);
+        AST_RULE(Break);
+        AST_RULE(Continue);
        AST_RULE(BreakLoop);
        AST_RULE(StatementAppendix);
        AST_RULE(Statement);
        AST_RULE(StatementSep);
        AST_RULE(YueLineComment);
-        AST_RULE(MultilineCommentInner);
        AST_RULE(YueMultilineComment);
+        AST_RULE(YueComment);
+        AST_RULE(EmptyLine);
        AST_RULE(ChainAssign);
        AST_RULE(Body);
        AST_RULE(Block);
@@ -444,6 +493,7 @@ private:
 namespace Utils {
 void replace(std::string& str, std::string_view from, std::string_view to);
 void trim(std::string& str);
+std::string toLuaDoubleString(const std::string& input);
 } // namespace Utils
 } // namespace yue
diff --git a/src/yuescript/yuescript.cpp b/src/yuescript/yuescript.cpp
index 7e8e8b7..fd2bf62 100644
--- a/src/yuescript/yuescript.cpp
+++ b/src/yuescript/yuescript.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2025 Li Jin <dragon-fly@qq.com>
+/* Copyright (c) 2017-2026 Li Jin <dragon-fly@qq.com>
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -93,6 +93,12 @@ static void get_config(lua_State* L, yue::YueConfig& config) {
                config.useSpaceOverTab = lua_toboolean(L, -1) != 0;
        }
        lua_pop(L, 1);
+        lua_pushliteral(L, "lax");
+        lua_gettable(L, -2);
+        if (lua_isboolean(L, -1) != 0) {
+                config.lax = lua_toboolean(L, -1) != 0;
+        }
+        lua_pop(L, 1);
        lua_pushliteral(L, "options");
        lua_gettable(L, -2);
        if (lua_istable(L, -1) != 0) {
@@ -179,8 +185,13 @@ static int yueformat(lua_State* L) {
        if (!lua_isnoneornil(L, 2)) {
                tabSize = static_cast<int>(luaL_checkinteger(L, 2));
        }
+        bool reserveComment = true;
+        if (!lua_isnoneornil(L, 3)) {
+                luaL_checktype(L, 3, LUA_TBOOLEAN);
+                reserveComment = lua_toboolean(L, 3) != 0;
+        }
        std::string_view codes(input, len);
-        auto info = yue::YueParser::shared().parse<yue::File_t>(codes);
+        auto info = yue::YueParser::shared().parse<yue::File_t>(codes, false);
        if (info.error) {
                const auto& error = info.error.value();
                if (!info.codes) {
@@ -200,7 +211,11 @@ static int yueformat(lua_State* L) {
        } else {
                formatter.spaceOverTab = false;
        }
+        formatter.reserveComment = reserveComment;
        auto result = formatter.toString(info.node.get());
+        if (!formatter.reserveComment) {
+                yue::Utils::replace(result, "\n\n", "\n");
+        }
        lua_pushlstring(L, result.c_str(), result.size());
        return 1;
 }
@@ -235,6 +250,7 @@ static int yuecheck(lua_State* L) {
        }
        if (result.globals) {
                for (const auto& global : *result.globals) {
+                        if (global.defined) continue;
                        lua_createtable(L, 4, 0);
                        lua_pushliteral(L, "global");
                        lua_rawseti(L, -2, 1);
@@ -247,7 +263,7 @@ static int yuecheck(lua_State* L) {
                        lua_rawseti(L, -2, ++i);
                }
        }
-        if (result.error) {
+        if (!config.lax && result.error) {
                lua_pushboolean(L, 0);
                lua_insert(L, -2);
                return 2;
@@ -282,8 +298,18 @@ static int yuetoast(lua_State* L) {
                        ruleName = {name, nameSize};
                }
        }
+        bool lax = false;
+        if (!lua_isnoneornil(L, 4)) {
+                luaL_checktype(L, 4, LUA_TBOOLEAN);
+                lax = lua_toboolean(L, 4) != 0;
+        }
+        bool reserveComment = false;
+        if (!lua_isnoneornil(L, 5)) {
+                luaL_checktype(L, 5, LUA_TBOOLEAN);
+                reserveComment = lua_toboolean(L, 5) != 0;
+        }
        auto& yueParser = yue::YueParser::shared();
-        auto info = ruleName.empty() ? yueParser.parse<yue::File_t>({input, size}) : yueParser.parse(ruleName, {input, size});
+        auto info = ruleName.empty() ? yueParser.parse<yue::File_t>({input, size}, lax) : yueParser.parse(ruleName, {input, size}, lax);
        if (!info.error) {
                lua_createtable(L, 0, 0);
                int tableIndex = lua_gettop(L);
@@ -309,13 +335,11 @@ static int yuetoast(lua_State* L) {
                };
                do_call(info.node);
                yue::YueFormat formatter{};
+                formatter.reserveComment = reserveComment;
                while (!stack.empty()) {
                        auto& current = stack.top();
                        int continuation = current.continuation;
                        auto node = current.node;
-                        if (auto comment = yue::ast_cast<yue::YueMultilineComment_t>(node)) {
-                                node = comment->inner.get();
-                        }
                        switch (continuation) {
                                case 0: {
                                        if (!current.children) {
@@ -324,6 +348,9 @@ static int yuetoast(lua_State* L) {
                                                                current.hasSep = true;
                                                                return false;
                                                        }
+                                                        if (!reserveComment && yue::ast_is<yue::YueComment_t, yue::EmptyLine_t>(child)) {
+                                                                return false;
+                                                        }
                                                        if (!current.children) {
                                                                current.children = std::make_unique<std::vector<yue::ast_node*>>();
                                                        }
diff --git a/win-build/Lua53/Lua53.vcxproj b/win-build/Lua53/Lua53.vcxproj
index 4f17bfc..d0e7fee 100644
--- a/win-build/Lua53/Lua53.vcxproj
+++ b/win-build/Lua53/Lua53.vcxproj
@@ -269,69 +269,69 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lapi.c" />
+    <ClCompile Include="lapi.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lauxlib.c" />
+    <ClCompile Include="lauxlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lbaselib.c" />
+    <ClCompile Include="lbaselib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lbitlib.c" />
+    <ClCompile Include="lbitlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcode.c" />
+    <ClCompile Include="lcode.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcorolib.c" />
+    <ClCompile Include="lcorolib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lctype.c" />
+    <ClCompile Include="lctype.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldblib.c" />
+    <ClCompile Include="ldblib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldebug.c" />
+    <ClCompile Include="ldebug.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldo.c" />
+    <ClCompile Include="ldo.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldump.c" />
+    <ClCompile Include="ldump.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lfunc.c" />
+    <ClCompile Include="lfunc.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lgc.c" />
+    <ClCompile Include="lgc.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\linit.c" />
+    <ClCompile Include="linit.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\liolib.c" />
+    <ClCompile Include="liolib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llex.c" />
+    <ClCompile Include="llex.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmathlib.c" />
+    <ClCompile Include="lmathlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmem.c" />
+    <ClCompile Include="lmem.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\loadlib.c" />
+    <ClCompile Include="loadlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lobject.c" />
+    <ClCompile Include="lobject.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lopcodes.c" />
+    <ClCompile Include="lopcodes.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\loslib.c" />
+    <ClCompile Include="loslib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lparser.c" />
+    <ClCompile Include="lparser.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstate.c" />
+    <ClCompile Include="lstate.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstring.c" />
+    <ClCompile Include="lstring.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstrlib.c" />
+    <ClCompile Include="lstrlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltable.c" />
+    <ClCompile Include="ltable.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltablib.c" />
+    <ClCompile Include="ltablib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltm.c" />
+    <ClCompile Include="ltm.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lundump.c" />
+    <ClCompile Include="lundump.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lutf8lib.c" />
+    <ClCompile Include="lutf8lib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lvm.c" />
+    <ClCompile Include="lvm.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lzio.c" />
+    <ClCompile Include="lzio.c" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lapi.h" />
+    <ClInclude Include="lapi.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lauxlib.h" />
+    <ClInclude Include="lauxlib.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcode.h" />
+    <ClInclude Include="lcode.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lctype.h" />
+    <ClInclude Include="lctype.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldebug.h" />
+    <ClInclude Include="ldebug.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldo.h" />
+    <ClInclude Include="ldo.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lfunc.h" />
+    <ClInclude Include="lfunc.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lgc.h" />
+    <ClInclude Include="lgc.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llex.h" />
+    <ClInclude Include="llex.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llimits.h" />
+    <ClInclude Include="llimits.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmem.h" />
+    <ClInclude Include="lmem.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lobject.h" />
+    <ClInclude Include="lobject.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lopcodes.h" />
+    <ClInclude Include="lopcodes.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lparser.h" />
+    <ClInclude Include="lparser.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lprefix.h" />
+    <ClInclude Include="lprefix.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstate.h" />
+    <ClInclude Include="lstate.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstring.h" />
+    <ClInclude Include="lstring.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltable.h" />
+    <ClInclude Include="ltable.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltm.h" />
+    <ClInclude Include="ltm.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lua.h" />
+    <ClInclude Include="lua.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lua.hpp" />
+    <ClInclude Include="lua.hpp" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\luaconf.h" />
+    <ClInclude Include="luaconf.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lualib.h" />
+    <ClInclude Include="lualib.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lundump.h" />
+    <ClInclude Include="lundump.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lvm.h" />
+    <ClInclude Include="lvm.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lzio.h" />
+    <ClInclude Include="lzio.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/win-build/Lua53/Lua53.vcxproj.filters b/win-build/Lua53/Lua53.vcxproj.filters
index df8715c..be208ec 100644
--- a/win-build/Lua53/Lua53.vcxproj.filters
+++ b/win-build/Lua53/Lua53.vcxproj.filters
@@ -7,184 +7,184 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lapi.c">
+    <ClCompile Include="lapi.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lauxlib.c">
+    <ClCompile Include="lauxlib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lbaselib.c">
+    <ClCompile Include="lbaselib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lbitlib.c">
+    <ClCompile Include="lbitlib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcode.c">
+    <ClCompile Include="lcode.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcorolib.c">
+    <ClCompile Include="lcorolib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lctype.c">
+    <ClCompile Include="lctype.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldblib.c">
+    <ClCompile Include="ldblib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldebug.c">
+    <ClCompile Include="ldebug.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldo.c">
+    <ClCompile Include="ldo.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldump.c">
+    <ClCompile Include="ldump.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lfunc.c">
+    <ClCompile Include="lfunc.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lgc.c">
+    <ClCompile Include="lgc.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\linit.c">
+    <ClCompile Include="linit.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\liolib.c">
+    <ClCompile Include="liolib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llex.c">
+    <ClCompile Include="llex.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmathlib.c">
+    <ClCompile Include="lmathlib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmem.c">
+    <ClCompile Include="lmem.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\loadlib.c">
+    <ClCompile Include="loadlib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lobject.c">
+    <ClCompile Include="lobject.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lopcodes.c">
+    <ClCompile Include="lopcodes.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\loslib.c">
+    <ClCompile Include="loslib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lparser.c">
+    <ClCompile Include="lparser.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstate.c">
+    <ClCompile Include="lstate.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstring.c">
+    <ClCompile Include="lstring.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstrlib.c">
+    <ClCompile Include="lstrlib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltable.c">
+    <ClCompile Include="ltable.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltablib.c">
+    <ClCompile Include="ltablib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltm.c">
+    <ClCompile Include="ltm.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lundump.c">
+    <ClCompile Include="lundump.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lutf8lib.c">
+    <ClCompile Include="lutf8lib.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lvm.c">
+    <ClCompile Include="lvm.c">
      <Filter>src</Filter>
    </ClCompile>
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lzio.c">
+    <ClCompile Include="lzio.c">
      <Filter>src</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lapi.h">
+    <ClInclude Include="lapi.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lauxlib.h">
+    <ClInclude Include="lauxlib.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcode.h">
+    <ClInclude Include="lcode.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lctype.h">
+    <ClInclude Include="lctype.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldebug.h">
+    <ClInclude Include="ldebug.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldo.h">
+    <ClInclude Include="ldo.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lfunc.h">
+    <ClInclude Include="lfunc.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lgc.h">
+    <ClInclude Include="lgc.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llex.h">
+    <ClInclude Include="llex.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llimits.h">
+    <ClInclude Include="llimits.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmem.h">
+    <ClInclude Include="lmem.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lobject.h">
+    <ClInclude Include="lobject.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lopcodes.h">
+    <ClInclude Include="lopcodes.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lparser.h">
+    <ClInclude Include="lparser.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lprefix.h">
+    <ClInclude Include="lprefix.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstate.h">
+    <ClInclude Include="lstate.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstring.h">
+    <ClInclude Include="lstring.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltable.h">
+    <ClInclude Include="ltable.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltm.h">
+    <ClInclude Include="ltm.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lua.h">
+    <ClInclude Include="lua.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lua.hpp">
+    <ClInclude Include="lua.hpp">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\luaconf.h">
+    <ClInclude Include="luaconf.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lualib.h">
+    <ClInclude Include="lualib.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lundump.h">
+    <ClInclude Include="lundump.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lvm.h">
+    <ClInclude Include="lvm.h">
      <Filter>src</Filter>
    </ClInclude>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lzio.h">
+    <ClInclude Include="lzio.h">
      <Filter>src</Filter>
    </ClInclude>
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/win-build/Yuescript/Yuescript.vcxproj b/win-build/Yuescript/Yuescript.vcxproj
index d073e70..9b05567 100644
--- a/win-build/Yuescript/Yuescript.vcxproj
+++ b/win-build/Yuescript/Yuescript.vcxproj
@@ -176,11 +176,11 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=0;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -191,11 +191,11 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -206,30 +206,32 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=0;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalOptions>/STACK:2097152 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug53|x64'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalOptions>/STACK:2097152 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -238,11 +240,11 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -257,11 +259,11 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -276,17 +278,18 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalOptions>/STACK:2097152 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release53|x64'">
@@ -295,20 +298,22 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\..\src;..\..\src\3rdParty;..\..\src\3rdParty\lua;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /utf-8 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalOptions>/STACK:2097152 %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
+    <ClCompile Include="..\..\src\3rdParty\colib\ljson.c" />
    <ClCompile Include="..\..\src\3rdParty\lua\lapi.c" />
    <ClCompile Include="..\..\src\3rdParty\lua\lauxlib.c" />
    <ClCompile Include="..\..\src\3rdParty\lua\lbaselib.c" />
diff --git a/win-build/Yuescript/Yuescript.vcxproj.filters b/win-build/Yuescript/Yuescript.vcxproj.filters
index 122f0b6..73efba3 100644
--- a/win-build/Yuescript/Yuescript.vcxproj.filters
+++ b/win-build/Yuescript/Yuescript.vcxproj.filters
@@ -17,6 +17,9 @@
    <Filter Include="src\efsw\win">
      <UniqueIdentifier>{4b765224-203c-4df9-ba95-c975f75c4cf1}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\colib">
+      <UniqueIdentifier>{0f5875b7-722d-4903-8299-eeb462a34086}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\src\3rdParty\lua\lapi.c">
@@ -205,6 +208,9 @@
    <ClCompile Include="..\..\src\yuescript\yue_ast.cpp">
      <Filter>src\yuescript</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\3rdParty\colib\ljson.c">
+      <Filter>src\colib</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\src\3rdParty\lua\lapi.h">
diff --git a/win-build/YuescriptDLL/YuescriptDLL.vcxproj b/win-build/YuescriptDLL/YuescriptDLL.vcxproj
index b418163..1544c3c 100644
--- a/win-build/YuescriptDLL/YuescriptDLL.vcxproj
+++ b/win-build/YuescriptDLL/YuescriptDLL.vcxproj
@@ -176,9 +176,9 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;UTF_CPP_CPLUSPLUS=202002L;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua51;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -194,9 +194,9 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;UTF_CPP_CPLUSPLUS=202002L;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua53;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -214,9 +214,9 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;UTF_CPP_CPLUSPLUS=202002L;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua51;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -236,9 +236,9 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;UTF_CPP_CPLUSPLUS=202002L;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua53;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -256,9 +256,9 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua51;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -274,9 +274,9 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;UTF_CPP_CPLUSPLUS=202002L;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua53;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -294,9 +294,9 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;UTF_CPP_CPLUSPLUS=202002L;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua51;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -316,9 +316,9 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;YUE_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;UTF_CPP_CPLUSPLUS=202002L;YUE_BUILD_AS_DLL;YUE_UTF8_IMPL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>..\lua53;..\..\src;..\..\src\3rdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -352,4 +352,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>