84 files changed, 10518 insertions, 1847 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/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)
-
-if (APPLE)
-        add_compile_options(-Wno-deprecated-declarations)
-endif ()
+add_definitions(-std=c++17 -O3 -fPIC -DYUE_UTF8_IMPL)
+
+# Detect Android Termux environment
+# Termux typically has ANDROID_ROOT environment variable set and PREFIX points to Termux directory
+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
-        src/3rdParty/efsw/Debug.cpp
-        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)
+# Add efsw sources only if not in Termux environment
+if (NOT IS_TERMUX)
         target_sources(yue PRIVATE
-                src/3rdParty/efsw/FileWatcherFSEvents.cpp
-                src/3rdParty/efsw/FileWatcherKqueue.cpp
-                src/3rdParty/efsw/WatcherFSEvents.cpp
-                src/3rdParty/efsw/WatcherKqueue.cpp
+                src/3rdParty/efsw/Debug.cpp
+                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 (NOT CMAKE_SYSTEM_VERSION GREATER 9)
-                target_compile_definitions(yue PRIVATE EFSW_FSEVENTS_NOT_SUPPORTED)
+        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()
-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)
+        if (APPLE)
+                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")
-        target_sources(yue PRIVATE
-                src/3rdParty/efsw/FileWatcherKqueue.cpp
-                src/3rdParty/efsw/WatcherKqueue.cpp
-        )
+else()
+        message(STATUS "Termux environment detected: excluding efsw file watcher sources")
 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="childL" ref='yueEditor' style="height: 30em;">
-                                        <ClientOnly>
-                                                <prism-editor class="my-editor" v-model="code" :highlight="highlighterYue" @input="codeChanged($event)" line-numbers :readonly="readonly"></prism-editor>
-                                        </ClientOnly>
-                                </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 class="editor-container">
+                                                <ClientOnly>
+                                                        <prism-editor class="my-editor" v-model="compiled" :highlight="highlighterLua" @input="codeChanged($event)" :line-numbers="isMobileLayout" readonly></prism-editor>
+                                                </ClientOnly>
+                                        </div>
                                 </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;
-                width: 50%;
-                box-sizing: border-box;
-                background-clip: content-box;
-                background: #f5f7ff;
+
+        .parent {
+                display: flex;
+                flex-wrap: wrap;
+                width: 100%;
         }
-        .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 0853391..5308ebc 100755
--- a/doc/docs/doc/README.md
+++ b/doc/docs/doc/README.md
@@ -16,17 +16,17 @@ 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"
-    * "shield"
+    - "sword"
+    - "shield"
   items:
-    * name: "potion"
+    - name: "potion"
       count: 10
-    * name: "bread"
+    - name: "bread"
       count: 3
 
 -- list comprehension
@@ -61,17 +61,17 @@ export 🌛 = "月之脚本"
 <YueDisplay>
 <pre>
 -- import syntax
-import "yue" as :p, :to_lua
+import p, to_lua from "yue"
 
 -- object literals
 inventory =
   equipment:
-    * "sword"
-    * "shield"
+    - "sword"
+    - "shield"
   items:
-    * name: "potion"
+    - name: "potion"
       count: 10
-    * name: "bread"
+    - name: "bread"
       count: 3
 
 -- list comprehension
@@ -408,16 +408,16 @@ In YueScript, macro functions allow you to generate code at compile time. By nes
 
 ```moonscript
 macro Enum = (...) ->
-        items = {...}
-        itemSet = {item, true for item in *items}
-        (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+  items = {...}
+  itemSet = {item, true for item in *items}
+  (item) ->
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    "\"#{item}\""
 
 macro BodyType = $Enum(
-        Static
-        Dynamic
-        Kinematic
+  Static
+  Dynamic
+  Kinematic
 )
 
 print "Valid enum type:", $BodyType Static
@@ -427,16 +427,16 @@ print "Valid enum type:", $BodyType Static
 <YueDisplay>
 <pre>
 macro Enum = (...) ->
-        items = {...}
-        itemSet = {item, true for item in *items}
-        (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+  items = {...}
+  itemSet = {item, true for item in *items}
+  (item) ->
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    "\"#{item}\""
 
 macro BodyType = $Enum(
-        Static
-        Dynamic
-        Kinematic
+  Static
+  Dynamic
+  Kinematic
 )
 
 print "Valid enum type:", $BodyType Static
@@ -444,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.
@@ -486,47 +534,47 @@ Note the evaluation behavior of chained comparisons:
 
 ```moonscript
 v = (x) ->
-        print x
-        x
+  print x
+  x
 
 print v(1) < v(2) <= v(3)
 --[[
-        output:
-        2
-        1
-        3
-        true
+  output:
+  2
+  1
+  3
+  true
 ]]
 
 print v(1) > v(2) <= v(3)
 --[[
-        output:
-        2
-        1
-        false
+  output:
+  2
+  1
+  false
 ]]
 ```
 <YueDisplay>
 <pre>
 v = (x) ->
-        print x
-        x
+  print x
+  x
 
 print v(1) < v(2) <= v(3)
 --[[
-        output:
-        2
-        1
-        3
-        true
+  output:
+  2
+  1
+  3
+  true
 ]]
 
 print v(1) > v(2) <= v(3)
 --[[
-        output:
-        2
-        1
-        false
+  output:
+  2
+  1
+  false
 ]]
 </pre>
 </YueDisplay>
@@ -547,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"
-        * "knees"
+  * "shoulders"
+  * "knees"
 lyrics =
-        * "head"
-        * ...parts
-        * "and"
-        * "toes"
+  * "head"
+  * ...parts
+  * "and"
+  * "toes"
 
 copy = {...other}
 
@@ -570,13 +635,13 @@ merge = {...a, ...b}
 <YueDisplay>
 <pre>
 parts =
-        * "shoulders"
-        * "knees"
+  * "shoulders"
+  * "knees"
 lyrics =
-        * "head"
-        * ...parts
-        * "and"
-        * "toes"
+  * "head"
+  * ...parts
+  * "and"
+  * "toes"
 
 copy = {...other}
 
@@ -586,6 +651,23 @@ 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.
@@ -752,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"
-    * "b"
-    * "c"
+    - "a"
+    - "b"
+    - "c"
 
   objects:
-    * name: "a"
+    - name: "a"
       value: 1
       func: => @value + 1
       tb:
         fieldA: 1
 
-    * name: "b"
+    - name: "b"
       value: 2
       func: => @value + 2
       tb: { }
@@ -787,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"
-    * "b"
-    * "c"
+    - "a"
+    - "b"
+    - "c"
 
   objects:
-    * name: "a"
+    - name: "a"
       value: 1
       func: => @value + 1
       tb:
         fieldA: 1
 
-    * name: "b"
+    - name: "b"
       value: 2
       func: => @value + 2
       tb: { }
@@ -1222,7 +1325,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
@@ -1266,6 +1369,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:
@@ -1495,6 +1644,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.
@@ -1575,6 +1765,66 @@ binary = 0B10011
 <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>
 
@@ -1895,6 +2145,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.
@@ -2149,6 +2531,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:
@@ -2282,6 +2685,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:
@@ -2396,7 +2838,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
 
@@ -2675,28 +3117,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
+switch name := "Dan"
   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
+switch name := "Dan"
   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>
 
@@ -2727,7 +3167,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)
@@ -2773,7 +3213,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
 
@@ -2929,6 +3369,27 @@ switch tb
 </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.
@@ -3060,7 +3521,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.
 
@@ -3147,13 +3608,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:
 
@@ -3226,7 +3687,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
@@ -3241,7 +3702,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
@@ -3507,19 +3968,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
@@ -3542,6 +4003,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
 
@@ -3562,7 +4035,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
@@ -3688,7 +4161,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.
 
@@ -3804,9 +4277,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,
-                --[[error]] string | nil,
-                --[[globals]] {{string, integer, integer}} | nil
+    --[[codes]] string | nil,
+    --[[error]] string | nil,
+    --[[globals]] {{string, integer, integer}} | nil
 ```
 
 **Parameters:**
@@ -3929,8 +4402,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...),
-                --[[error]] string | nil
+    --[[loaded function]] nil | function(...: any): (any...),
+    --[[error]] string | nil
 ```
 
 **Parameters:**
@@ -3960,8 +4433,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...),
-                --[[error]] string | nil
+    --[[loaded function]] nil | function(...: any): (any...),
+    --[[error]] string | nil
 ```
 
 **Parameters:**
@@ -3990,8 +4463,8 @@ Loads YueScript code from a string into a function.
 **Signature:**
 ```lua
 loadstring: function(input: string, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[loaded function]] nil | function(...: any): (any...),
+    --[[error]] string | nil
 ```
 
 **Parameters:**
@@ -4019,8 +4492,8 @@ Loads YueScript code from a file into a function.
 **Signature:**
 ```lua
 loadfile: function(filename: string, env: table, config?: Config):
-                nil | function(...: any): (any...),
-                string | nil
+    nil | function(...: any): (any...),
+    string | nil
 ```
 
 **Parameters:**
@@ -4049,8 +4522,8 @@ Loads YueScript code from a file into a function.
 **Signature:**
 ```lua
 loadfile: function(filename: string, config?: Config):
-                nil | function(...: any): (any...),
-                string | nil
+    nil | function(...: any): (any...),
+    string | nil
 ```
 
 **Parameters:**
@@ -4305,9 +4778,9 @@ Converts the code to the AST.
 
 **Signature:**
 ```lua
-to_ast: function(code: string, flattenLevel?: number, astName?: string):
-                --[[AST]] AST | nil,
-                --[[error]] nil | string
+to_ast: function(code: string, flattenLevel?: number, astName?: string, reserveComment?: boolean):
+    --[[AST]] AST | nil,
+    --[[error]] nil | string
 ```
 
 **Parameters:**
@@ -4317,6 +4790,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:**
 
@@ -4325,6 +4799,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.
@@ -4396,6 +4897,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.
@@ -4446,11 +4960,11 @@ The target Lua version enumeration.
 **Signature:**
 ```lua
 enum LuaTarget
-        "5.1"
-        "5.2"
-        "5.3"
-        "5.4"
-        "5.5"
+  "5.1"
+  "5.2"
+  "5.3"
+  "5.4"
+  "5.5"
 end
 ```
 
@@ -4527,7 +5041,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 2968f6e..de5dff1 100755
--- a/doc/docs/zh/doc/README.md
+++ b/doc/docs/zh/doc/README.md
@@ -9,24 +9,24 @@ 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"
-    * "shield"
+    - "sword"
+    - "shield"
   items:
-    * name: "potion"
+    - name: "potion"
       count: 10
-    * name: "bread"
+    - name: "bread"
       count: 3
 
 -- 列表推导
@@ -61,17 +61,17 @@ export 🌛 = "月之脚本"
 <YueDisplay>
 <pre>
 -- 导入语法
-import "yue" as :p, :to_lua
+import p, to_lua from "yue"
 
 -- ��对象
 inventory =
   equipment:
-    * "sword"
-    * "shield"
+    - "sword"
+    - "shield"
   items:
-    * name: "potion"
+    - name: "potion"
       count: 10
-    * name: "bread"
+    - name: "bread"
       count: 3
 
 -- 列表推导
@@ -109,7 +109,7 @@ export 🌛 = "月之脚本"
 
 * **Lua 模�**
 
-&emsp;安装 [luarocks](https://luarocks.org)，一个Lua模�的包管�器。然�作为Lua模�和�执行文件安装它：
+&emsp;安装 [luarocks](https://luarocks.org)，一个 Lua 模�的包管�器。然�作为 Lua 模�和�执行文件安装它：
 
 ```
 > luarocks install yuescript
@@ -150,14 +150,14 @@ export 🌛 = "月之脚本"
 
 ### Lua 模�
 
-在Lua中使用月之脚本模�：
+在 Lua 中使用月之脚本模�：
 
 * **用法 1**
-在Lua中引入 "你的脚本入�文件.yue"。
+在 Lua 中引入 "你的脚本入�文件.yue"。
 ```Lua
 require("yue")("你的脚本入�文件")
 ```
-当你在�一路径下把 "你的脚本入�文件.yue" 编译�了 "你的脚本入�文件.lua" 时，�然�以使用这个代�加载 .lua 代�文件。在其余的月之脚本文件中，�需正常使用 **require** 或 **import**进行脚本引用��。错误消�中的代�行�也会被正确处�。
+当你在�一路径下把 "你的脚本入�文件.yue" 编译�了 "你的脚本入�文件.lua" 时，�然�以使用这个代�加载 .lua 代�文件。在其余的月之脚本文件中，�需正常使用 **require** 或 **import** 进行脚本引用��。错误消�中的代�行�也会被正确处�。
 
 * **用法 2**
 手动引入月之脚本模�并�写错误消��帮助调试。
@@ -172,7 +172,7 @@ end)
 ```
 
 * **用法 3**
-在Lua中使用月之脚本编译器功能。
+在 Lua 中使用月之脚本编译器功能。
 ```lua
 local yue = require("yue")
 local codes, err, globals = yue.to_lua([[
@@ -222,12 +222,12 @@ f!
    �添加任何选项执行命令�以进入REPL模�，
    在�行输入符� '$' 并�行�，�以开始或是�止多行输入模�
 ```
-&emsp;&emsp;使用案例：
-&emsp;&emsp;递归编译当�路径下扩展�为 **.yue** 的�个月之脚本文件： **yue .**
-&emsp;&emsp;编译并将结果�存到目标路径： **yue -t /target/path/ .**
-&emsp;&emsp;编译并�留调试信�： **yue -l .**
-&emsp;&emsp;编译并生�压缩代�： **yue -m .**
-&emsp;&emsp;直接执行代�： **yue -e 'print 123'**
+&emsp;&emsp;使用案例：  
+&emsp;&emsp;递归编译当�路径下扩展�为 **.yue** 的�个月之脚本文件： **yue .**  
+&emsp;&emsp;编译并将结果�存到目标路径： **yue -t /target/path/ .**  
+&emsp;&emsp;编译并�留调试信�： **yue -l .**  
+&emsp;&emsp;编译并生�压缩代�： **yue -m .**  
+&emsp;&emsp;直接执行代�： **yue -e 'print 123'**  
 &emsp;&emsp;执行一个月之脚本文件： **yue -e main.yue**
 
 ## �
@@ -407,16 +407,16 @@ print $LINE -- 获�当�代�行数：2
 
 ```moonscript
 macro Enum = (...) ->
-        items = {...}
-        itemSet = {item, true for item in *items}
-        (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+  items = {...}
+  itemSet = {item, true for item in *items}
+  (item) ->
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    "\"#{item}\""
 
 macro BodyType = $Enum(
-        Static
-        Dynamic
-        Kinematic
+  Static
+  Dynamic
+  Kinematic
 )
 
 print "有效的枚举类型:", $BodyType Static
@@ -425,16 +425,16 @@ print "有效的枚举类型:", $BodyType Static
 <YueDisplay>
 <pre>
 macro Enum = (...) ->
-        items = {...}
-        itemSet = {item, true for item in *items}
-        (item) ->
-                error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
-                "\"#{item}\""
+  items = {...}
+  itemSet = {item, true for item in *items}
+  (item) ->
+    error "got \"#{item}\", expecting one of #{table.concat items, ', '}" unless itemSet[item]
+    "\"#{item}\""
 
 macro BodyType = $Enum(
-        Static
-        Dynamic
-        Kinematic
+  Static
+  Dynamic
+  Kinematic
 )
 
 print "有效的枚举类型:", $BodyType Static
@@ -442,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
@@ -484,56 +532,56 @@ print 1 <= a <= 10
 
 ```moonscript
 v = (x) ->
-        print x
-        x
+  print x
+  x
 
 print v(1) < v(2) <= v(3)
 --[[
-        输出：
-        2
-        1
-        3
-        true
+  输出：
+  2
+  1
+  3
+  true
 ]]
 
 print v(1) > v(2) <= v(3)
 --[[
-        输出：
-        2
-        1
-        false
+  输出：
+  2
+  1
+  false
 ]]
 ```
 <YueDisplay>
 <pre>
 v = (x) ->
-        print x
-        x
+  print x
+  x
 
 print v(1) < v(2) <= v(3)
 --[[
-        输出：
-        2
-        1
-        3
-        true
+  输出：
+  2
+  1
+  3
+  true
 ]]
 
 print v(1) > v(2) <= v(3)
 --[[
-        输出：
-        2
-        1
-        false
+  输出：
+  2
+  1
+  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 = []
@@ -546,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"
-        * "knees"
+  * "shoulders"
+  * "knees"
 lyrics =
-        * "head"
-        * ...parts
-        * "and"
-        * "toes"
+  * "head"
+  * ...parts
+  * "and"
+  * "toes"
 
 copy = {...other}
 
@@ -569,13 +634,13 @@ merge = {...a, ...b}
 <YueDisplay>
 <pre>
 parts =
-        * "shoulders"
-        * "knees"
+  * "shoulders"
+  * "knees"
 lyrics =
-        * "head"
-        * ...parts
-        * "and"
-        * "toes"
+  * "head"
+  * ...parts
+  * "and"
+  * "toes"
 
 copy = {...other}
 
@@ -585,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 = {}
@@ -732,7 +814,7 @@ readFile "example.txt"
 
 ### 空值�并
 
-如果其左�作数�是**nil**，则nil�并�算符 **??** 返回其左�作数的值；�则，它将计算��作数并返回其结果。如果左�作数计算结果为�nil的值，**??** �算符将��计算其��作数。
+如果其左�作数�是 **nil**，则nil�并�算符 **??** 返回其左�作数的值；�则，它将计算��作数并返回其结果。如果左�作数计算结果为� nil 的值，**??** �算符将��计算其��作数。
 ```moonscript
 local a, b, c, d
 a = b ?? c ?? d
@@ -751,67 +833,87 @@ a ??= false
 
 ### ��对象
 
-你�以在表格�内使用符� **\*** 开始编写一系列��结构。如果你正在创建��对象，对象的字段必须具有相�的缩进。
+你�以在表格�内使用符� **\*** 或是 **-** 开始编写一系列��结构。如果你正在创建��对象，对象的字段必须具有相�的缩进。
+
 ```moonscript
+-- 赋值时使用��对象
 list =
   * 1
   * 2
   * 3
 
+-- 函数调用时使用��对象
 func
   * 1
   * 2
   * 3
 
+-- 返回时使用��对象
+f = ->
+  return
+    * 1
+    * 2
+    * 3
+
+-- 表格时使用��对象
 tb =
   name: "abc"
 
   values:
-    * "a"
-    * "b"
-    * "c"
+    - "a"
+    - "b"
+    - "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"
-    * "b"
-    * "c"
+    - "a"
+    - "b"
+    - "c"
 
   objects:
-    * name: "a"
+    - name: "a"
       value: 1
       func: => @value + 1
       tb:
         fieldA: 1
 
-    * name: "b"
+    - name: "b"
       value: 2
       func: => @value + 2
       tb: { }
@@ -991,7 +1093,7 @@ export default ->
 
 ## 赋值
 
-月之脚本中定义的��是动�类型的，并默认为局部��。但你�以通过**local**和**global**声明�改�声明��的作用范围。
+月之脚本中定义的��是动�类型的，并默认为局部��。但你�以通过 **local** 和 **global** 声明�改�声明��的作用范围。
 
 ```moonscript
 hello = "world"
@@ -1120,9 +1222,9 @@ do
 
 ## 解构赋值
 
-解构赋值是一�快速从Lua表中按�称或基于数组中的�置��值的方法。
+解构赋值是一�快速从 Lua 表中按�称或基于数组中的�置��值的方法。
 
-通常当你看到一个字��的Lua表，比如{1,2,3}，它�于赋值的�侧，因为它是一个值。解构赋值语�的写法就是交�了字��Lua表的角色，并将其放在赋值语�的左侧。
+通常当你看到一个字��的 Lua 表，比如 `{1,2,3}`，它�于赋值的�侧，因为它是一个值。解构赋值语�的写法就是交�了字�� Lua 表的角色，并将其放在赋值语�的左侧。
 
 最好是通过示例�解释。以下是如何从表格中解包�两个值的方法：
 
@@ -1221,7 +1323,7 @@ print first, second, color
 </pre>
 </YueDisplay>
 
-有时候我们会需�从Lua表中��值并将它们赋给与键��的局部��。为了��编写��代�，我们�以使用 **:** �缀�作符：
+有时候我们会需�从 Lua 表中��值并将它们赋给与键��的局部��。为了��编写��代�，我们�以使用 **:** �缀�作符：
 
 ```moonscript
 {:concat, :insert} = table
@@ -1265,9 +1367,55 @@ print first, second, color
 </pre>
 </YueDisplay>
 
-### 在其它地方的解构
+### 范围解构
+
+你�以使用展开�算符 `...` 在列表解构中��获一个范围的值到�列表中。这在当你想�从列表的开头和结尾��特定元素，�时收集中间的元素时�常有用。
+
+```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>
 
-解构也�以出现在其它��进行赋值的地方。一个例�是用在for循环：
+展开�算符�以用在��的�置��获��的范围，并且你�以使用 `_` 作为��符�表示你想跳过对应范围的�获：
+
+```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 = [
@@ -1290,7 +1438,7 @@ for [left, right] in *tuples
 </pre>
 </YueDisplay>
 
-我们知�数组表中的�个元素都是一个两项的元组，所以我们�以直接在for语�的�称��中使用解构�解包它。
+我们知�数组表中的�个元素都是一个两项的元组，所以我们�以直接在 for 语�的�称��中使用解构�解包它。
 
 ## If 赋值
 
@@ -1358,7 +1506,7 @@ while byte := stream\read_one!
 
 ## ���数赋值
 
-你�以将函数返回的结果赋值给一个���数符� `...`。然�使用Lua的方�访问其内容。
+你�以将函数返回的结果赋值给一个���数符� `...`。然�使用 Lua 的方�访问其内容。
 ```moonscript
 list = [1, 2, 3, 4, 5]
 fn = (ok) -> ok, table.unpack list
@@ -1435,7 +1583,7 @@ func --[[端�]] 3000, --[[ip]] "192.168.1.1"
 
 ## 错误处�
 
-用于统一进行Lua错误处�的便�语法。
+用于统一进行 Lua 错误处�的便�语法。
 
 ```moonscript
 try
@@ -1494,9 +1642,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
@@ -1537,9 +1726,9 @@ global const Constant = 123
 
 ## 字��
 
-Lua中的所有基本字��都�以在月之脚本中使用。包括数字�字符串�布尔值和**nil**。
+Lua 中的所有基本字��都�以在月之脚本中使用。包括数字�字符串�布尔值和 **nil**。
 
-但与Lua��的是，�引�和�引�字符串内部�许有�行：
+但与 Lua ��的是，�引�和�引�字符串内部�许有�行：
 
 ```moonscript
 some_string = "这是一个字符串
@@ -1574,6 +1763,66 @@ binary = 0B10011
 <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>
 
@@ -1678,7 +1927,7 @@ print "数字的和是", sum 10, 20
 </pre>
 </YueDisplay>
 
-如果你需��显�返回，�以使用return关键字：
+如果你需��显�返回，�以使用 return 关键字：
 
 ```moonscript
 sum = (x, y) -> return x + y
@@ -1704,7 +1953,7 @@ a, b = mystery 10, 20
 
 ### 粗箭头
 
-因为在Lua中调用方法时，�常习惯将对象作为第一个�数传入，所以月之脚本�供了一�特殊的语法�创建自动包�self�数的函数。
+因为在 Lua 中调用方法时，�常习惯将对象作为第一个�数传入，所以月之脚本�供了一�特殊的语法�创建自动包� self �数的函数。
 
 ```moonscript
 func = (num) => @value + num
@@ -1717,7 +1966,7 @@ func = (num) => @value + num
 
 ### �数默认值
 
-�以为函数的�数�供默认值。如果�数的值为nil，则确定该�数为空。任何具有默认值的nil�数在函数体�行之�都会被替�。
+�以为函数的�数�供默认值。如果�数的值为 nil，则确定该�数为空。任何具有默认值的 nil �数在函数体�行之�都会被替�。
 
 ```moonscript
 my_function = (name = "�物", height = 100) ->
@@ -1789,7 +2038,7 @@ my_func 5, 6, 7,
 </pre>
 </YueDisplay>
 
-因为Lua表也使用逗�作为分隔符，这�缩进语法有助于让值�为�数列表的一部分，而�是Lua表的一部分。
+因为 Lua 表也使用逗�作为分隔符，这�缩进语法有助于让值�为�数列表的一部分，而�是 Lua 表的一部分。
 
 ```moonscript
 x = [
@@ -1856,6 +2105,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>
+
 ## ��回调
 
 ��回调用于�少函数回调的嵌套。它们使用指�左侧的箭头，并且默认会被定义为传入�续函数调用的最�一个�数。它的语法大部分与常规箭头函数相�，�是它指��一方�，并且�续的函数体�需�进行缩进。
@@ -1920,7 +2301,7 @@ print result, msg
 
 ## 表格字��
 
-和Lua一样，表格�以通过花括�进行定义。
+和 Lua 一样，表格�以通过花括�进行定义。
 
 ```moonscript
 some_values = [1, 2, 3, 4]
@@ -2003,7 +2384,7 @@ y = type: "ç‹—", legs: 4, tails: 1
 </pre>
 </YueDisplay>
 
-表格字��的键�以使用Lua语言的关键字，而无需转义：
+表格字��的键�以使用 Lua 语言的关键字，而无需转义：
 
 ```moonscript
 tbl = {
@@ -2039,7 +2420,7 @@ print_table :hair, :height
 </pre>
 </YueDisplay>
 
-如果你希望表中字段的键是�个表达�的结果，那么�以用 **[ ]** 包裹它，就�在Lua中一样。如果键中有任何特殊字符，也�以直接使用字符串字��作为键，�略方括�。
+如果你希望表中字段的键是�个表达�的结果，那么�以用 **[ ]** 包裹它，就�在 Lua 中一样。如果键中有任何特殊字符，也�以直接使用字符串字��作为键，�略方括�。
 
 ```moonscript
 t = {
@@ -2056,7 +2437,7 @@ t = {
 </pre>
 </YueDisplay>
 
-Lua的表�时具有数组部分和哈希部分，但有时候你会希望在书写Lua表时，对Lua表�数组和哈希��用法的语义区分。然�你�以用 **[ ]** 而�是 **{ }** �编写表示数组的 Lua 表，并且��许在数组 Lua 表中写入任何键值对。
+Lua 的表�时具有数组部分和哈希部分，但有时候你会希望在书写 Lua 表时，对 Lua 表�数组和哈希��用法的语义区分。然�你�以用 **[ ]** 而�是 **{ }** �编写表示数组的 Lua 表，并且��许在数组 Lua 表中写入任何键值对。
 
 ```moonscript
 some_values = [ 1, 2, 3, 4 ]
@@ -2071,11 +2452,11 @@ list_with_one_element = [ 1, ]
 
 ## 推导�
 
-推导�为我们�供了一�便�的语法，通过�历现有对象并对其值应用表达��构造出新的表格。月之脚本有两�推导�：列表推导�和表格推导�。它们最终都是产生Lua表格；列表推导�将值累积到类似数组的表格中，而表格推导��许你在�次�历时设置新表格的键和值。
+推导�为我们�供了一�便�的语法，通过�历现有对象并对其值应用表达��构造出新的表格。月之脚本有两�推导�：列表推导�和表格推导�。它们最终都是产生 Lua 表格；列表推导�将值累积到类似数组的表格中，而表格推导��许你在�次�历时设置新表格的键和值。
 
 ### 列表推导�
 
-以下�作创建了一个items表的副本，但所有包�的值都翻�了。
+以下�作创建了一个 items 表的副本，但所有包�的值都翻�了。
 
 ```moonscript
 items = [1, 2, 3, 4]
@@ -2088,7 +2469,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]
@@ -2099,7 +2480,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]
@@ -2110,9 +2491,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]
@@ -2131,7 +2533,7 @@ for y in *y_coords]
 </pre>
 </YueDisplay>
 
-在推导�中也�以使用简�的数值for循环：
+在推导�中也�以使用简�的数值 for 循环：
 
 ```moonscript
 evens = [i for i = 1, 100 when i % 2 == 0]
@@ -2146,7 +2548,7 @@ evens = [i for i = 1, 100 when i % 2 == 0]
 
 表格推导�和列表推导�的语法�常相似，�是�使用 **{** 和 **}** 并从�次迭代中�两个值。
 
-以下示例生�了表格thing的副本：
+以下示例生�了表格 thing 的副本：
 
 ```moonscript
 thing = {
@@ -2208,9 +2610,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]]
@@ -2232,7 +2634,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]]
@@ -2244,9 +2646,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
@@ -2299,7 +2740,7 @@ for j = 1, 10, 3 do print j
 </pre>
 </YueDisplay>
 
-for循环也�以用作表达�。for循环主体中的最�一�语�会被强制转�为一个返回值的表达�，并会将表达�计算结果的值追加到一个作为结果的数组表中。
+for 循环也�以用作表达�。for 循环主体中的最�一�语�会被强制转�为一个返回值的表达�，并会将表达�计算结果的值追加到一个作为结果的数组表中。
 
 将�个�数加�：
 
@@ -2320,9 +2761,9 @@ doubled_evens = for i = 1, 20
 </pre>
 </YueDisplay>
 
-此外，for循环还支�带返回值的break语�，这样循环本身就�以作为一个表达�，在满足�件时��退出并返回有�义的结果。
+此外，for 循环还支�带返回值的 break 语�，这样循环本身就�以作为一个表达�，在满足�件时��退出并返回有�义的结果。
 
-例如，查找第一个大于10的数字：
+例如，查找第一个大于 10 的数字：
 
 ```moonscript
 first_large = for n in *numbers
@@ -2335,9 +2776,9 @@ first_large = for n in *numbers
 </pre>
 </YueDisplay>
 
-你还�以结�for循环表达�与continue语��过滤值。
+你还�以结� for 循环表达�与 continue 语��过滤值。
 
-注�出现在函数体末尾的for循环，�会被当作是一个表达�并将循环结果累积到一个列表中作为返回值（相�，函数将返回nil）。如果�函数末尾的循环转�为列表表达�，�以显�地使用返回语�加for循环表达�。
+注�出现在函数体末尾的 for 循环，�会被当作是一个表达�并将循环结果累积到一个列表中作为返回值（相�，函数将返回 nil）。如果�函数末尾的循环转�为列表表达�，�以显�地使用返回语�加 for 循环表达�。
 
 ```moonscript
 func_a = -> for i = 1, 10 do print i
@@ -2360,7 +2801,7 @@ print func_b! -- 打� table 对象
 
 ## repeat 循环
 
-repeat循环是从Lua语言中�过�的相似语法：
+repeat 循环是从 Lua 语言中�过�的相似语法：
 
 ```moonscript
 i = 10
@@ -2381,7 +2822,7 @@ until i == 0
 
 ## while 循环
 
-在月之脚本中的while循环有四�写法：
+在月之脚本中的 while 循环有四�写法：
 
 ```moonscript
 i = 10
@@ -2420,7 +2861,7 @@ until running == false do my_function!
 </pre>
 </YueDisplay>
 
-�for循环的语法一样，while循环也�以作为一个表达�使用。为了使函数返回while循环的累积列表值，必须明确使用返回语�返回while循环表达�。
+� for 循环的语法一样，while 循环也�以作为一个表达�使用。为了使函数返回 while 循环的累积列表值，必须明确使用返回语�返回 while 循环表达�。
 
 ## 继续
 
@@ -2538,13 +2979,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 "今天�是星期一�"
@@ -2596,7 +3038,7 @@ print "你很幸�!" unless math.random! > 0.1
 
 ## 代�行修饰符
 
-为了方便编写代�，循环语�和if语��以应用于�行代�语�的末尾：
+为了方便编写代�，循环语�和 if 语��以应用于�行代�语�的末尾：
 
 ```moonscript
 print "你好，世界" if name == "Rob"
@@ -2607,7 +3049,7 @@ print "你好，世界" if name == "Rob"
 </pre>
 </YueDisplay>
 
-修饰for循环的示例：
+修饰 for 循环的示例：
 
 ```moonscript
 print "项目: ", item for item in *items
@@ -2618,7 +3060,7 @@ print "项目: ", item for item in *items
 </pre>
 </YueDisplay>
 
-修饰while循环的示例：
+修饰 while 循环的示例：
 
 ```moonscript
 game\update! while game\isRunning!
@@ -2635,34 +3077,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
+switch name := "Dan"
   when "Robert"
     print "你是Robert"
   when "Dan", "Daniel"
     print "你的�字是Dan"
   else
-    print "我�知�你的�字"
+    print "我�认识你，你的�字是#{name}"
 ```
 <YueDisplay>
 <pre>
-name = "Dan"
-switch name
+switch name := "Dan"
   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
@@ -2687,7 +3127,7 @@ next_number = switch b
 </pre>
 </YueDisplay>
 
-我们�以使用then关键字在when��的�一行上编写处�代�。else代��的�续代�中�写在�一行上�需��外的关键字。
+我们�以使用 then 关键字在 when ��的�一行上编写处�代�。else 代��的�续代�中�写在�一行上�需��外的关键字。
 
 ```moonscript
 msg = switch math.random(1, 5)
@@ -2704,7 +3144,7 @@ msg = switch math.random(1, 5)
 </pre>
 </YueDisplay>
 
-如果在编写switch语�时希望少写一个缩进，那么你�以把第一个when��放在switch开始语�的第一行，然��续的�语�就都�以都少写一个缩进。
+如果在编写 switch 语�时希望少写一个缩进，那么你�以把第一个 when ��放在 switch 开始语�的第一行，然��续的�语�就都�以都少写一个缩进。
 
 ```moonscript
 switch math.random(1, 5)
@@ -2733,11 +3173,11 @@ else
 </pre>
 </YueDisplay>
 
-值得注�的是，在生�Lua代�时，我们��检查的目标��会放在==表达�的�侧。当你希望给when��的比较对象定义一个\_\_eq元方法��载判断逻辑时，�能会有用。
+值得注�的是，在生� Lua 代�时，我们��检查的目标��会放在 == 表达�的�侧。当你希望给 when ��的比较对象定义一个 \_\_eq 元方法��载判断逻辑时，�能会有用。
 
 ### 表格匹�
 
-在switch的when��中，如果期待检查目标是一个表格，且�以通过特定的结构进行解构并获得�nil值，那么你�以�试使用表格匹�的语法。
+在 switch 的 when ��中，如果期待检查目标是一个表格，且�以通过特定的结构进行解构并获得� nil 值，那么你�以�试使用表格匹�的语法。
 
 ```moonscript
 items =
@@ -2889,9 +3329,30 @@ switch tb
 </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 代�。
 
 一个简�的类：
 
@@ -2920,11 +3381,11 @@ class Inventory
 </pre>
 </YueDisplay>
 
-在月之脚本中采用��对象的编程方�时，通常会使用类声明语�结�Lua表格字����类定义。这个类的定义包�了它的所有方法和属性。在这�结构中，键�为“new�的�员扮演了一个��的角色，是作为构造函数�使用。
+在月之脚本中采用��对象的编程方�时，通常会使用类声明语�结� Lua 表格字����类定义。这个类的定义包�了它的所有方法和属性。在这�结构中，键�为 “new� 的�员扮演了一个��的角色，是作为构造函数�使用。
 
-值得注�的是，类中的方法都采用了粗箭头函数语法。当在类的实例上调用方法时，该实例会自动作为第一个�数被传入，因此粗箭头函数用于生�一个�为“self�的�数。
+值得注�的是，类中的方法都采用了粗箭头函数语法。当在类的实例上调用方法时，该实例会自动作为第一个�数被传入，因此粗箭头函数用于生�一个�为 “self� 的�数。
 
-此外，“@��缀在���上起到了简化作用，代表“self�。例如，`@items` 就等�于 `self.items`。
+此外，“@� �缀在���上起到了简化作用，代表 “self�。例如，`@items` 就等�于 `self.items`。
 
 为了创建类的一个新实例，�以将类�当作一个函数�调用，这样就�以生�并返回一个新的实例。
 
@@ -2946,7 +3407,7 @@ inv\add_item "pants"
 
 需�特别注�的是，类的所有属性在其实例之间是共享的。这对于函数类型的�员属性通常�会造�问题，但对于其他类型的属性，�能会导致�外的结果。
 
-例如，在下�的示例中，clothes属性在所有实例之间共享。因此，对这个属性在一个实例中的修改，将会影�到其他所有实例。
+例如，在下�的示例中，clothes 属性在所有实例之间共享。因此，对这个属性在一个实例中的修改，将会影�到其他所有实例。
 
 ```moonscript
 class Person
@@ -2998,7 +3459,7 @@ class Person
 
 ### 继承
 
-`extends`关键字�以在类声明中使用，以继承�一个类的属性和方法。
+`extends` 关键字�以在类声明中使用，以继承�一个类的属性和方法。
 
 ```moonscript
 class BackPack extends Inventory
@@ -3018,11 +3479,11 @@ class BackPack extends Inventory
 </YueDisplay>
 
 
-在这一部分，我们对月之脚本中的`Inventory`类进行了扩展，加入了对�以�带物�数�的�制。
+在这一部分，我们对月之脚本中的 `Inventory` 类进行了扩展，加入了对�以�带物�数�的�制。
 
-在这个特定的例�中，�类并没有定义自己的构造函数。因此，当创建一个新的实例时，系统会默认调用父类的构造函数。但如果我们在�类中定义了构造函数，我们�以利用`super`方法�调用并执行父类的构造函数。
+在这个特定的例�中，�类并没有定义自己的构造函数。因此，当创建一个新的实例时，系统会默认调用父类的构造函数。但如果我们在�类中定义了构造函数，我们�以利用 `super` 方法�调用并执行父类的构造函数。
 
-此外，当一个类继承自�一个类时，它会�试调用父类上的`__inherited`方法（如果这个方法存在的�），以此��父类��通知。这个`__inherited`函数接�两个�数：被继承的父类和继承的�类。
+此外，当一个类继承自�一个类时，它会�试调用父类上的 `__inherited` 方法（如果这个方法存在的�），以此��父类��通知。这个 `__inherited` 函数接�两个�数：被继承的父类和继承的�类。
 
 ```moonscript
 class Shelf
@@ -3045,15 +3506,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
@@ -3112,9 +3573,9 @@ print BackPack.size -- 打� 10
 
 如果在类对象的元表中找�到�个属性，系统会从基表中检索该属性。这就�味�我们�以直接从类本身访问到其方法和属性。
 
-需�特别注�的是，对类对象的赋值并�会影�到基表，因此这�是�实例添加新方法的正确方�。相�，需�直接修改基表。关于这点，�以�考下�的“__base�字段。
+需�特别注�的是，对类对象的赋值并�会影�到基表，因此这�是�实例添加新方法的正确方�。相�，需�直接修改基表。关于这点，�以�考下�的 “__base� 字段。
 
-此外，类对象包�几个特殊的属性：当类被声明时，类的�称会作为一个字符串存储在类对象的“__name�字段中。
+此外，类对象包�几个特殊的属性：当类被声明时，类的�称会作为一个字符串存储在类对象的 “__name� 字段中。
 
 ```moonscript
 print BackPack.__name -- 打� Backpack
@@ -3196,7 +3657,7 @@ print Counter.count -- 输出 2
 
 ### 类声明语�
 
-在类声明的主体中，除了键/值对外，我们还�以编写普通的表达�。在这�类声明体中的普通代�的上下文中，self等于类对象，而�是实例对象。
+在类声明的主体中，除了键/值对外，我们还�以编写普通的表达�。在这�类声明体中的普通代�的上下文中，self 等于类对象，而�是实例对象。
 
 以下是创建类��的�一�方法：
 
@@ -3236,9 +3697,9 @@ class MoreThings
 
 ### @ 和 @@ 值
 
-当@和@@�缀在一个�字�时，它们分别代表在self和self.\_\_class中访问的那个�字。
+当 @ 和 @@ �缀在一个�字�时，它们分别代表在 self 和 self.\_\_class 中访问的那个�字。
 
-如果它们�独使用，它们是self和self.\_\_class的别�。
+如果它们�独使用，它们是 self 和 self.\_\_class 的别�。
 
 ```moonscript
 assert @ == self
@@ -3251,7 +3712,7 @@ assert @@ == self.__class
 </pre>
 </YueDisplay>
 
-例如，使用@@从实例方法快速创建�一类的新实例的方法：
+例如，使用 @@ 从实例方法快速创建�一类的新实例的方法：
 
 ```moonscript
 some_instance_method = (...) => @@ ...
@@ -3329,7 +3790,7 @@ x = class Bucket
 
 ### 匿�类
 
-声明类时�以�略�称。如果类的表达��在赋值语�中，\_\_name属性将为nil。如果出现在赋值语�中，赋值�作左侧的�称将代替nil。
+声明类时�以�略�称。如果类的表达��在赋值语�中，\_\_name 属性将为 nil。如果出现在赋值语�中，赋值�作左侧的�称将代替 nil。
 
 ```moonscript
 BigBucket = class extends Bucket
@@ -3400,11 +3861,11 @@ assert y.__class.__parent ~= X -- X �是 Y 的父类
 
 ## with 语�
 
-在编写Lua代�时，我们在创建对象�的常��作是立�调用这个对象一系列�作函数并设置一系列属性。
+在编写 Lua 代�时，我们在创建对象�的常��作是立�调用这个对象一系列�作函数并设置一系列属性。
 
 这导致在代�中多次��引用对象的�称，增加了�必�的文本噪音。一个常�的解决方案是在创建对象时，在构造函数传入一个表，该表包��覆盖设置的键和值的集�。这样�的缺点是该对象的构造函数必须支�这��始化形�。
 
-with�有助于简化编写这样的代�。在with�内，我们�以使用以.或\开头的特殊语�，这些语�代表我们正在使用的对象的�作。
+with �有助于简化编写这样的代�。在 with �内，我们�以使用以 . 或 \ 开头的特殊语�，这些语�代表我们正在使用的对象的�作。
 
 例如，我们�以这样处�一个新创建的对象：
 
@@ -3425,7 +3886,7 @@ with Person!
 </pre>
 </YueDisplay>
 
-with语�也�以用作一个表达�，并返回它的代��正在处�的对象。
+with 语�也�以用作一个表达�，并返回它的代��正在处�的对象。
 
 ```moonscript
 file = with File "favorite_foods.txt"
@@ -3459,24 +3920,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
@@ -3499,9 +3960,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
@@ -3518,7 +3992,7 @@ print var -- 这里是nil
 </pre>
 </YueDisplay>
 
-月之脚本的 **do** 也�以用作表达�。�许你将多行代�的处��并为一个表达�，并将do语�代��的最�一个语�作为表达�返回的结果。
+月之脚本的 **do** 也�以用作表达�。�许你将多行代�的处��并为一个表达�，并将 do 语�代��的最�一个语�作为表达�返回的结果。
 
 ```moonscript
 counter = do
@@ -3702,7 +4176,7 @@ print i, k -- 这些已�被更新
 
 ## 月之脚本语言库
 
-使用`require("yue")`�访问。
+使用 `require("yue")` �访问。
 
 ### yue
 
@@ -3760,9 +4234,9 @@ yue_compiled: {string: string}
 **签�：**
 ```lua
 to_lua: function(code: string, config?: Config):
-                --[[codes]] string | nil,
-                --[[error]] string | nil,
-                --[[globals]] {{string, integer, integer}} | nil
+    --[[codes]] string | nil,
+    --[[error]] string | nil,
+    --[[globals]] {{string, integer, integer}} | nil
 ```
 
 **�数：**
@@ -3885,8 +4359,8 @@ remove_loader: function(): boolean
 **签�：**
 ```lua
 loadstring: function(input: string, chunkname: string, env: table, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[loaded function]] nil | function(...: any): (any...),
+    --[[error]] string | nil
 ```
 
 **�数：**
@@ -3916,8 +4390,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...),
-                --[[error]] string | nil
+    --[[loaded function]] nil | function(...: any): (any...),
+    --[[error]] string | nil
 ```
 
 **�数：**
@@ -3946,8 +4420,8 @@ loadstring: function(input: string, chunkname: string, config?: Config):
 **签�：**
 ```lua
 loadstring: function(input: string, config?: Config):
-                --[[loaded function]] nil | function(...: any): (any...),
-                --[[error]] string | nil
+    --[[loaded function]] nil | function(...: any): (any...),
+    --[[error]] string | nil
 ```
 
 **�数：**
@@ -3975,8 +4449,8 @@ loadstring: function(input: string, config?: Config):
 **签�：**
 ```lua
 loadfile: function(filename: string, env: table, config?: Config):
-                nil | function(...: any): (any...),
-                string | nil
+    nil | function(...: any): (any...),
+    string | nil
 ```
 
 **�数：**
@@ -4005,8 +4479,8 @@ loadfile: function(filename: string, env: table, config?: Config):
 **签�：**
 ```lua
 loadfile: function(filename: string, config?: Config):
-                nil | function(...: any): (any...),
-                string | nil
+    nil | function(...: any): (any...),
+    string | nil
 ```
 
 **�数：**
@@ -4261,9 +4735,9 @@ type AST = {string, integer, integer, any}
 
 **签�：**
 ```lua
-to_ast: function(code: string, flattenLevel?: number, astName?: string):
-                --[[AST]] AST | nil,
-                --[[error]] nil | string
+to_ast: function(code: string, flattenLevel?: number, astName?: string, reserveComment?: boolean):
+    --[[AST]] AST | nil,
+    --[[error]] nil | string
 ```
 
 **�数：**
@@ -4272,6 +4746,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
 
@@ -4344,6 +4854,19 @@ implicit_return_root: boolean
 reserve_line_number: boolean
 ```
 
+#### reserve_comment
+
+**类型：** �员��。
+
+**�述：**
+
+编译器是�应该在编译�的代�中�留原始注释。
+
+**签�：**
+```lua
+reserve_comment: boolean
+```
+
 #### space_over_tab
 
 **类型：** �员��。
@@ -4394,11 +4917,11 @@ line_offset: integer
 **签�：**
 ```lua
 enum LuaTarget
-        "5.1"
-        "5.2"
-        "5.3"
-        "5.4"
-        "5.5"
+  "5.1"
+  "5.2"
+  "5.3"
+  "5.4"
+  "5.5"
 end
 ```
 
diff --git a/makefile b/makefile
index d7e85d3..e0cdd91 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
@@ -440,3 +485,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/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/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/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 9a91b42..5df10ca 100644
--- a/spec/inputs/loops.yue
+++ b/spec/inputs/loops.yue
@@ -251,4 +251,17 @@ do
                                 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
-        #{def}
-else
-        _1 = #{def}
-        for _2 in *#{items}
-                _1 = #{action}
-        _1"
+        $showMacro "reduce", |
+                if ##{items} == 0
+                        #{def}
+                else
+                        _1 = #{def}
+                        for _2 in *#{items}
+                                _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
-        a = 1
-        a + 1"
+macro get_inner = (var)-> |
+        do
+                a = 1
+                a + 1
 
-macro get_inner_hygienic = (var)-> "(->
-        local a = 1
-        a + 1)!"
+macro get_inner_hygienic = (var)-> |
+        (->
+                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 "
-do
-        txt = #{res}
-        print '[macro ' .. #{name} .. ']'
-        print txt
-        txt
-"
+        if debugMacro then |
+                do
+                        txt = #{res}
+                        print '[macro #{name}]'
+                        print 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_"
         )
-        "
-do
-        local _src_, _dst_
-        with _dst_ = #{dst}
-                with _src_ = #{src}
-#{table.concat for field in *{...} do "
-                        _dst_.#{field} = _src_.#{field}
-"}"
+        copyFields = table.concat(
+                ["_dst_.#{field} = _src_.#{field}" for field in *{...}]
+                "\n\t\t\t"
+        )
+        |
+                do
+                        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)->
-        "require('yue').to_lua(#{code}, reserve_line_number:false, same_module:true)"
+macro to_lua = (code)-> |
+        require('yue').to_lua #{code},
+                reserve_line_number: false
+                same_module: true
 
-macro trim = (name)->
-        "if result := #{name}\\match '[\\'\"](.*)[\\'\"]' then result else #{name}"
+macro trim = (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)->
-        if msg
-                "$todoInner $FILE, $LINE, #{msg}"
-        else
-                "$todoInner $FILE, $LINE"
+export macro todo = (msg)-> |
+        $todoInner $FILE, $LINE#{msg and ", #{msg}" or ""}
 
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 7ff3118..2b0669c 100644
--- a/spec/inputs/switch.yue
+++ b/spec/inputs/switch.yue
@@ -220,4 +220,73 @@ do
                         ]
                         print "matched", sixth
 
-nil
\ No newline at end of file
+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..eee518a 100644
--- a/spec/inputs/syntax.yue
+++ b/spec/inputs/syntax.yue
@@ -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,13 @@ do
         f2 = ->
                 --
 
+do
+        return res if res ~= ""
+                
+
+do
+        return res if res ~= ""
+                --
+
 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..01d5c87 100644
--- a/spec/inputs/unicode/syntax.yue
+++ b/spec/inputs/unicode/syntax.yue
@@ -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/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/with.yue b/spec/inputs/with.yue
index 3fee48e..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
 
@@ -161,4 +161,13 @@ do
                 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/loops.lua b/spec/outputs/5.1/loops.lua
index bc720f6..e4f2871 100644
--- a/spec/outputs/5.1/loops.lua
+++ b/spec/outputs/5.1/loops.lua
@@ -587,3 +587,31 @@ do
         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)
-                return { }
-        end
+        print(123)
+        return { }
 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 3ee20bb..de5abdd 100644
--- a/spec/outputs/codes_from_doc.lua
+++ b/spec/outputs/codes_from_doc.lua
@@ -73,8 +73,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
         p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+local _u1f31b = "月之脚本"
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('hello world')
@@ -109,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
@@ -141,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"
@@ -209,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)
@@ -339,6 +372,14 @@ func({
         2,
         3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
         name = "abc",
         values = {
@@ -579,6 +620,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",
@@ -643,6 +737,36 @@ end
         local first = select(1, ...)
         return print(ok, count, first)
 end)(fn(true))
+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)
 Rx.Observable.fromRange(1, 8):filter(function(x)
         return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -680,6 +804,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()
@@ -695,6 +869,13 @@ 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()
@@ -789,6 +970,36 @@ 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)
 f(function()
         return print("hello")
 end)
@@ -914,6 +1125,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,
@@ -1004,8 +1237,18 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 1, 5 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
@@ -1015,7 +1258,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
@@ -1025,12 +1269,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
@@ -1041,8 +1308,7 @@ for key, value in pairs(object) do
         print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 2, 4 do
         local item = _list_0[_index_0]
         print(item)
 end
@@ -1226,7 +1492,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
@@ -1483,6 +1749,35 @@ if _tab_0 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 = {
@@ -2139,6 +2434,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)
@@ -2282,8 +2581,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
         p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+local _u1f31b = "月之脚本"
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('hello world')
@@ -2318,6 +2617,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
@@ -2350,6 +2655,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"
@@ -2418,6 +2738,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)
@@ -2548,6 +2880,14 @@ func({
         2,
         3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
         name = "abc",
         values = {
@@ -2788,6 +3128,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",
@@ -2852,6 +3245,36 @@ end
         local first = select(1, ...)
         return print(ok, count, first)
 end)(fn(true))
+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)
 Rx.Observable.fromRange(1, 8):filter(function(x)
         return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -2889,6 +3312,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()
@@ -2903,6 +3376,14 @@ 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()
@@ -2997,6 +3478,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
+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
 f(function()
         return print("hello")
 end)
@@ -3122,6 +3663,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,
@@ -3212,8 +3775,7 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 1, 5 do
         local item = _list_0[_index_0]
         _accum_0[_len_0] = item
         _len_0 = _len_0 + 1
@@ -3223,7 +3785,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
@@ -3233,12 +3796,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
@@ -3249,8 +3846,7 @@ for key, value in pairs(object) do
         print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 2, 4 do
         local item = _list_0[_index_0]
         print(item)
 end
@@ -3434,7 +4030,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
@@ -3691,6 +4287,35 @@ if _tab_0 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 = {
@@ -4347,6 +4972,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 52204b7..6a6c38c 100644
--- a/spec/outputs/codes_from_doc_zh.lua
+++ b/spec/outputs/codes_from_doc_zh.lua
@@ -73,8 +73,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
         p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+local _u1f31b = "月之脚本"
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('你好 世界')
@@ -109,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
@@ -141,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"
@@ -209,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)
@@ -339,6 +372,14 @@ func({
         2,
         3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
         name = "abc",
         values = {
@@ -579,6 +620,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",
@@ -643,6 +737,36 @@ end
         local first = select(1, ...)
         return print(ok, count, first)
 end)(fn(true))
+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)
 Rx.Observable.fromRange(1, 8):filter(function(x)
         return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -680,6 +804,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()
@@ -695,6 +869,13 @@ 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()
@@ -783,6 +964,36 @@ 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)
 f(function()
         return print("hello")
 end)
@@ -908,6 +1119,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,
@@ -998,8 +1231,18 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 1, 5 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
@@ -1009,7 +1252,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
@@ -1019,12 +1263,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
@@ -1035,8 +1302,7 @@ for key, value in pairs(object) do
         print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 2, 4 do
         local item = _list_0[_index_0]
         print(item)
 end
@@ -1220,7 +1486,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
@@ -1477,6 +1743,35 @@ if _tab_0 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 = {
@@ -2133,6 +2428,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)
@@ -2276,8 +2575,8 @@ local apple = setmetatable({
 if (getmetatable(apple) ~= nil) then
         p(apple.size, apple.color, getmetatable(apple).__index)
 end
-local _ud83c_udf1b = "月之脚本"
-_module_0["🌛"] = _ud83c_udf1b
+local _u1f31b = "月之脚本"
+_module_0["🌛"] = _u1f31b
 return _module_0
 local area = 6.2831853071796 * 5
 print('你好 世界')
@@ -2312,6 +2611,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
@@ -2344,6 +2649,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"
@@ -2412,6 +2732,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)
@@ -2542,6 +2874,14 @@ func({
         2,
         3
 })
+local f
+f = function()
+        return {
+                1,
+                2,
+                3
+        }
+end
 local tb = {
         name = "abc",
         values = {
@@ -2782,6 +3122,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",
@@ -2846,6 +3239,36 @@ end
         local first = select(1, ...)
         return print(ok, count, first)
 end)(fn(true))
+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)
 Rx.Observable.fromRange(1, 8):filter(function(x)
         return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -2883,6 +3306,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()
@@ -2897,6 +3370,14 @@ 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()
@@ -2985,6 +3466,66 @@ 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
 f(function()
         return print("hello")
 end)
@@ -3110,6 +3651,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,
@@ -3200,8 +3763,7 @@ local slice
 local _accum_0 = { }
 local _len_0 = 1
 local _list_0 = items
-local _max_0 = 5
-for _index_0 = 1, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 1, 5 do
         local item = _list_0[_index_0]
         _accum_0[_len_0] = item
         _len_0 = _len_0 + 1
@@ -3211,7 +3773,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
@@ -3221,12 +3784,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
@@ -3237,8 +3834,7 @@ for key, value in pairs(object) do
         print(key, value)
 end
 local _list_0 = items
-local _max_0 = 4
-for _index_0 = 2, _max_0 < 0 and #_list_0 + _max_0 or _max_0 do
+for _index_0 = 2, 4 do
         local item = _list_0[_index_0]
         print(item)
 end
@@ -3422,7 +4018,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
@@ -3679,6 +4275,35 @@ if _tab_0 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 = {
@@ -4335,6 +4960,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/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/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
-for _index_0 = 2, _max_0 < 0 and #x + _max_0 or _max_0, 2 do
+local _max_0 = #x + -5 + 1
+for _index_0 = 2, _max_0, 2 do
         local y = x[_index_0]
         print(y)
 end
-local _max_1 = 3
-for _index_0 = 1, _max_1 < 0 and #x + _max_1 or _max_1 do
+for _index_0 = 1, 3 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
-for _index_0 = a, _max_2 < 0 and #x + _max_2 or _max_2, c do
+local _min_0 = a
+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 9a47579..6ab4bbb 100644
--- a/spec/outputs/loops.lua
+++ b/spec/outputs/loops.lua
@@ -468,3 +468,31 @@ do
         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 9f5507c..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
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 0f8bba2..7c1004b 100644
--- a/spec/outputs/switch.lua
+++ b/spec/outputs/switch.lua
@@ -656,4 +656,125 @@ do
                 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..2df3473 100644
--- a/spec/outputs/syntax.lua
+++ b/spec/outputs/syntax.lua
@@ -430,4 +430,15 @@ 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
 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)
-                return { }
-        end
+        _u6253_u5370(123)
+        return { }
 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
-for _index_0 = 2, _max_0 < 0 and #_u53d8_u91cfx + _max_0 or _max_0, 2 do
+local _max_0 = #_u53d8_u91cfx + -5 + 1
+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, _max_1 < 0 and #_u53d8_u91cfx + _max_1 or _max_1 do
+for _index_0 = 1, 3 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
-for _index_0 = _u53d8_u91cfa, _max_2 < 0 and #_u53d8_u91cfx + _max_2 or _max_2, _u53d8_u91cfc do
+local _min_0 = _u53d8_u91cfa
+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/macro.lua b/spec/outputs/unicode/macro.lua
index 3b9327a..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 = (_({
-                        1,
-                        2,
-                        3,
-                        4,
-                        -2,
-                        3
-                }))
-                return _call_0["链"](_call_0)
-        end
+        local _call_0 = (_({
+                1,
+                2,
+                3,
+                4,
+                -2,
+                3
+        }))
+        return _call_0["链"](_call_0)
 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 = (_({
-                        1,
-                        2,
-                        3,
-                        4,
-                        -2,
-                        3
-                }))
-                return _call_1["链"](_call_1)
-        end
+        local _call_1 = (_({
+                1,
+                2,
+                3,
+                4,
+                -2,
+                3
+        }))
+        return _call_1["链"](_call_1)
 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["��"]["根节点"]["游�对象"]
-                return _call_1["父节点"](_call_1)
-        end
+        local _call_1 = _u539f_u70b9["��"]["根节点"]["游�对象"]
+        return _call_1["父节点"](_call_1)
 end
 local _call_1 = ((function()
         local _call_1 = ((function()
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
-                return (_call_1["��b"](_call_1, 123))["��c"]("abc")
-        end
+        local _call_1 = _u53d8_u91cfa
+        return (_call_1["��b"](_call_1, 123))["��c"]("abc")
 end
 local _u51fd_u65701
 _u51fd_u65701 = function()
diff --git a/spec/outputs/unicode/syntax.lua b/spec/outputs/unicode/syntax.lua
index 1984f40..a13302b 100644
--- a/spec/outputs/unicode/syntax.lua
+++ b/spec/outputs/unicode/syntax.lua
@@ -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
-                return _call_8["é…·"](_call_8, 100)
-        end
+        local _call_8 = _u4ec0_u4e48
+        return _call_8["é…·"](_call_8, 100)
 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()
-        end
+        return _u51fd_u6570()
 end
 local _anon_func_13 = function(_u51fd_u6570, ...)
-        do
-                return _u51fd_u6570(...)
-        end
+        return _u51fd_u6570(...)
 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("#", ...))
-                return _u6253_u5370(...)
-        end
+        _u6253_u5370(select("#", ...))
+        return _u6253_u5370(...)
 end
 local _anon_func_25 = function(_u6253_u5370, ...)
-        do
-                return _u6253_u5370(...)
-        end
+        return _u6253_u5370(...)
 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(...)
-        end
+        return _u6253_u5370(...)
 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
-                return _u6253_u5370(...)
-        end
+        local _u8868 = _arg_0
+        return _u6253_u5370(...)
 end
 local _u8fde_u63a5
 _u8fde_u63a5 = function(...)
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
-                return print(select(3, ...))
-        end
+        local ok = _arg_0
+        return print(select(3, ...))
 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_1 = _call_0["end"](_call_0)
-                return _call_1["🤣"](_call_1, 123)
-        end
+        local _call_0 = tb
+        local _call_1 = _call_0["end"](_call_0)
+        return _call_1["🤣"](_call_1, 123)
 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)
-                return "abc"
-        end
+        print(123)
+        return "abc"
 end
 local _anon_func_18 = function(print, select, _arg_0, ...)
-        do
-                local success = _arg_0
-                if success then
-                        return print(select('#', ...))
-                end
+        local success = _arg_0
+        if success then
+                return print(select('#', ...))
         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_1 = _call_0["end"](_call_0)
-                return _call_1["🤣"](_call_1, 123 and (#listA > 0 and _anon_func_25(itemA, listA)))
-        end
+        local _call_0 = tb
+        local _call_1 = _call_0["end"](_call_0)
+        return _call_1["🤣"](_call_1, 123 and (#listA > 0 and _anon_func_25(itemA, listA)))
 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
-                if ok then
-                        return ...
-                else
-                        return os.exit(1)
-                end
+        local ok = _arg_0
+        if ok then
+                return ...
+        else
+                return os.exit(1)
         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()
-        end
+        return func()
 end
 local _anon_func_13 = function(func, ...)
-        do
-                return func(...)
-        end
+        return func(...)
 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("#", ...))
-                return print(...)
-        end
+        print(select("#", ...))
+        return print(...)
 end
 local _anon_func_25 = function(print, ...)
-        do
-                return print(...)
-        end
+        return print(...)
 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(...)
-        end
+        return print(...)
 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
-                return print(...)
-        end
+        local tb = _arg_0
+        return print(...)
 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/with.lua b/spec/outputs/with.lua
index 20c5d44..530915e 100644
--- a/spec/outputs/with.lua
+++ b/spec/outputs/with.lua
@@ -192,26 +192,61 @@ do
                 local _with_0 = item
                 do
                         local _accum_0
-                        while true do
+                        repeat
                                 if _with_0.id > 0 then
                                         _accum_0 = _with_0.content
                                         break
                                 end
-                        end
+                        until true
                         _with_0 = _accum_0
                 end
                 return _with_0
         end)())
         local a
-        local _with_0 = tb
+        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
-                if _with_0.v then
-                        _accum_0 = _with_0.a
-                        break
+                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
-        _with_0 = _accum_0
-        a = _with_0
+        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/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..b93f75e 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) {
@@ -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 fdb1d20..14d8db8 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,7 +174,7 @@ 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*) const {
@@ -203,14 +210,18 @@ 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 {
-        return name->to_string(ud);
+std::string YueComment_t::to_string(void* ud) const {
+        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 {
@@ -304,6 +315,17 @@ 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 Import_t::to_string(void* ud) const {
         if (ast_is<FromImport_t>(content)) {
                 return content->to_string(ud);
@@ -372,8 +394,8 @@ std::string With_t::to_string(void* ud) const {
         str_list temp{
                 eop ? "with?"s : "with"s,
                 valueList->to_string(ud)};
-        if (assigns) {
-                temp.push_back(assigns->to_string(ud));
+        if (assign) {
+                temp.push_back(':' + assign->to_string(ud));
         }
         if (body.is<Statement_t>()) {
                 return join(temp, " "sv) + " do "s + body->to_string(ud);
@@ -419,6 +441,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));
@@ -462,41 +487,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) {
-                                        temp.back() += " then "s + node->to_string(ud);
-                                } else {
-                                        temp.emplace_back(info->ind() + "else "s + node->to_string(ud));
+                                switch (lastType) {
+                                        case NType::Cond:
+                                                temp.back() += " then "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) {
-                                        info->pushScope();
-                                        temp.emplace_back(node->to_string(ud));
-                                        if (temp.back().empty()) {
-                                                temp.back() = info->ind() + "--"s;
+                                switch (lastType) {
+                                        case NType::Cond: {
+                                                info->pushScope();
+                                                temp.emplace_back(node->to_string(ud));
+                                                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();
-                                } else {
-                                        temp.emplace_back(info->ind() + "else"s);
-                                        info->pushScope();
-                                        temp.emplace_back(node->to_string(ud));
-                                        if (temp.back().empty()) {
-                                                temp.back() = info->ind() + "--"s;
+                                        case NType::Block: {
+                                                temp.emplace_back(info->ind() + "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();
                                 }
-                                condition = false;
+                                lastType = NType::Block;
                                 break;
                         }
                 }
@@ -524,10 +583,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->content.is<Statement_t>()) {
-                temp.emplace_back("repeat "s + body->to_string(ud));
+        if (body.is<Statement_t>()) {
+                return "repeat "s + body->to_string(ud) + " until "s + condition->to_string(ud);
         } else {
+                str_list temp;
                 temp.emplace_back("repeat"s);
                 info->pushScope();
                 temp.emplace_back(body->to_string(ud));
@@ -535,14 +594,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) {
@@ -581,6 +640,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>()) {
@@ -609,10 +671,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()) {
@@ -729,7 +794,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()) {
@@ -796,14 +861,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)) {
@@ -864,6 +929,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);
 }
@@ -950,6 +1021,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);
 }
@@ -1248,6 +1364,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);
         }
@@ -1270,6 +1389,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 {
@@ -1278,6 +1400,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);
         }
@@ -1488,37 +1613,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 (!comments.empty()) {
-                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);
-                }
+        if (appendix) {
+                return content->to_string(ud) + ' ' + appendix->to_string(ud);
         } else {
-                if (appendix) {
-                        return content->to_string(ud) + ' ' + appendix->to_string(ud);
-                } else {
-                        return content->to_string(ud);
-                }
+                return content->to_string(ud);
         }
 }
 std::string StatementSep_t::to_string(void*) const {
         return {};
 }
-std::string YueMultilineComment_t::to_string(void* ud) const {
-        return "--[["s + inner->to_string(ud) + "]]"s;
+std::string EmptyLine_t::to_string(void*) const {
+        return {};
 }
 std::string ChainAssign_t::to_string(void* ud) const {
         str_list temp;
@@ -1533,14 +1638,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()) {
-                auto stmt = static_cast<Statement_t*>(stmt_);
-                if (stmt->content.is<PipeBody_t>()) {
-                        info->pushScope();
-                        temp.emplace_back(stmt->to_string(ud));
-                        info->popScope();
-                } else {
-                        temp.emplace_back(info->ind() + stmt->to_string(ud));
+        for (auto stmt_ : statementOrComments.objects()) {
+                if (auto stmt = ast_cast<Statement_t>(stmt_)) {
+                        if (stmt->content.is<PipeBody_t>()) {
+                                info->pushScope();
+                                temp.emplace_back(stmt->to_string(ud));
+                                info->popScope();
+                        } else {
+                                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);
@@ -1559,3 +1672,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 0c15fac..ba4186d 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:
 
@@ -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)
 
@@ -233,18 +233,25 @@ AST_NODE(ImportAs)
         AST_MEMBER(ImportAs, &literal, &target)
 AST_END(ImportAs)
 
+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> 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)
 
@@ -287,9 +294,9 @@ 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)
@@ -304,20 +311,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;
@@ -345,7 +353,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)
@@ -355,14 +363,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_END(For)
+        AST_MEMBER(ForNum, &varName, &startValue, &stopValue, &stepValue, &body)
+AST_END(ForNum)
 
 AST_NODE(ForEach)
         ast_ptr<true, AssignableNameList_t> nameList;
@@ -371,6 +379,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)
@@ -383,14 +396,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)
@@ -403,7 +417,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)
 
@@ -418,23 +432,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_END(CompFor)
+        AST_MEMBER(CompForNum, &varName, &startValue, &stopValue, &stepValue)
+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_MEMBER(CompInner, &sep, &items)
-AST_END(CompInner)
+        ast_sel_list<true, CompForNum_t, CompForEach_t, Exp_t> items;
+        AST_MEMBER(CompFor, &sep, &items)
+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)
 
@@ -549,8 +563,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,
-                UnaryValue_t,
+                For_t, While_t, Repeat_t,
+                Do_t, Try_t, UnaryValue_t,
                 TblComprehension_t, Comprehension_t,
                 FunLit_t, Num_t, VarArg_t> value;
         AST_MEMBER(SimpleValue, &value)
@@ -589,8 +603,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)
 
@@ -641,9 +678,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)
@@ -743,17 +785,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_MEMBER(FnArgDefList, &sep, &definitions, &varArg)
+        ast_ptr<false, VarArgDef_t> varArg;
+        ast_ptr<false, Name_t> label;
+        AST_MEMBER(FnArgDefList, &sep, &definitions, &varArg, &label)
 AST_END(FnArgDefList)
 
 AST_NODE(OuterVarShadow)
@@ -809,7 +853,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)
 
@@ -885,7 +929,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)
 
@@ -895,14 +939,17 @@ AST_END(StatementSep)
 AST_LEAF(YueLineComment)
 AST_END(YueLineComment)
 
-AST_LEAF(MultilineCommentInner)
-AST_END(MultilineCommentInner)
-
-AST_NODE(YueMultilineComment)
-        ast_ptr<true, MultilineCommentInner_t> inner;
-        AST_MEMBER(YueMultilineComment, &inner)
+AST_LEAF(YueMultilineComment)
 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;
@@ -911,16 +958,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)
@@ -930,8 +975,8 @@ AST_END(Body)
 
 AST_NODE(Block)
         ast_ptr<true, Seperator_t> sep;
-        ast_list<false, Statement_t> statements;
-        AST_MEMBER(Block, &sep, &statements)
+        ast_sel_list<false, Statement_t, YueComment_t, EmptyLine_t> statementOrComments;
+        AST_MEMBER(Block, &sep, &statementOrComments)
 AST_END(Block)
 
 AST_NODE(BlockEnd)
@@ -950,9 +995,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 7abc929..cffa7a8 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.28.3"sv;
+const std::string_view version = "0.30.4"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()) {
-                                                auto stmt = static_cast<Statement_t*>(stmt_);
+                                        for (auto stmt_ : block->statementOrComments.objects()) {
+                                                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;
-                                                globals->push_back({name, line + _config.lineOffset, col, accessType});
+                                                auto [name, line, col, accessType, defined] = var.second;
+                                                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";
@@ -875,6 +876,10 @@ private:
                 return false;
         }
 
+        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::LocalConst);
@@ -967,7 +972,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 {
@@ -975,14 +980,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++;
         }
@@ -1169,14 +1166,22 @@ private:
                 return nullptr;
         }
 
-        Statement_t* lastStatementFrom(const node_container& stmts) const {
-                if (!stmts.empty()) {
-                        auto it = stmts.end();
-                        --it;
-                        while (!static_cast<Statement_t*>(*it)->content && it != stmts.begin()) {
-                                --it;
+        Statement_t* lastStatementFrom(const node_container& statementOrComments) const {
+                if (!statementOrComments.empty()) {
+                        for (auto it = statementOrComments.rbegin(); it != statementOrComments.rend(); ++it) {
+                                if (auto stmt = ast_cast<Statement_t>(*it)) {
+                                        return stmt;
+                                }
+                        }
+                }
+                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;
         }
@@ -1185,16 +1190,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>(): {
@@ -1258,7 +1273,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);
                 }
@@ -1281,6 +1296,8 @@ private:
                 Common,
                 EndWithColon,
                 EndWithEOP,
+                EndWithSlice,
+                HasRIndex,
                 HasEOP,
                 HasKeyword,
                 HasUnicode,
@@ -1299,6 +1316,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;
@@ -1324,6 +1344,8 @@ private:
                                 }
                         } else if (ast_is<ExistentialOp_t>(item)) {
                                 return ChainType::HasEOP;
+                        } else if (ast_is<ReversedIndex_t>(item)) {
+                                return ChainType::HasRIndex;
                         }
                 }
                 return type;
@@ -1353,10 +1375,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) {
-                                buf << "_u"sv << std::hex << static_cast<int>(ch);
-                        } else {
+                        if (ch <= 0x7F && ((ch == '_') || ((ch | 0x20) >= 'a' && (ch | 0x20) <= 'z') || (ch >= '0' && ch <= '9'))) {
                                 buf << static_cast<char>(ch);
+                        } else {
+                                buf << "_u"sv << std::hex << static_cast<uint32_t>(ch);
                         }
                 }
                 return buf.str();
@@ -1438,6 +1460,7 @@ private:
                                 case id<DotChainItem_t>():
                                 case id<Exp_t>():
                                 case id<TableAppendingOp_t>():
+                                case id<ReversedIndex_t>():
                                         return true;
                         }
                 }
@@ -1455,7 +1478,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;
                                                 }
                                         }
@@ -1596,7 +1619,7 @@ private:
                                         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)};
                                 }
                         }
                 }
@@ -1638,24 +1661,31 @@ private:
                 return;
         }
 
-        void transformStatement(Statement_t* statement, str_list& out) {
-                auto x = statement;
-                if (_config.reserveComment && !x->comments.empty()) {
-                        for (ast_node* node : x->comments.objects()) {
-                                switch (node->get_id()) {
-                                        case id<YueLineComment_t>(): {
-                                                auto comment = ast_cast<YueLineComment_t>(node);
-                                                out.push_back(indent() + "--"s + _parser.toString(comment) + '\n');
-                                                break;
-                                        }
-                                        case id<YueMultilineComment_t>(): {
-                                                auto comment = ast_cast<YueMultilineComment_t>(node);
-                                                out.push_back(indent() + _parser.toString(comment) + '\n');
-                                                break;
-                                        }
-                                }
+        void transformComment(YueComment_t* comment, str_list& out) {
+                if (!_config.reserveComment) {
+                        return;
+                }
+                auto node = comment->comment.get();
+                if (!node) {
+                        out.push_back("\n"s);
+                        return;
+                }
+                switch (node->get_id()) {
+                        case id<YueLineComment_t>(): {
+                                auto content = static_cast<YueLineComment_t*>(node);
+                                out.push_back(indent() + "--"s + _parser.toString(content) + '\n');
+                                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);
@@ -1719,7 +1749,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;
                                         }
@@ -1780,8 +1810,8 @@ private:
                                         statement->content.set(expListAssign);
                                         break;
                                 }
-                                case id<CompInner_t>(): {
-                                        auto compInner = appendix->item.to<CompInner_t>();
+                                case id<CompFor_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);
@@ -1846,11 +1876,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;
@@ -1974,7 +2005,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;
@@ -2005,8 +2036,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));
                 }
@@ -2015,7 +2069,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;
         }
 
@@ -2171,14 +2225,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;
@@ -2223,7 +2277,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();
@@ -2247,14 +2302,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()) {
@@ -2276,7 +2331,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);
@@ -2288,19 +2343,69 @@ private:
                                                 transformAssignment(newAssignment, temp);
                                                 varName = objVar;
                                         }
-                                        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());
+                                        if (auto spread = ast_cast<SpreadListExp_t>(*vit)) {
+                                                auto lenVar = getUnusedName("_len_"sv);
+                                                forceAddToScope(lenVar);
+                                                temp.push_back(indent() + "local "s + lenVar + " = #"s + varName + " + 1"s + nl(spread));
+                                                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);
                                         }
@@ -2329,6 +2434,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();
@@ -2356,7 +2472,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);
@@ -2400,6 +2516,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())) {
@@ -2452,12 +2575,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:
@@ -2512,11 +2637,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();
                                 }
                         }
@@ -2568,13 +2693,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());
                                                 }
                                         }
@@ -2584,7 +2709,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);
@@ -2600,7 +2725,7 @@ private:
                                         if (!isLocalValue) {
                                                 if (needScope) {
                                                         popScope();
-                                                        _buf << indent() << "end"sv << nlr(x);
+                                                        _buf << indent() << "end"sv << nl(x);
                                                         temp.push_back(clearBuf());
                                                 }
                                         }
@@ -2638,9 +2763,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 {
@@ -2649,11 +2774,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);
@@ -2668,7 +2793,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);
@@ -2733,13 +2858,13 @@ 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) {
@@ -2757,6 +2882,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;
                 }
         }
@@ -2771,7 +2897,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();
@@ -2802,7 +2928,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();
@@ -2813,17 +2939,19 @@ 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;
                                         try {
                                                 assignable = isAssignable(static_cast<Exp_t*>(pair));
@@ -2834,13 +2962,19 @@ private:
                                                 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>();
-                                                auto indexItem = toAst<Exp_t>(std::to_string(index), exp);
                                                 chain->items.push_back(indexItem);
                                                 pairs.push_back({exp, Empty, chain, nullptr});
                                                 break;
@@ -2855,7 +2989,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);
@@ -2866,7 +2999,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,
@@ -2991,7 +3123,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);
@@ -3048,6 +3186,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;
                         }
                 }
@@ -3125,7 +3299,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;
                                                 }
                                         }
@@ -3512,7 +3686,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;
                         }
@@ -3559,9 +3733,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);
@@ -3577,7 +3751,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;
                         }
@@ -3678,7 +3852,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();
                                                 }
                                         }
@@ -3711,7 +3885,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();
                                                 }
                                         }
@@ -3740,12 +3914,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) {
@@ -3755,17 +3929,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();
@@ -3860,7 +4034,7 @@ private:
                                         } else {
                                                 transformExp(arg, out, ExpUsage::Closure);
                                                 out.back().insert(0, indent());
-                                                out.back().append(nlr(x));
+                                                out.back().append(nl(x));
                                         }
                                         return;
                                 }
@@ -3984,7 +4158,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>();
@@ -3993,7 +4167,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 {
@@ -4001,7 +4175,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>();
@@ -4010,7 +4184,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>();
@@ -4172,7 +4346,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()) {
@@ -4264,15 +4438,25 @@ private:
 
         std::optional<std::pair<std::string, str_list>> upValueFuncFromExp(Exp_t* exp, str_list* ensureArgListInTheEnd, bool blockRewrite) {
                 if (checkUpValueFuncAvailable(exp)) {
+                        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 = 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>();
                         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;
@@ -4329,7 +4513,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();
                                         }
                                 }
@@ -4352,9 +4536,9 @@ private:
                         case ExpUsage::Return:
                         case ExpUsage::Closure: {
                                 prepareValue();
-                                _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nll(x);
-                                _buf << indent(1) << "return "s << objVar << nll(x);
-                                _buf << indent() << "else"s << nll(x);
+                                _buf << indent() << "if "sv << objVar << " ~= nil then"sv << nl(x);
+                                _buf << indent(1) << "return "s << objVar << nl(x);
+                                _buf << indent() << "else"s << nl(x);
                                 temp.push_back(clearBuf());
                                 auto ret = x->new_ptr<Return_t>();
                                 ret->explicitReturn = false;
@@ -4364,10 +4548,10 @@ private:
                                 incIndentOffset();
                                 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();
@@ -4384,14 +4568,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 {
@@ -4399,17 +4583,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;
                         }
@@ -4439,7 +4623,7 @@ private:
                                                 if (accessType == AccessType::Read && _funcLevel > 1) {
                                                         accessType = AccessType::Capture;
                                                 }
-                                                _globals[key] = {out.back(), item->m_begin.m_line, item->m_begin.m_col, accessType};
+                                                _globals[key] = {out.back(), item->m_begin.m_line, item->m_begin.m_col, accessType, isSolidDefined(out.back())};
                                         }
                                 }
                                 break;
@@ -4471,6 +4655,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;
@@ -4507,11 +4692,11 @@ 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;
@@ -4523,7 +4708,7 @@ private:
                                 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 {
@@ -4545,7 +4730,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 {
@@ -4556,7 +4741,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 {
@@ -4573,7 +4758,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);
@@ -4585,13 +4770,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);
-                        if (!stmt->appendix && stmt->content.is<Return_t>() && stmt != nodes.back()) {
+                        auto stmt = ast_cast<Statement_t>(node);
+                        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;
@@ -4600,6 +4787,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());
@@ -4617,9 +4814,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(!static_cast<Statement_t*>(*next)->content.as<PipeBody_t>());
+                                BREAK_IF(!nextStmt);
+                                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>()) {
@@ -4627,7 +4832,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;
@@ -4638,7 +4843,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>();
@@ -4690,7 +4895,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;
@@ -4717,7 +4922,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;
                                                 }
@@ -4746,7 +4951,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;
@@ -4756,7 +4961,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);
                                                 }
                                         }
                                 }
@@ -4784,17 +4989,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>();
-                                        doNode->body.set(newBody);
-                                        auto simpleValue = x->new_ptr<SimpleValue_t>();
-                                        simpleValue->value.set(doNode);
-                                        if (auto result = upValueFuncFromExp(newExp(simpleValue, x), &argNames, true)) {
+                                        if (auto result = upValueFuncFromBlock(followingBlock.get(), &argNames, false, true)) {
                                                 auto [funcName, args] = std::move(*result);
                                                 str_list finalArgs;
                                                 for (const auto& arg : args) {
@@ -4802,9 +5003,14 @@ private:
                                                                 finalArgs.push_back(arg);
                                                         }
                                                 }
-                                                newBlock->statements.push_back(toAst<Statement_t>(funcName + ' ' + join(finalArgs, ","sv), x));
-                                                auto sVal = singleValueFrom(static_cast<Statement_t*>(newBlock->statements.back())->content.to<ExpListAssign_t>()->expList);
-                                                ast_to<InvokeArgs_t>(sVal->item.to<ChainValue_t>()->items.back())->args.dup(newInvoke->args);
+                                                auto lastNewStmt = toAst<Statement_t>(funcName + ' ' + (finalArgs.empty() ? "nil"s : join(finalArgs, ","sv)), x);
+                                                newBlock->statementOrComments.push_back(lastNewStmt);
+                                                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;
                                         }
@@ -4829,7 +5035,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
@@ -4838,11 +5044,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>();
                                 {
@@ -4850,7 +5056,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);
                                                 }
                                         }
                                 }
@@ -4872,13 +5078,13 @@ 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->statements.push_back(toAst<Statement_t>("if "s + okVar + " then return ... else error ..."s, 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>();
@@ -4887,7 +5093,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);
                                         }
                                 }
                                 auto doBackcall = static_cast<SubBackcall_t*>(expListAssign->action.get());
@@ -4904,12 +5110,11 @@ private:
                                 backcall->value.set(doBackcall->value);
                                 auto newStmt = backcall->new_ptr<Statement_t>();
                                 newStmt->content.set(backcall);
-                                newStmt->comments.dup(stmt->comments);
                                 newStmt->appendix.set(stmt->appendix);
-                                newBlock->statements.push_back(newStmt);
+                                newBlock->statementOrComments.push_back(newStmt);
                                 auto ait = it;
                                 for (auto i = ++ait; i != nodes.end(); ++i) {
-                                        newBlock->statements.push_back(*i);
+                                        newBlock->statementOrComments.push_back(*i);
                                 }
                                 transformBlock(newBlock, out, usage, assignList, isRoot);
                                 return;
@@ -5021,7 +5226,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:
@@ -5058,7 +5263,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>();
@@ -5083,37 +5288,54 @@ private:
                 }
                 if (!nodes.empty()) {
                         str_list temp;
+                        auto lastStmt = lastStatementFrom(nodes);
                         for (auto node : nodes) {
-                                currentScope().lastStatement = (node == nodes.back()) && currentScope().mode == GlobalMode::None;
-                                transformStatement(static_cast<Statement_t*>(node), 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 (index != std::string::npos) {
-                                                        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 (auto comment = ast_cast<YueComment_t>(node)) {
+                                        transformComment(comment, temp);
+                                        continue;
+                                }
+                                if (!ast_is<Statement_t>(node)) {
+                                        continue;
+                                }
+                                auto transformNode = [&]() {
+                                        currentScope().lastStatement = (node == lastStmt) && currentScope().mode == GlobalMode::None;
+                                        transformStatement(static_cast<Statement_t*>(node), 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()) {
-                                                                rit->insert(index, ";"sv);
+                                                        if (index != std::string::npos) {
+                                                                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();
                                 }
                         }
                         out.push_back(join(temp));
@@ -5121,7 +5343,7 @@ private:
                         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));
                 }
         }
 
@@ -5322,18 +5544,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.append("]==========]"sv);
+                                                defVal = '=' + Utils::toLuaDoubleString(defVal);
                                         }
                                         newArgs.emplace_back(_parser.toString(def->name) + defVal);
                                 }
@@ -5341,6 +5574,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 + ')';
@@ -5371,6 +5612,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
@@ -5445,11 +5704,11 @@ private:
                                                 case id<While_t>():
                                                         transformWhileInPlace(static_cast<While_t*>(value), out);
                                                         return;
-                                                case id<For_t>():
-                                                        transformForInPlace(static_cast<For_t*>(value), out);
+                                                case id<Repeat_t>():
+                                                        transformRepeatInPlace(static_cast<Repeat_t*>(value), out);
                                                         return;
-                                                case id<ForEach_t>():
-                                                        transformForEachInPlace(static_cast<ForEach_t*>(value), out);
+                                                case id<For_t>():
+                                                        transformForInPlace(static_cast<For_t*>(value), out, nullptr);
                                                         return;
                                                 case id<If_t>():
                                                         transformIf(static_cast<If_t*>(value), out, ExpUsage::Return);
@@ -5469,12 +5728,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);
-                                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();
@@ -5482,10 +5741,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));
                 }
         }
 
@@ -5516,6 +5775,7 @@ private:
                         bool checkExistence = false;
                         std::string name;
                         std::string assignSelf;
+                        ast_ptr<false, ExpListAssign_t> assignment;
                 };
                 std::list<ArgItem> argItems;
                 str_list temp;
@@ -5525,7 +5785,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) {
@@ -5566,6 +5830,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);
@@ -5579,23 +5859,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())
-                                varNames = arg.name;
-                        else
-                                varNames.append(", "s + arg.name);
+                        if (varNames.empty()) {
+                                varNames = arg.name + varStr;
+                        } else {
+                                varNames.append(", "s + arg.name + varStr);
+                        }
                         _varArgs.top().hasVar = true;
                 }
                 if (assignSelf) {
@@ -5664,6 +5967,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())) {
@@ -5698,7 +6040,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);
@@ -5769,7 +6111,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);
@@ -5829,9 +6171,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();
@@ -5867,15 +6209,15 @@ private:
                                 }
                         }
                         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();
@@ -5885,7 +6227,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;
@@ -5902,7 +6244,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;
@@ -5980,12 +6322,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();
@@ -6061,7 +6403,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();
                                                         }
                                                 }
@@ -6098,7 +6440,7 @@ private:
                                                                 returnNode->valueList.set(values);
                                                                 transformReturn(returnNode, temp);
                                                                 popScope();
-                                                                *funcStart = anonFuncStart() + nll(x);
+                                                                *funcStart = anonFuncStart() + nl(x);
                                                                 temp.push_back(indent() + anonFuncEnd());
                                                                 popAnonVarArg();
                                                                 popFunctionScope();
@@ -6122,7 +6464,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;
                                                         }
@@ -6130,7 +6472,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;
                                                 }
@@ -6181,7 +6523,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());
                                 }
@@ -6235,7 +6577,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;
@@ -6281,7 +6623,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:
@@ -6295,7 +6637,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>();
@@ -6327,6 +6669,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;
                                 }
                         }
                 }
@@ -6376,10 +6832,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:
@@ -6511,7 +6967,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
@@ -6523,7 +6979,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) {
@@ -6568,11 +7042,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
@@ -6664,8 +7161,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.append(_newLine + indent() + "end"s + nlr(chainValue));
+                                        codes.insert(0, indent() + "do"s + nl(chainValue));
+                                        codes.append(_newLine + indent() + "end"s + nl(chainValue));
                                 }
                                 return {nullptr, nullptr, std::move(codes), std::move(localVars)};
                         } else {
@@ -6702,14 +7199,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);
                                                 }
@@ -6754,7 +7251,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);
@@ -6791,7 +7288,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>();
@@ -6845,6 +7342,9 @@ private:
                 if (transformChainEndWithColonItem(chainList, out, usage, assignList)) {
                         return;
                 }
+                if (transformChainEndWithSlice(chainList, out, usage, assignList)) {
+                        return;
+                }
                 transformChainList(chainList, out, usage, assignList);
         }
 
@@ -6941,7 +7441,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)) {
@@ -6970,7 +7470,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>();
@@ -6982,7 +7482,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_");
@@ -6998,7 +7498,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>();
@@ -7018,16 +7518,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() << "return "sv << (exist ? "false"sv : "true"sv) << nll(x);
+                                        _buf << indent() << "end"sv << nl(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);
@@ -7043,7 +7543,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_) {
@@ -7080,7 +7580,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();
@@ -7120,7 +7620,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();
                                         }
                                 }
@@ -7160,10 +7660,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));
@@ -7172,7 +7672,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 {
@@ -7206,7 +7706,7 @@ private:
                                 }
                                 _buf << ')';
                                 if (usage == ExpUsage::Assignment || usage == ExpUsage::Return) {
-                                        _buf << nll(discrete);
+                                        _buf << nl(discrete);
                                 }
                                 out.push_back(clearBuf());
                         }
@@ -7326,7 +7826,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)) {
@@ -7334,7 +7834,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;
@@ -7354,14 +7854,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);
-                                        transformForEach(forEach, temp);
+                                        auto forNode = toAst<For_t>(clearBuf(), item);
+                                        transformFor(forNode, temp);
                                         break;
                                 }
                                 case id<SpreadListExp_t>(): {
@@ -7378,12 +7878,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);
-                                        transformForEach(forEach, temp);
+                                        auto forNode = toAst<For_t>(clearBuf(), item);
+                                        transformFor(forNode, temp);
                                         break;
                                 }
                                 case id<VariablePair_t>():
@@ -7561,9 +8061,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();
@@ -7579,13 +8079,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;
@@ -7706,11 +8206,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 {
@@ -7720,7 +8220,7 @@ private:
                                 decIndentOffset();
                                 tabStr += "{ }"sv;
                         } else {
-                                tabStr += ('{' + nll(x) + join(temp));
+                                tabStr += ('{' + nl(x) + join(temp));
                                 decIndentOffset();
                                 tabStr += (indent() + '}');
                         }
@@ -7764,18 +8264,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());
-                for (auto item : compInner->items.objects()) {
+                auto compFor = static_cast<CompFor_t*>(comp->items.back());
+                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>():
-                                        transformCompFor(static_cast<CompFor_t*>(item), temp);
+                                case id<CompForNum_t>():
+                                        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;
@@ -7795,16 +8295,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>();
@@ -7843,9 +8343,16 @@ private:
                         }
                         return;
                 }
-                auto def = ast_cast<NormalDef_t>(comp->items.front());
-                if (!def || def->defVal) {
-                        throw CompileError("invalid comprehension expression", comp->items.front());
+                ast_node* value = nullptr;
+                bool isSpread = ast_is<SpreadListExp_t>(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) {
@@ -7869,31 +8376,33 @@ private:
                         default:
                                 break;
                 }
-                auto value = def->item.get();
-                auto compInner = static_cast<CompInner_t*>(comp->items.back());
+                auto compFor = static_cast<CompFor_t*>(comp->items.back());
                 str_list temp;
                 std::string accumVar = getUnusedName("_accum_"sv);
-                std::string lenVar = getUnusedName("_len_"sv);
                 addToScope(accumVar);
-                addToScope(lenVar);
-                for (auto item : compInner->items.objects()) {
+                std::string lenVar;
+                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>():
-                                        transformCompFor(static_cast<CompFor_t*>(item), temp);
+                                case id<CompForNum_t>():
+                                        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>();
@@ -7903,25 +8412,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 << lenVar << " = 1"sv << nll(comp);
-                _buf << join(temp);
-                _buf << assignStr;
-                _buf << indent(int(temp.size())) << lenVar << " = "sv << lenVar << " + 1"sv << nll(comp);
+                _buf << indent() << "local "sv << accumVar << " = { }"sv << nl(comp);
+                if (isSpread) {
+                        _buf << join(temp);
+                        _buf << assignStr;
+                } 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();
@@ -7938,13 +8452,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;
@@ -7952,6 +8466,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;
@@ -7970,13 +8489,8 @@ private:
                                                 varConstAfter = vars.back();
                                         }
                                         break;
-                                case id<TableLit_t>(): {
-                                        auto desVar = getUnusedName("_des_"sv);
-                                        destructPairs.emplace_back(item, toAst<Exp_t>(desVar, x));
-                                        vars.push_back(desVar);
-                                        varAfter.push_back(desVar);
-                                        break;
-                                }
+                                case id<SimpleTable_t>():
+                                case id<TableLit_t>():
                                 case id<Comprehension_t>(): {
                                         auto desVar = getUnusedName("_des_"sv);
                                         destructPairs.emplace_back(item, toAst<Exp_t>(desVar, x));
@@ -8018,15 +8532,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();
                                 }
@@ -8040,38 +8574,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 << indent(1) << "local "sv << join(vars, ", "sv) << " = "sv << listVar << "["sv << indexVar << "]"sv << nll(nameList);
+                                _buf << " do"sv << nl(loopTarget);
+                                _buf << indent(1) << "local "sv << join(vars, ", "sv) << " = "sv << listVar << "["sv << indexVar << "]"sv << nl(nameList);
                                 out.push_back(clearBuf());
                                 BLOCK_END
                                 bool newListVal = false;
@@ -8082,21 +8672,21 @@ private:
                                 }
                                 if (!endWithSlice) {
                                         transformExp(star_exp->value, temp, ExpUsage::Closure);
-                                        if (newListVal) _buf << indent() << "local "sv << listVar << " = "sv << temp.back() << nll(nameList);
-                                        _buf << indent() << "for "sv << indexVar << " = 1, #"sv << listVar << " do"sv << nlr(loopTarget);
-                                        _buf << indent(1) << "local "sv << join(vars, ", "sv) << " = "sv << listVar << "["sv << indexVar << "]"sv << nll(nameList);
+                                        if (newListVal) _buf << indent() << "local "sv << listVar << " = "sv << temp.back() << nl(nameList);
+                                        _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 << 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;
@@ -8109,11 +8699,18 @@ private:
                 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>();
@@ -8173,7 +8770,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);
@@ -8187,15 +8784,15 @@ 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);
                 markVarLocalConst(varName);
                 out.push_back(clearBuf());
         }
 
-        void transformForHead(For_t* forNode, str_list& out) {
-                transformForHead(forNode->varName, forNode->startValue, forNode->stopValue, forNode->stepValue, out);
+        void transformForNumHead(ForNum_t* forNum, str_list& out) {
+                transformForNumHead(forNum->varName, forNum->startValue, forNum->stopValue, forNum->stepValue, out);
         }
 
         void transform_plain_body(ast_node* bodyOrStmt, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
@@ -8205,7 +8802,7 @@ private:
                                 break;
                         case id<Statement_t>(): {
                                 auto newBlock = bodyOrStmt->new_ptr<Block_t>();
-                                newBlock->statements.push_back(bodyOrStmt);
+                                newBlock->statementOrComments.push_back(bodyOrStmt);
                                 transformBlock(newBlock, out, usage, assignList);
                                 break;
                         }
@@ -8302,9 +8899,9 @@ private:
         }
 
         void addDoToLastLineReturn(ast_node* body) {
-                if (auto block = ast_cast<Block_t>(body); block && !block->statements.empty()) {
-                        auto last = static_cast<Statement_t*>(block->statements.back());
-                        if (last->content.is<Return_t>()) {
+                if (auto block = ast_cast<Block_t>(body); block && !block->statementOrComments.empty()) {
+                        auto last = lastStatementFrom(block);
+                        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>();
@@ -8331,8 +8928,8 @@ private:
                 if (withContinue) {
                         if (target < 502) {
                                 if (auto block = ast_cast<Block_t>(body)) {
-                                        if (!block->statements.empty()) {
-                                                auto stmt = static_cast<Statement_t*>(block->statements.back());
+                                        if (!block->statementOrComments.empty()) {
+                                                auto stmt = lastStatementFrom(block);
                                                 if (auto breakLoop = ast_cast<BreakLoop_t>(stmt->content)) {
                                                         extraDo = breakLoop->type.is<Break_t>();
                                                 }
@@ -8341,11 +8938,11 @@ private:
                                 auto continueVar = getUnusedName("_continue_"sv);
                                 addToScope(continueVar);
                                 _continueVars.push({continueVar, nullptr});
-                                _buf << indent() << "local "sv << continueVar << " = false"sv << nll(body);
-                                _buf << indent() << "repeat"sv << nll(body);
+                                _buf << indent() << "local "sv << continueVar << " = false"sv << nl(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());
@@ -8365,14 +8962,14 @@ private:
                         if (target < 502) {
                                 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() << "if not "sv << _continueVars.top().var << " then"sv << nlr(body);
-                                _buf << indent(1) << "break"sv << nlr(body);
-                                _buf << indent() << "end"sv << nlr(body);
+                                _buf << indent() << "until true"sv << nl(body);
+                                _buf << indent() << "if not "sv << _continueVars.top().var << " then"sv << nl(body);
+                                _buf << indent(1) << "break"sv << nl(body);
+                                _buf << indent() << "end"sv << nl(body);
                                 temp.push_back(clearBuf());
                                 _continueVars.pop();
                         } else {
@@ -8386,7 +8983,7 @@ 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();
                 auto breakLoopType = getBreakLoopType(body, Empty);
                 bool withContinue = hasContinue(breakLoopType);
                 std::string conditionVar;
@@ -8396,8 +8993,8 @@ private:
                 if (withContinue) {
                         if (target < 502) {
                                 if (auto block = ast_cast<Block_t>(body)) {
-                                        if (!block->statements.empty()) {
-                                                auto stmt = static_cast<Statement_t*>(block->statements.back());
+                                        if (!block->statementOrComments.empty()) {
+                                                auto stmt = lastStatementFrom(block);
                                                 if (auto breakLoop = ast_cast<BreakLoop_t>(stmt->content)) {
                                                         extraDo = breakLoop->type.is<Break_t>();
                                                 }
@@ -8414,12 +9011,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 << continueVar << " = false"sv << nll(body);
-                                _buf << indent() << "repeat"sv << nll(body);
+                                _buf << indent() << "local "sv << conditionVar << " = false"sv << nl(body);
+                                _buf << indent() << "local "sv << continueVar << " = false"sv << nl(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());
@@ -8440,14 +9037,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() << "if not "sv << _continueVars.top().var << " then"sv << nlr(body);
-                                _buf << indent(1) << "break"sv << nlr(body);
-                                _buf << indent() << "end"sv << nlr(body);
+                                _buf << indent() << "until true"sv << nl(body);
+                                _buf << indent() << "if not "sv << _continueVars.top().var << " then"sv << nl(body);
+                                _buf << indent(1) << "break"sv << nl(body);
+                                _buf << indent() << "end"sv << nl(body);
                                 temp.push_back(clearBuf());
                                 _continueVars.pop();
                         } else {
@@ -8459,46 +9056,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);
-                auto breakLoopType = getBreakLoopType(forNode->body, Empty);
-                transformLoopBody(forNode->body, temp, breakLoopType, ExpUsage::Common);
+                transformForNumHead(forNum, temp);
+                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) {
-                auto x = forNode;
+        std::string transformForNumInner(ForNum_t* forNum, str_list& out) {
+                auto x = forNum;
                 std::string accum = getUnusedName("_accum_"sv);
                 addToScope(accum);
                 std::string len = getUnusedName("_len_"sv);
                 addToScope(len);
-                auto breakLoopType = getBreakLoopType(forNode->body, accum);
-                _buf << indent() << "local "sv << accum << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nll(forNode);
+                auto breakLoopType = getBreakLoopType(forNum->body, accum);
+                _buf << indent() << "local "sv << accum << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(forNum);
                 out.emplace_back(clearBuf());
-                _buf << indent() << "local "sv << len << " = 1"sv << nll(forNode);
+                _buf << indent() << "local "sv << len << " = 1"sv << nl(forNum);
                 auto& lenAssign = out.emplace_back(clearBuf());
-                transformForHead(forNode, out);
+                transformForNumHead(forNum, out);
                 if (hasBreakWithValue(breakLoopType)) {
                         lenAssign.clear();
-                        transformLoopBody(forNode->body, out, breakLoopType, ExpUsage::Common);
+                        transformLoopBody(forNum->body, out, breakLoopType, ExpUsage::Common);
                 } else {
                         auto expList = toAst<ExpList_t>(accum + '[' + len + ']', x);
-                        auto followStmt = toAst<Statement_t>(len + "+=1"s, forNode->body);
+                        auto followStmt = toAst<Statement_t>(len + "+=1"s, forNum->body);
                         expList->followStmt = followStmt.get();
-                        transformLoopBody(forNode->body, out, breakLoopType, ExpUsage::Assignment, expList);
+                        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) {
-                auto simpleValue = forNode->new_ptr<SimpleValue_t>();
+        void transformForNumClosure(ForNum_t* forNum, str_list& out) {
+                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;
@@ -8508,26 +9107,26 @@ private:
                 pushAnonVarArg();
                 std::string& funcStart = temp.emplace_back();
                 pushScope();
-                auto accum = transformForInner(forNode, temp);
-                temp.push_back(indent() + "return "s + accum + nlr(forNode));
+                auto accum = transformForNumInner(forNum, temp);
+                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) {
-                auto x = forNode;
+        void transformForNumInPlace(ForNum_t* forNum, str_list& out, ExpList_t* assignExpList) {
+                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>();
@@ -8536,10 +9135,10 @@ 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>();
                         returnNode->explicitReturn = false;
                         auto expListLow = toAst<ExpListLow_t>(accum, x);
@@ -8573,10 +9172,10 @@ private:
                 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));
                 }
         }
 
@@ -8587,9 +9186,9 @@ private:
                 std::string len = getUnusedName("_len_"sv);
                 addToScope(len);
                 auto breakLoopType = getBreakLoopType(forEach->body, accum);
-                _buf << indent() << "local "sv << accum << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nll(forEach);
+                _buf << indent() << "local "sv << accum << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(forEach);
                 out.emplace_back(clearBuf());
-                _buf << indent() << "local "sv << len << " = 1"sv << nll(forEach);
+                _buf << indent() << "local "sv << len << " = 1"sv << nl(forEach);
                 auto& lenAssign = out.emplace_back(clearBuf());
                 transformForEachHead(forEach->nameList, forEach->loopValue, out, true);
                 if (hasBreakWithValue(breakLoopType)) {
@@ -8605,14 +9204,16 @@ private:
                         }
                 }
                 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);
-                if (transformAsUpValueFunc(newExp(simpleValue, forEach), out)) {
+                simpleValue->value.set(forNode);
+                if (transformAsUpValueFunc(newExp(simpleValue, forNode), out)) {
                         return;
                 }
                 str_list temp;
@@ -8621,22 +9222,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);
@@ -8648,7 +9249,7 @@ 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);
@@ -8661,6 +9262,48 @@ private:
                 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>()) {
@@ -8672,8 +9315,8 @@ private:
                 }
                 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()) {
-                                _globals[key] = {name, pair->name->m_begin.m_line, pair->name->m_begin.m_col, _funcLevel > 1 ? AccessType::Capture : AccessType::Read};
+                        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, isSolidDefined(name)};
                         }
                 }
         }
@@ -8787,12 +9430,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;
                 }
         }
@@ -8823,7 +9518,7 @@ private:
                 pushScope();
                 transformClassDecl(classDecl, temp, ExpUsage::Return);
                 popScope();
-                funcStart = anonFuncStart() + nll(classDecl);
+                funcStart = anonFuncStart() + nl(classDecl);
                 temp.push_back(indent() + anonFuncEnd());
                 popAnonVarArg();
                 popFunctionScope();
@@ -8847,7 +9542,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)) {
@@ -8884,12 +9579,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) {
@@ -8898,7 +9593,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);
@@ -8928,12 +9623,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));
@@ -8996,7 +9691,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);
@@ -9004,7 +9698,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);
                                         }
@@ -9018,7 +9712,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;
@@ -9028,7 +9722,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);
@@ -9047,7 +9741,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;
                                                         }
@@ -9059,32 +9753,34 @@ private:
                                 }
                         }
                         for (const auto& classVar : classConstVars) {
-                                auto& scope = _scopes.back();
-                                scope.vars->insert_or_assign(classVar, VarType::Local);
+                                forceAddToScope(classVar);
                         }
-                        for (auto stmt_ : block->statements.objects()) {
-                                transformStatement(static_cast<Statement_t*>(stmt_), statements);
+                        forceAddToScope("self"s);
+                        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.push_back(join(commons) + nll(body));
-                                temp.push_back(indent() + '}' + nll(body));
+                                temp.back() += '{' + nl(body);
+                                temp.push_back(join(commons) + nl(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);
@@ -9117,72 +9813,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(2) << "return "sv << classVar << ".__parent.__init(self, ...)"sv << nll(classDecl);
-                                _buf << indent(1) << "end,"sv << nll(classDecl);
+                                _buf << indent(1) << "__init = function(self, ...)"sv << nl(classDecl);
+                                _buf << indent(2) << "return "sv << classVar << ".__parent.__init(self, ...)"sv << nl(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 << indent() << "}, {"sv << nll(classDecl);
+                _buf << nl(classDecl);
+                _buf << indent() << "}, {"sv << nl(classDecl);
                 if (extend) {
-                        _buf << indent(1) << "__index = function(cls, name)"sv << nll(classDecl);
-                        _buf << indent(2) << "local val = rawget("sv << baseVar << ", name)"sv << nll(classDecl);
-                        _buf << indent(2) << "if val == nil then"sv << nll(classDecl);
-                        _buf << indent(3) << "local parent = rawget(cls, \"__parent\")"sv << nll(classDecl);
-                        _buf << indent(3) << "if parent then"sv << nll(classDecl);
-                        _buf << indent(4) << "return parent[name]"sv << nll(classDecl);
-                        _buf << indent(3) << "end"sv << nll(classDecl);
-                        _buf << indent(2) << "else"sv << nll(classDecl);
-                        _buf << indent(3) << "return val"sv << nll(classDecl);
-                        _buf << indent(2) << "end"sv << nll(classDecl);
-                        _buf << indent(1) << "end,"sv << nll(classDecl);
+                        _buf << indent(1) << "__index = function(cls, name)"sv << nl(classDecl);
+                        _buf << indent(2) << "local val = rawget("sv << baseVar << ", name)"sv << nl(classDecl);
+                        _buf << indent(2) << "if val == nil then"sv << nl(classDecl);
+                        _buf << indent(3) << "local parent = rawget(cls, \"__parent\")"sv << nl(classDecl);
+                        _buf << indent(3) << "if parent then"sv << nl(classDecl);
+                        _buf << indent(4) << "return parent[name]"sv << nl(classDecl);
+                        _buf << indent(3) << "end"sv << nl(classDecl);
+                        _buf << indent(2) << "else"sv << nl(classDecl);
+                        _buf << indent(3) << "return val"sv << nl(classDecl);
+                        _buf << indent(2) << "end"sv << nl(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) << "cls.__init("sv << selfVar << ", ...)"sv << nll(classDecl);
-                _buf << indent(1) << "return "sv << selfVar << nll(classDecl);
+                _buf << indent(1) << "local "sv << selfVar << " = setmetatable({ }, "sv << baseVar << ")"sv << nl(classDecl);
+                _buf << indent(1) << "cls.__init("sv << selfVar << ", ...)"sv << nl(classDecl);
+                _buf << indent(1) << "return "sv << selfVar << nl(classDecl);
                 popScope();
-                _buf << indent(1) << "end"sv << nll(classDecl);
-                _buf << indent() << "})"sv << nll(classDecl);
-                _buf << indent() << baseVar << ".__class = "sv << classVar << nll(classDecl);
+                _buf << indent(1) << "end"sv << nl(classDecl);
+                _buf << indent() << "})"sv << nl(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(1) << parentVar << ".__inherited("sv << parentVar << ", "sv << classVar << ")"sv << nll(classDecl);
-                        _buf << indent() << "end"sv << nll(classDecl);
+                        _buf << indent() << "if "sv << parentVar << ".__inherited then"sv << nl(classDecl);
+                        _buf << indent(1) << parentVar << ".__inherited("sv << parentVar << ", "sv << classVar << ")"sv << nl(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: {
@@ -9194,7 +9890,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));
         }
@@ -9357,7 +10053,7 @@ private:
                 pushScope();
                 transformWith(with, temp, nullptr, true);
                 popScope();
-                funcStart = anonFuncStart() + nll(with);
+                funcStart = anonFuncStart() + nl(with);
                 temp.push_back(indent() + anonFuncEnd());
                 popAnonVarArg();
                 popFunctionScope();
@@ -9370,11 +10066,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) {
-                                        auto var = singleVariableFrom(with->assigns->values.objects().front(), AccessType::Read);
+                                if (with->assign->values.objects().size() == 1) {
+                                        auto var = singleVariableFrom(with->assign->values.objects().front(), AccessType::Read);
                                         if (!var.empty() && isLocal(var)) {
                                                 withVar = var;
                                         }
@@ -9384,11 +10080,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);
@@ -9398,7 +10094,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;
@@ -9411,10 +10107,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);
@@ -9430,7 +10126,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);
@@ -9484,7 +10180,7 @@ private:
                         });
                         popScope();
                         if (extraScope) {
-                                temp.push_back(indent() + "do"s + nll(with));
+                                temp.push_back(indent() + "do"s + nl(with));
                                 pushScope();
                         }
                 }
@@ -9513,49 +10209,40 @@ private:
                                 expListAssign->expList.set(expList);
                                 auto stmt = x->new_ptr<Statement_t>();
                                 stmt->content.set(expListAssign);
-                                auto whileNode = toAst<While_t>("while true do break"s, x);
+                                auto repeatNode = toAst<Repeat_t>("repeat\n\t--\nuntil true"s, x);
                                 auto block = x->new_ptr<Block_t>();
-                                block->statements.push_back(stmt);
-                                block->statements.push_back(whileNode->body);
-                                auto body = x->new_ptr<Body_t>();
-                                body->content.set(block);
-                                whileNode->body.set(block);
+                                block->statementOrComments.push_back(stmt);
+                                repeatNode->body.set(block);
                                 auto sVal = x->new_ptr<SimpleValue_t>();
-                                sVal->value.set(whileNode);
+                                sVal->value.set(repeatNode);
                                 auto asmt = assignmentFrom(toAst<Exp_t>(breakWithVar, x), newExp(sVal, x), x);
                                 transformAssignment(asmt, temp);
                         }
                 } else {
                         bool transformed = false;
                         if (!breakWithVar.empty()) {
-                                auto whileNode = toAst<While_t>("while true do break"s, x);
+                                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->statements.dup(blk->statements);
+                                        block->statementOrComments.dup(blk->statementOrComments);
                                 } else {
                                         auto stmt = with->body.to<Statement_t>();
-                                        block->statements.push_back(stmt);
-                                }
-                                auto breakLoop = whileNode->body.to<Statement_t>()->content.as<BreakLoop_t>();
-                                if (!(breakLoop && breakLoop->type.is<Break_t>())) {
-                                        block->statements.push_back(whileNode->body);
+                                        block->statementOrComments.push_back(stmt);
                                 }
-                                auto body = x->new_ptr<Body_t>();
-                                body->content.set(block);
-                                whileNode->body.set(block);
+                                repeatNode->body.set(block);
                                 auto sVal = x->new_ptr<SimpleValue_t>();
-                                sVal->value.set(whileNode);
+                                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()) {
-                                                Statement_t* stmt = static_cast<Statement_t*>(block->statements.back());
-                                                if (stmt->content.is<Return_t>()) {
+                                        if (!block->statementOrComments.empty()) {
+                                                Statement_t* stmt = lastStatementFrom(block);
+                                                if (stmt && stmt->content.is<Return_t>()) {
                                                         auto newBlock = with->body->new_ptr<Block_t>();
-                                                        newBlock->statements.dup(block->statements);
-                                                        newBlock->statements.pop_back();
+                                                        newBlock->statementOrComments.dup(block->statementOrComments);
+                                                        newBlock->statementOrComments.pop_back();
                                                         transform_plain_body(newBlock, temp, ExpUsage::Common);
                                                         auto newBody = stmt->new_ptr<Body_t>();
                                                         newBody->content.set(stmt);
@@ -9593,12 +10280,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));
         }
@@ -9808,7 +10495,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) {
@@ -9821,7 +10508,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 {
@@ -9905,12 +10592,12 @@ private:
                                 case id<CompForEach_t>():
                                         transformCompForEach(static_cast<CompForEach_t*>(item), temp);
                                         break;
-                                case id<CompFor_t>():
-                                        transformCompFor(static_cast<CompFor_t*>(item), temp);
+                                case id<CompForNum_t>():
+                                        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;
@@ -9923,27 +10610,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();
@@ -9959,21 +10646,21 @@ private:
                                 out.back().append(temp.back());
                                 if (extraScope) {
                                         popScope();
-                                        out.back().insert(0, indent() + "do"s + nll(comp));
-                                        out.back().append(indent() + "end"s + nlr(comp));
+                                        out.back().insert(0, indent() + "do"s + nl(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) {
-                transformForHead(comp->varName, comp->startValue, comp->stopValue, comp->stepValue, out);
+        void transformCompForNum(CompForNum_t* comp, str_list& out) {
+                transformForNumHead(comp->varName, comp->startValue, comp->stopValue, comp->stepValue, out);
         }
 
         void transformTableBlockIndent(TableBlockIndent_t* table, str_list& out) {
@@ -10003,25 +10690,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();
@@ -10037,8 +10763,8 @@ private:
                 tryFunc.set(tryNode->func);
                 if (auto tryBlock = tryFunc.as<Block_t>()) {
                         BLOCK_START
-                        BREAK_IF(tryBlock->statements.size() != 1);
-                        auto stmt = static_cast<Statement_t*>(tryBlock->statements.front());
+                        BREAK_IF(countStatementFrom(tryBlock) != 1);
+                        auto stmt = firstStatementFrom(tryBlock);
                         auto expListAssign = stmt->content.as<ExpListAssign_t>();
                         BREAK_IF(!expListAssign);
                         BREAK_IF(expListAssign->action);
@@ -10102,7 +10828,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);
                         }
                 }
@@ -10130,7 +10856,7 @@ private:
                                         }
                                         if (usage == ExpUsage::Common) {
                                                 out.back().insert(0, indent());
-                                                out.back().append(nlr(x));
+                                                out.back().append(nl(x));
                                         }
                                         return;
                                 }
@@ -10155,7 +10881,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)) {
@@ -10216,7 +10942,7 @@ private:
                         }
                         if (usage == ExpUsage::Common) {
                                 out.back().insert(0, indent());
-                                out.back().append(nlr(x));
+                                out.back().append(nl(x));
                         }
                         return;
                         BLOCK_END
@@ -10235,13 +10961,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()) {
@@ -10311,11 +11037,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);
@@ -10327,7 +11053,7 @@ 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));
@@ -10567,6 +11293,30 @@ private:
                 }
         }
 
+        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()) {
@@ -10579,6 +11329,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;
                 }
         }
@@ -10590,7 +11343,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();
                         }
                 }
@@ -10599,13 +11352,13 @@ private:
                 auto lenVar = getUnusedName("_len_"sv);
                 addToScope(lenVar);
                 auto breakLoopType = getBreakLoopType(whileNode->body, accumVar);
-                _buf << indent() << "local "sv << accumVar << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nll(whileNode);
+                _buf << indent() << "local "sv << accumVar << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << nl(whileNode);
                 temp.emplace_back(clearBuf());
-                _buf << indent() << "local "s << lenVar << " = 1"s << nll(whileNode);
+                _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();
                 if (hasBreakWithValue(breakLoopType)) {
                         lenAssign.clear();
@@ -10620,7 +11373,7 @@ private:
                         }
                 }
                 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));
@@ -10630,10 +11383,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));
         }
@@ -10655,12 +11408,12 @@ private:
                 auto lenVar = getUnusedName("_len_"sv);
                 addToScope(lenVar);
                 auto breakLoopType = getBreakLoopType(whileNode->body, accumVar);
-                _buf << indent() << "local "sv << accumVar << (hasBreakWithValue(breakLoopType) ? ""sv : " = { }"sv) << 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 + nll(whileNode));
+                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();
                 if (hasBreakWithValue(breakLoopType)) {
                         lenAssign.clear();
@@ -10675,10 +11428,10 @@ private:
                         }
                 }
                 popScope();
-                temp.push_back(indent() + "end"s + nlr(whileNode));
-                temp.push_back(indent() + "return "s + accumVar + nlr(whileNode));
+                temp.push_back(indent() + "end"s + nl(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();
@@ -10708,9 +11461,7 @@ private:
                         expListAssign->expList.set(expList);
                         auto stmt = x->new_ptr<Statement_t>();
                         stmt->content.set(expListAssign);
-                        auto body = x->new_ptr<Body_t>();
-                        body->content.set(stmt);
-                        repeat->body.set(body);
+                        repeat->body.set(stmt);
                         transformRepeat(repeat, out);
                         return;
                 }
@@ -10721,12 +11472,112 @@ private:
                 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();
@@ -10737,9 +11588,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());
         }
 
@@ -10760,12 +11611,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();
                                 }
                         }
@@ -10795,13 +11662,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;
                                         }
@@ -10809,17 +11676,17 @@ 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 + tabCheckVar + " = \"table\" == "s + typeVar + " or \"userdata\" == "s + typeVar + 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 + 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 chainValue = toAst<ChainValue_t>(objVar, branch);
                                 auto assignment = assignmentFrom(static_cast<Exp_t*>(valueList->exprs.front()), newExp(chainValue, branch), branch);
@@ -10862,21 +11729,21 @@ private:
                                         }
                                 }
                                 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() + "if not "s + matchVar + " then"s + nll(branch));
+                                        temp.push_back(indent() + "end"s + nl(branch));
+                                        temp.push_back(indent() + "if not "s + matchVar + " then"s + nl(branch));
                                         pushScope();
                                         addScope++;
                                 } else {
@@ -10896,7 +11763,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();
@@ -10904,7 +11771,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--;
@@ -10914,20 +11781,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));
         }
@@ -10946,7 +11813,7 @@ private:
                         }
                         auto preDefine = toLocalDecl(defs);
                         if (!preDefine.empty()) {
-                                out.push_back(preDefine + nll(local));
+                                out.push_back(preDefine + nl(local));
                         }
                 }
         }
@@ -11151,7 +12018,7 @@ 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) {
@@ -11197,13 +12064,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++) {
@@ -11224,7 +12091,7 @@ 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) {
                                 markVarLocalConst(var);
@@ -11249,7 +12116,7 @@ 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) {
                                 markVarLocalConst(name);
@@ -11270,7 +12137,7 @@ private:
                                 auto assignment = assignmentFrom(exp, breakLoop->value, breakLoop);
                                 transformAssignment(assignment, out);
                         }
-                        out.push_back(indent() + keyword + nll(breakLoop));
+                        out.push_back(indent() + keyword + nl(breakLoop));
                         return;
                 }
                 if (_continueVars.empty()) throw CompileError("continue is not inside a loop"sv, breakLoop);
@@ -11283,8 +12150,8 @@ private:
                         if (!temp.empty()) {
                                 _buf << temp.back();
                         }
-                        _buf << indent() << item.var << " = true"sv << nll(breakLoop);
-                        _buf << indent() << "break"sv << nll(breakLoop);
+                        _buf << indent() << item.var << " = true"sv << nl(breakLoop);
+                        _buf << indent() << "break"sv << nl(breakLoop);
                         out.push_back(clearBuf());
                 } else {
                         transformGoto(toAst<Goto_t>("goto "s + item.var, breakLoop), temp);
@@ -11296,7 +12163,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);
@@ -11310,16 +12177,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) {
@@ -11383,13 +12250,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 cd1fd48..1dfe978 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;
-        num_expo_hex = set("pP") >> -set("+-") >> num_char;
+        must_num_char = num_char | invalid_number_literal_error;
+        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) {
-                throw ParserError("must be followed by a statement or an indented block"sv, item.begin);
-                return false;
-        });
-
-        export_expression_error = pl::user(true_(), [](const item_t& item) {
-                throw ParserError("invalid export expression"sv, item.begin);
-                return false;
-        });
+        auto expect_error = [](std::string_view msg) {
+                return pl::user(true_(), [msg](const item_t& item) {
+                        RaiseError(msg, item);
+                        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) {
-                throw ParserError("use := for if-assignment expression"sv, item.begin);
-                return false;
-        });
+        empty_block_error = expect_error(
+                "expected a valid statement or indented block"sv
+        );
+        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) {
-                        switch (*i) {
-                                case ' ': indent++; break;
-                                case '\t': indent += 4; break;
+                if (useTab) {
+                        for (input_it i = item.begin->m_it; i != item.end->m_it; ++i) {
+                                switch (*i) {
+                                        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) {
-                int indent = 0;
-                for (input_it i = item.begin->m_it; i != item.end->m_it; ++i) {
-                        switch (*i) {
-                                case ' ': indent++; break;
-                                case '\t': indent += 4; break;
-                        }
-                }
+        advance = pl::user(plain_space, [getIndent](const item_t& item) {
+                int indent = getIndent(item);
                 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));
-        Local = key("local") >> space >> (LocalFlag | LocalValues);
+        LocalValues = NameList >> -(space >> '=' >> space >> (TableBlock | ExpListLow | expected_expression_error));
+        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;
-        import_name = ColonImportName | Variable;
-        import_name_list = Seperator >> *space_break >> space >> import_name >> *((+space_break | space >> ',' >> *space_break) >> space >> import_name);
-        ImportFrom = import_name_list >> *space_break >> space >> key("from") >> space >> (ImportLiteral | not_(String) >> Exp);
-        from_import_name_list_line = import_name >> *(space >> ',' >> space >> import_name);
+        ColonImportName = '\\' >> must_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
+        );
+        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,18 +453,22 @@ 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);
 
-        Import = key("import") >> space >> (ImportAs | ImportFrom) | FromImport;
+        Import = key("import") >> space >> (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;
 
@@ -356,9 +478,14 @@ YueParser::YueParser() {
 
         Return = key("return") >> -(space >> (TableBlock | ExpListLow));
 
-        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;
 
@@ -370,9 +497,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 |
@@ -381,45 +510,53 @@ YueParser::YueParser() {
                         +space_break >> advance_match >> space >> SwitchCase >> switch_block >> pop_indent
                 );
 
-        Assignment = -(',' >> space >> ExpList >> space) >> (':' >> Assign | and_('=') >> if_assignment_syntax_error);
-        IfCond = disable_chain_rule(disable_arg_table_block_rule(Exp >> -(space >> Assignment)));
+        Assignment = -(',' >> space >> ExpList >> space) >> (':' >> Assign | and_('=') >> assignment_expression_syntax_error);
+        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;
-        While = WhileType >> space >> disable_do_chain_arg_table_block_rule(Exp >> -(space >> Assignment)) >> space >> opt_body_with("do");
-        Repeat = key("repeat") >> space >> Body >> line_break >> *space_break >> check_indent_match >> space >> key("until") >> space >> Exp;
+        WhileType = (expr("while") | pl::user("until", [](const item_t& item) {
+                State* st = reinterpret_cast<State*>(item.user_data);
+                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;
-        for_args = Variable >> space >> '=' >> space >> Exp >> space >> ',' >> space >> Exp >> space >> -ForStepValue;
+        ForStepValue = ',' >> space >> must_exp;
+        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;
         });
 
@@ -437,46 +574,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->noChainBlockStack.push(true);
-                st->noTableBlockStack.push(true);
+                st->noDoStack.push_back(true);
+                st->noChainBlockStack.push_back(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->noChainBlockStack.pop();
-                st->noTableBlockStack.pop();
+                st->noDoStack.pop_back();
+                st->noChainBlockStack.pop_back();
+                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;
         });
 
-        CatchBlock = line_break >> *space_break >> check_indent_match >> space >> key("catch") >> space >> Variable >> space >> in_block;
-        Try = key("try") >> space >> (in_block | Exp) >> -CatchBlock;
+        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 >> must_variable >> space >> (in_block | invalid_try_syntax_error);
+        Try = key("try") >> -ExistentialOp >> space >> (in_block | Exp | invalid_try_syntax_error) >> -CatchBlock;
 
         list_value =
                 and_(
@@ -498,28 +647,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 >> ']' |
-                                (list_value_list >> -(space >> ',') | space >> ',')  >> -list_lit_lines >> white >> ']'
+                                CompFor >> space >> end_brackets_expression |
+                                (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;
-        TblComprehension = and_('{') >> ('{' >> space >> disable_for_rule(Exp >> space >> -(CompValue >> space)) >> CompInner >> space >> '}' | braces_expression_error);
+        end_braces_expression = '}' | braces_expression_error;
 
-        CompInner = Seperator >> (CompForEach | CompFor) >> *(space >> comp_clause);
-        StarExp = '*' >> space >> Exp;
-        CompForEach = key("for") >> space >> AssignableNameList >> space >> key("in") >> space >> (StarExp | Exp);
-        CompFor = key("for") >> space >> Variable >> space >> '=' >> space >> Exp >> space >> ',' >> space >> Exp >> -ForStepValue;
-        comp_clause = CompFor | CompForEach | key("when") >> space >> Exp;
+        CompValue = ',' >> space >> must_exp;
+        TblComprehension = '{' >> space >> disable_for_rule(Exp >> space >> -(CompValue >> space)) >> (CompFor | braces_expression_error) >> space >> end_braces_expression;
+
+        CompFor = key("for") >> space >> Seperator >> (CompForNum | CompForEach) >> *(space >> comp_clause);
+        StarExp = '*' >> space >> must_exp;
+        CompForEach = AssignableNameList >> space >> key("in") >> space >> (StarExp | must_exp);
+        CompForNum = Variable >> space >> '=' >> space >> must_exp >> space >> ',' >> space >> must_exp >> -ForStepValue;
+        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 =
@@ -527,7 +681,7 @@ YueParser::YueParser() {
                 ">>" | "<<" | "??" |
                 set("+-*/%&|^");
 
-        Update = UpdateOp >> '=' >> space >> Exp;
+        Update = UpdateOp >> '=' >> space >> must_exp;
 
         Assignable = AssignableChain | Variable | SelfItem;
 
@@ -548,35 +702,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;
-        Exp = Seperator >> pipe_exp >> *(space >> ExpOpValue) >> -(space >> "??" >> space >> Exp);
+        ExpOpValue = BinaryOperator >> *space_break >> space >> (pipe_exp | expected_expression_error);
+        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 =
@@ -591,7 +748,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;
         });
@@ -606,14 +763,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 >> '"';
-        String = DoubleString | SingleString | LuaString;
+        DoubleString = '"' >> Seperator >> *DoubleStringContent >> ('"' | unclosed_double_string_error);
+
+        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('=') >> ']';
@@ -633,15 +798,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
         );
@@ -651,14 +816,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 = (
@@ -683,7 +848,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 |
@@ -722,10 +888,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
         );
@@ -734,13 +898,15 @@ YueParser::YueParser() {
 
         TableLit =
                 '{' >> Seperator >>
-                -(space >> table_value_list >> -(space >> ',')) >>
-                -table_lit_lines >>
-                white >> '}';
+                -(space >> table_value >> *(space >> ',' >> space >> table_value) >> -(space >> ',')) >>
+                (
+                        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)));
 
@@ -755,13 +921,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("using") >> prevent_indent >> space >> ensure(ExpList, pop_indent))
+                        -(space >> key("extends") >> prevent_indent >> space >> ensure(must_exp, 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 | ExpListLow | expected_expression_error));
         GlobalOp = expr('*') | '^';
-        Global = key("global") >> space >> (-(ConstAttrib >> space) >> ClassDecl | GlobalOp | -(ConstAttrib >> space) >> GlobalValues);
+        Global = key("global") >> space >> (
+                -(ConstAttrib >> space) >> ClassDecl |
+                GlobalOp |
+                -(ConstAttrib >> space) >> GlobalValues |
+                invalid_global_declaration_error
+        );
 
         ExportDefault = key("default");
 
@@ -773,10 +944,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;
@@ -784,17 +955,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;
@@ -809,7 +980,8 @@ YueParser::YueParser() {
                         State* st = reinterpret_cast<State*>(item.user_data);
                         st->exportMacro = true;
                         return true;
-                })
+                }) |
+                invalid_export_syntax_error
         ) >> not_(space >> StatementAppendix);
 
         VariablePair = ':' >> Variable;
@@ -819,13 +991,13 @@ YueParser::YueParser() {
                         KeyName |
                         '[' >> not_('[') >> space >> Exp >> space >> ']' |
                         String
-                ) >> ':' >> not_(':') >> space >>
-                (Exp | TableBlock | +space_break >> space >> Exp);
+                ) >> ':' >> not_(':' | '=' >> not_('>')) >> space >>
+                (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;
@@ -843,29 +1015,39 @@ 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 >> (
-                fn_arg_def_lit_lines >> -(-(space >> ',') >> white >> VarArg) |
-                white >> VarArg
-        );
+        check_vararg_position = and_(white >> (')' | key("using"))) | white >> -(',' >> white) >> vararg_position_error;
 
-        OuterVarShadow = key("using") >> space >> (NameList | key("nil"));
+        var_arg_def = (
+                VarArgDef |
+                +space_break >> push_indent_match >> ensure(space >> VarArgDef >> -(space >> '`' >> space >> Name), pop_indent)
+        ) >> check_vararg_position;
 
-        FnArgsDef = '(' >> *space_break >> -FnArgDefList >> -(white >> OuterVarShadow) >> white >> ')';
+        FnArgDefList = Seperator >>
+                -fn_arg_def_list >>
+                -(-(space >> ',') >> +space_break >> fn_arg_def_lit_lines) >>
+                -(-(space >> ',') >> space >> var_arg_def);
+
+        OuterVarShadow = key("using") >> space >> (key("nil") | NameList);
+
+        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);
@@ -877,23 +1059,30 @@ YueParser::YueParser() {
         ) >> 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);
-        NameOrDestructure = Variable | TableLit | Comprehension;
+        must_variable = Variable | and_(LuaKeyword >> not_alpha_num) >> keyword_as_identifier_syntax_error | expected_indentifier_error;
+
+        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 >>
-                *(+space_break >> check_indent_match >> space >> pipe_operator >> space >> UnaryExp);
+                pipe_operator >> space >> must_unary_exp >>
+                *(+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);
@@ -903,7 +1092,7 @@ YueParser::YueParser() {
 
         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 =
@@ -912,38 +1101,17 @@ 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 |
-                        leading_spaces_error
+                        arg_table_block
                 );
 
         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;
 
@@ -952,63 +1120,59 @@ YueParser::YueParser() {
         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) >> space;
         Statement =
-                Seperator >>
-                -(
-                        yue_comment >>
-                        *(line_break >> yue_comment) >>
-                        line_break >>
-                        check_indent_match
-                ) >>
-                space >> (
-                        Import | While | Repeat | For | ForEach |
+                (
+                        Import | While | Repeat | For |
                         Return | Local | Global | Export | Macro |
                         MacroInPlace | BreakLoop | Label | Goto | ShortTabAppending |
                         LocalAttrib | Backcall | PipeBody | ExpListAssign | ChainAssign |
-                        StatementAppendix >> empty_block_error
-                ) >>
-                space >>
+                        StatementAppendix >> empty_block_error |
+                        and_(key("else") | key("elseif") | key("when")) >> dangling_clause_error
+                ) >> space >>
                 -StatementAppendix;
 
         StatementSep = white >> (set("('\"") | "[[" | "[=");
 
         Body = in_block | Statement;
 
-        empty_line_break =
-                check_indent >> (multi_line_comment >> space | comment) >> and_(stop) |
-                advance >> ensure(multi_line_comment >> space | comment, pop_indent) >> and_(stop) |
-                plain_space >> and_(line_break);
+        YueLineComment = *(not_(set("\r\n")) >> any_char);
+        yue_line_comment = "--" >> YueLineComment >> and_(stop);
+        YueMultilineComment = multi_line_content;
+        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 = (
-                check_indent_match >> Statement |
-                empty_line_break |
+        line = *(EmptyLine >> line_break) >> (
+                check_indent_match >> space >> Statement |
+                YueComment |
                 advance_match >> ensure(space >> (indentation_error | Statement), pop_indent)
         );
-        Block = Seperator >> line >> *(+line_break >> line);
+        Block = Seperator >> (pl::user(true_(), [](const item_t& item) {
+                State* st = reinterpret_cast<State*>(item.user_data);
+                return st->lax;
+        }) >> lax_line >> *(line_break >> lax_line) | line >> *(line_break >> line));
 
         shebang = "#!" >> *(not_(stop) >> any_char);
-        BlockEnd = Block >> white >> stop;
-        File = -shebang >> -Block >> white >> stop;
+        BlockEnd = Block >> plain_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
 
@@ -1019,7 +1183,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>();
                 }
@@ -1038,24 +1202,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;
@@ -1093,29 +1258,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 {
@@ -1141,6 +1308,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 {
@@ -1174,7 +1359,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 4488685..acb56d0 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) {
-                return parse(codes, getRule<AST>());
+        ParseInfo parse(std::string_view codes, bool lax) {
+                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::stack<bool> noChainBlockStack;
-                std::stack<bool> noTableBlockStack;
-                std::stack<bool> noForStack;
+                std::vector<bool> noDoStack;
+                std::vector<bool> noChainBlockStack;
+                std::vector<bool> noTableBlockStack;
+                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,17 @@ 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(yue_comment);
+        NONE_AST_RULE(comment_line);
         NONE_AST_RULE(yue_line_comment);
+        NONE_AST_RULE(yue_multiline_comment);
         NONE_AST_RULE(line);
         NONE_AST_RULE(shebang);
+        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 +333,7 @@ private:
         AST_RULE(SelfItem);
         AST_RULE(KeyName);
         AST_RULE(VarArg);
+        AST_RULE(VarArgDef);
         AST_RULE(Seperator);
         AST_RULE(NameList);
         AST_RULE(LocalFlag);
@@ -315,6 +351,7 @@ private:
         AST_RULE(ImportAllMacro);
         AST_RULE(ImportTabLit);
         AST_RULE(ImportAs);
+        AST_RULE(ImportGlobal);
         AST_RULE(Import);
         AST_RULE(Label);
         AST_RULE(Goto);
@@ -339,6 +376,7 @@ private:
         AST_RULE(Repeat);
         AST_RULE(ForStepValue);
         AST_RULE(For);
+        AST_RULE(ForNum);
         AST_RULE(ForEach);
         AST_RULE(Do);
         AST_RULE(CatchBlock);
@@ -348,8 +386,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);
@@ -360,6 +398,7 @@ private:
         AST_RULE(ExpOpValue);
         AST_RULE(Exp);
         AST_RULE(Callable);
+        AST_RULE(ReversedIndex);
         AST_RULE(ChainValue);
         AST_RULE(SimpleTable);
         AST_RULE(SimpleValue);
@@ -372,6 +411,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);
@@ -435,8 +479,9 @@ private:
         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);
@@ -447,6 +492,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="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lauxlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lbaselib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lbitlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcode.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcorolib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lctype.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldblib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldebug.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldo.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldump.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lfunc.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lgc.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\linit.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\liolib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llex.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmathlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmem.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\loadlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lobject.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lopcodes.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\loslib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lparser.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstate.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstring.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstrlib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltable.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltablib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltm.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lundump.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lutf8lib.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lvm.c" />
-    <ClCompile Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lzio.c" />
+    <ClCompile Include="lapi.c" />
+    <ClCompile Include="lauxlib.c" />
+    <ClCompile Include="lbaselib.c" />
+    <ClCompile Include="lbitlib.c" />
+    <ClCompile Include="lcode.c" />
+    <ClCompile Include="lcorolib.c" />
+    <ClCompile Include="lctype.c" />
+    <ClCompile Include="ldblib.c" />
+    <ClCompile Include="ldebug.c" />
+    <ClCompile Include="ldo.c" />
+    <ClCompile Include="ldump.c" />
+    <ClCompile Include="lfunc.c" />
+    <ClCompile Include="lgc.c" />
+    <ClCompile Include="linit.c" />
+    <ClCompile Include="liolib.c" />
+    <ClCompile Include="llex.c" />
+    <ClCompile Include="lmathlib.c" />
+    <ClCompile Include="lmem.c" />
+    <ClCompile Include="loadlib.c" />
+    <ClCompile Include="lobject.c" />
+    <ClCompile Include="lopcodes.c" />
+    <ClCompile Include="loslib.c" />
+    <ClCompile Include="lparser.c" />
+    <ClCompile Include="lstate.c" />
+    <ClCompile Include="lstring.c" />
+    <ClCompile Include="lstrlib.c" />
+    <ClCompile Include="ltable.c" />
+    <ClCompile Include="ltablib.c" />
+    <ClCompile Include="ltm.c" />
+    <ClCompile Include="lundump.c" />
+    <ClCompile Include="lutf8lib.c" />
+    <ClCompile Include="lvm.c" />
+    <ClCompile Include="lzio.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lapi.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lauxlib.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lcode.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lctype.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldebug.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ldo.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lfunc.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lgc.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llex.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\llimits.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lmem.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lobject.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lopcodes.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lparser.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lprefix.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstate.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lstring.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltable.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\ltm.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lua.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lua.hpp" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\luaconf.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lualib.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lundump.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lvm.h" />
-    <ClInclude Include="\\Mac\Home\Workspace\Yuescript\win-build\Lua53\lzio.h" />
+    <ClInclude Include="lapi.h" />
+    <ClInclude Include="lauxlib.h" />
+    <ClInclude Include="lcode.h" />
+    <ClInclude Include="lctype.h" />
+    <ClInclude Include="ldebug.h" />
+    <ClInclude Include="ldo.h" />
+    <ClInclude Include="lfunc.h" />
+    <ClInclude Include="lgc.h" />
+    <ClInclude Include="llex.h" />
+    <ClInclude Include="llimits.h" />
+    <ClInclude Include="lmem.h" />
+    <ClInclude Include="lobject.h" />
+    <ClInclude Include="lopcodes.h" />
+    <ClInclude Include="lparser.h" />
+    <ClInclude Include="lprefix.h" />
+    <ClInclude Include="lstate.h" />
+    <ClInclude Include="lstring.h" />
+    <ClInclude Include="ltable.h" />
+    <ClInclude Include="ltm.h" />
+    <ClInclude Include="lua.h" />
+    <ClInclude Include="lua.hpp" />
+    <ClInclude Include="luaconf.h" />
+    <ClInclude Include="lualib.h" />
+    <ClInclude Include="lundump.h" />
+    <ClInclude Include="lvm.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>