30 files changed, 1072 insertions, 96 deletions

diff --git a/spec/inputs/backcall.yue b/spec/inputs/backcall.yue
index 8aadc71..e6b8c21 100644
--- a/spec/inputs/backcall.yue
+++ b/spec/inputs/backcall.yue
@@ -13,9 +13,9 @@ do
         x > 2
 
 do
-        (data) <- http?.get "ajaxtest"
+        data <- http?.get "ajaxtest"
         body[".result"]\html data
-        (processed) <- http.post "ajaxprocess", data
+        processed <- http.post "ajaxprocess", data
         body[".result"]\append processed
         <- setTimeout 1000
         print "done"
diff --git a/spec/inputs/destructure.yue b/spec/inputs/destructure.yue
index 674dfe4..179056c 100644
--- a/spec/inputs/destructure.yue
+++ b/spec/inputs/destructure.yue
@@ -94,7 +94,7 @@ do
 --
 
 do
-        with {a,b} = thing
+        with {a,b} := thing
                 print a, b
 
 
@@ -240,5 +240,53 @@ do
         switch tb
                 when {c: {<"abc">: meta_field = "def"}, <[[any string]]>: {d: abc = 123}, <'str'>: {e: def = {}}}
                         print meta_field, abc, def
+
+do
+        clients = ["VIP_Alice", "User_Bob", "User_Clara", "VIP_Eva"]
+        [vipStart, ...regulars, vipEnd] = clients
+        print vipStart -- "VIP_Alice"
+        print regulars -- {"User_Bob", "User_Clara"}
+        print vipEnd   -- "VIP_Eva"
+
+do
+        setupMeeting = (participants) ->
+                [chair, ..._, secretary] = participants
+                print chair, secretary
+
+        setupMeeting ["Alice", "Bob", "Charlie", "David"]
+        -- Output: Alice David
+
+do
+        getTransactions = ->
+                {
+                        {id: "T1", amount: 100}
+                        {id: "T2", amount: 200}
+                        {id: "T3", amount: 300}
+                }
+
+        :id, :amount = getTransactions![#]
+        assert id == "T3"
+        assert amount == 300
+
+do
+        [
+                _
+                ...middle
+                _
+        ] = tb
+
+do
+        {a, :abc, b, :def, ...sub, d, e} = tb
+
+do
+        for {:a, :b} in *items
+                print a, b
+        
+        for :a, :b in *items
+                print a, b
+        
+        for :body in pairs data
+                print body if body
+
 nil
 
diff --git a/spec/inputs/funcs.yue b/spec/inputs/funcs.yue
index e647edc..d19c2d1 100644
--- a/spec/inputs/funcs.yue
+++ b/spec/inputs/funcs.yue
@@ -98,7 +98,7 @@ f(
 
 x = (a,
         b) ->
-         print "what"
+                print "what"
 
 
 y = (a="hi",
@@ -193,4 +193,35 @@ do
         func = (): -> check 123
         print func! -- get nil
 
+do
+        f = ({:a, :b, :c}) -> print a, b, c
+        f = (:a, :b, :c) -> print a, b, c
+        g = (x, :y) -> print x, y
+        i = ({a: ax = 0, b: by = 0}) -> print ax, by
+        j = (name, {id: uid = "n/a", :role = "guest"}) -> print name, uid, role
+        m = ({user: {:name, :age}, meta: {:ver = 1}}) -> print name, age, ver
+        m1 = ({user: {:name, :age}, :meta = {}}) -> print name, age, meta and meta.ver or "nil"
+        new = ({:name = "anon", :age = 0}) =>
+                @name = name
+                @age  = age
+        set = ({:name = @name, :age = @age}) =>
+                @name = name
+                @age = age
+        logKV = ({:k, :v}, ...) ->
+                print "kv:", k, v
+                print "rest count:", select "#", ...
+        macro gen = (fname) -> |
+                #{fname} = ({:a, :b = 0}) -> print a, b
+        $gen foo
+        t1 = (:a, x) -> print a, x
+        t2 = (:a) -> print a
+        w = (
+                id
+                {:x = 0, :y = 0}
+                :flag
+        ) ->
+                print id, x, y, flag
+        g1 = ({:a, a: ax}) -> print a, ax
+        g4 = ({:a, :b, ...rest}) -> print a, b
+
 nil
diff --git a/spec/inputs/global.yue b/spec/inputs/global.yue
index ce1cc15..4e3b8aa 100644
--- a/spec/inputs/global.yue
+++ b/spec/inputs/global.yue
@@ -82,3 +82,9 @@ do
         FooBar = "pascal case"
         FOOBAR = "all uppercase"
 
+do
+        global const class A
+        global const Flag = 1
+        global const const, x, y = "const", 1, 2
+        global const math, table
+
diff --git a/spec/inputs/import.yue b/spec/inputs/import.yue
index b8ffc24..ee1fdfc 100644
--- a/spec/inputs/import.yue
+++ b/spec/inputs/import.yue
@@ -23,7 +23,7 @@ do
                 b, c from z
 
 do
-        import a
+        import a,
                 b
                 c from z
 
@@ -139,3 +139,13 @@ do
         import "m" as {c: d}
         import "m" as {g, {<close>: i}}
 
+do
+        import require
+        import string as stringlib
+        import string.format
+        import io.read as io_read
+
+        type = ->
+        import type as tp
+        import 月 as yue
+
diff --git a/spec/inputs/import_global.yue b/spec/inputs/import_global.yue
new file mode 100644
index 0000000..18f0e85
--- /dev/null
+++ b/spec/inputs/import_global.yue
@@ -0,0 +1,93 @@
+
+do
+        import global
+        print "hello"
+        math.random 10
+
+do
+        import global
+        value = 1
+        value += 2
+        print value
+
+do
+        local print = (msg) ->
+                return msg
+        do
+                import global
+                print "local"
+                math.random 1
+
+do
+        import global
+        local tostring = (v) -> "local"
+        tostring "value"
+        print tostring 123
+
+do
+        func = (x, y) ->
+                import global
+                return type x, tostring y, print
+        func 1, 2
+
+do
+        import global
+        try
+                func "hello #{world}"
+        catch err
+                print err
+
+do
+        import global
+        global FLAG
+        print FLAG
+        FLAG = 123
+
+do
+        import global
+        global Foo = 10
+        print Foo
+        Foo += 2
+
+do
+        import global
+        global Bar, Baz
+        Bar = 1
+        Baz = 2
+        print Bar, Baz
+
+do
+        import global
+        global *
+        x = 3434
+        if y then
+                x = 10
+
+do
+        import global
+        global ^
+        foobar = "all #{lowercase}"
+        FooBar = "pascal case"
+        FOOBAR = "all #{Uppercase}"
+
+do
+        import global
+        global const class A
+        global const Flag = 1
+        global const const, x, y = "const", 1, 2
+        global const math, table
+        print math, table
+
+do
+        import global
+        with X
+                \func 1, 2, 3
+                .tag = "abc"
+
+do
+        import global
+
+        f = ->
+                func!
+                try func
+
diff --git a/spec/inputs/lists.yue b/spec/inputs/lists.yue
index 921cae0..dd951a5 100644
--- a/spec/inputs/lists.yue
+++ b/spec/inputs/lists.yue
@@ -87,4 +87,194 @@ do
         [a, b] = hello
         [name = "nameless", job = "jobless"] = person
 
+do
+        transactions = ["T001", "T002", "T003", "T004", "T005"]
+        middleTransactions = transactions[2, -2]
+        print middleTransactions -- => {"T002", "T003", "T004"}
+
+do
+        logs =
+                - start: 0, end: 100
+                - start: 100, end: 200
+                - start: 200, end: 123
+        print logs[#].end -- => 123
+
+do
+        pendingOrders = ["O001", "O002", "O003", "O004"]
+        print pendingOrders[# - 1] -- => "O003" 
+
+do
+        getOrders = ->
+                {
+                        { id: "O1001", status: "pending" }
+                        { id: "O1002", status: "processing" }
+                        { id: "O1003", status: "done" }
+                }
+
+        lastStatus = getOrders()[#].status
+        assert lastStatus == "done"
+
+do
+        cloneList1 = (list) -> list[,]
+        cloneList2 = (list) -> [...list,]
+        cloneTable = (tb) -> {...tb}
+
+do
+        print(
+                globalTB[#]
+                a.b.c[# - 2]
+                x?\y?!.z?[# - 3]
+        )
+
+do
+        f = ->
+                print(
+                        globalTB[#]\end 123
+                        a.b.c[5,-5][# - 2]
+                        x?\y?!.z?[# - 3]?[, -3]
+                )
+
+do
+        tb = [1, 2, 3]
+        tb[#] = 40
+        tb[# - 1] = 20
+
+do
+        a = b = c = "x"
+        lst = []
+        lst[#] = a
+        lst[# - 1] = b
+
+do
+        x, y, z = 1, 2, 3
+        arr = []
+        arr[#], head = x, y
+        arr[#] = z
+
+do
+        triple = ["keep", "skip", "tail"]
+        [head, _, tailv] = triple
+        buf = []
+        buf[#] = head
+        buf[#] = tailv
+
+do
+        src = ["a", "", "c", nil, "d"]
+        collected = []
+        for item in *src
+                if item and #item > 0
+                        collected[#] = item
+
+do
+        nums = [1, 2, 3, 4, 5]
+        last_two = [v for v in *nums when v > 3]
+        nums[#] = last_two[1]
+        nums[#] = last_two[2]
+
+do
+        store = []
+        store[#] = { meta: { id: 1, ok: true }, payload: [10, 20] }
+        store[#] = { meta: { id: 1, ok: false }, payload: [10, 20, 30] }
+
+do
+        f = ->
+                q = []
+                tb.tmp = [n for n = 1, 4]
+                if #tb.tmp >= 3
+                        q[#] = {head: tb.tmp[1], tail: tb.tmp[#]}
+
+do
+        make_pair = (a, b) -> [a, b]
+        pairs = []
+        p1 = make_pair 7, 8
+        pairs[#] = p1
+        k, v = "key", 42
+        pairs[#] = {k: k, v: v}
+
+do
+        cfg = {mode: "safe", tags: []}
+        if cfg.mode == "safe"
+                cfg.mode = "fast"
+                cfg.tags[#] = "newbie"
+
+do
+        mat = [ [1,2], [3,4], [5,6]]
+        last_row = mat[#]
+        rows = []
+        rows[#] = last_row[1]
+
+do
+        kv = []
+        kv[#] = {k: "a", v: 1}
+        kv[#] = {k: "b", v: 2}
+        pair_last = kv[#]
+        dict = {}
+        dict[pair_last.k] = pair_last.v
+        dict[pair_last.k] = 3
+
+do
+        base = [ i for i = 1, 4 ]
+        pack = []
+        pack[#] = [ base[1], base[#] ]
+        pack[#] = { first: base[1], last: base[#] }
+
+do
+        opts = {limit: 10}
+        {:limit, :offset = 0} = opts
+        pages = []
+        pages[#] = {limit: limit, offset: offset}
+
+do
+        chain = { a: { b: { c: 0 } }, list: [ {x:0}, {x:0} ] }
+        chain.a.b.c = 1
+        chain.list[1].x = 10
+        chain.list[#].x = 20
+        chain.list[# - 1] = { x: 30 }
+
+do
+        node = {left: {v:0}, right: {v:0}}
+        bag = []
+        { :left, :right } = node
+        bag[#], left.v, right.v = "k", 1, 2
+
+do
+        a1, a2, a3 = 100, 200, 300
+        mix = []
+        mix[#], mix[#], meta = a1, a2, {tag: "ok"}
+
+do
+        cfg2 = {limit: 5, opts: {flag: false}}
+        {limit: lim, opts: opt2} = cfg2
+        bucket = {xs: []}
+        bucket.xs[#], bucket.flag, opt2.flags[] = lim, true, 123
+
+do
+        ret2 = ()-> 7, 8
+        box = []
+        box[#], x1 = ret2!
+
+do
+        q = [1, 2]
+        lastq = q[#]
+        q[# - 1] = lastq * 10
+
+do
+        mat2 = [[9,8], [7,6]]
+        t = { hold: nil }
+        t.hold = mat2[#][1]
+
+do
+        f = -> globalTB[#][#] = 1
+        f1 = -> globalTB[#][# - 1]
+
+do
+        tbA[] = ...tbB
+        a, tb[], b[], c = 1, ...x, 3, 4
+
+        data =
+                a: {1,2,3}
+                b: {4,5,6}
+
+        flat = [...v for k,v in pairs data]
+
 nil
diff --git a/spec/inputs/loops.yue b/spec/inputs/loops.yue
index c5b28b3..5df10ca 100644
--- a/spec/inputs/loops.yue
+++ b/spec/inputs/loops.yue
@@ -213,3 +213,55 @@ do
 do
         until x := func 'a', b do
                 print "false expected"
+
+do
+        index = for i = 1, #tb
+                break i if tb[i]
+
+        f for i = 1, #tb
+                break i if tb[i]
+
+        f for i = 1, #tb
+                i if tb[i]
+
+        i = 1
+        ids = while tb[i]
+                i += 1
+                i - 1
+
+        i = 1
+        idx = while tb[i]
+                i += 1
+                break i - 1
+
+        f1 = ->
+                i = 1
+                f while tb[i]
+                        i += 1
+                        i - 1
+
+        i = 1
+        f while tb[i]
+                i += 1
+                break i - 1
+
+        list = for item in *items
+                switch item
+                        when type: "A", :value
+                                if value > 5
+                                        item
+
+do
+        repeat print 1 until true
+
+        x = repeat
+                a = func!
+                break a.x
+        until a.v
+
+        items = repeat
+                item = getItem!
+                break unless item
+                item if item.value > 0
+        until false
+
diff --git a/spec/inputs/macro.yue b/spec/inputs/macro.yue
index 5d5f1a9..191f09f 100644
--- a/spec/inputs/macro.yue
+++ b/spec/inputs/macro.yue
@@ -60,6 +60,11 @@ macro NumAndStr = (num, str) ->
 
 print $NumAndStr 123, 'xyz'
 
+macro NumAndStr2 = (num`Num, str`SingleString) -> |
+        [#{num}, #{str}]
+
+print $NumAndStr2 456, 'abc'
+
 $asserts item == nil
 
 $myconfig false
@@ -100,13 +105,14 @@ macro filter = (items, action)->
         $showMacro "filter", "[_ for _ in *#{items} when #{action}]"
 
 macro reduce = (items, def, action)->
-        $showMacro "reduce", "if ##{items} == 0
-        #{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 49d47f3..2b0669c 100644
--- a/spec/inputs/switch.yue
+++ b/spec/inputs/switch.yue
@@ -165,5 +165,128 @@ do
                         print item
                 when [a = 1, b = "abc"]
                         print a, b
-nil
 
+do
+        switch tb
+                when [1, 2, 3]
+                        print "1, 2, 3"
+                when [1, b, 3]
+                        print "1, #{b}, 3"
+                when [1, 2, b = 3]
+                        print "1, 2, #{b}"
+
+do
+        switch tb
+                when success: true, :result
+                        print "success", result
+                when success: false
+                        print "failed", result
+                else
+                        print "invalid"
+
+do
+        switch tb
+                when {type: "success", :content}
+                        print "success", content
+                when {type: "error", :content}
+                        print "failed", content
+                else
+                        print "invalid"
+
+do
+        switch tb
+                when [
+                                {a: 1, b: 2}
+                                {a: 3, b: 4}
+                                {a: 5, b: 6}
+                                fourth
+                        ]
+                        print "matched", fourth
+
+        switch tb
+                when [
+                                {c: 1, d: 2}
+                                {c: 3, d: 4}
+                                {c: 5, d: 6}
+                        ]
+                        print "OK"
+                when [
+                                _
+                                _
+                                {a: 1, b: 2}
+                                {a: 3, b: 4}
+                                {a: 5, b: 6}
+                                sixth
+                        ]
+                        print "matched", sixth
+
+do
+        switch v := "hello"
+                when "hello"
+                        print "matched hello"
+                else
+                        print "not matched"
+        -- output: matched hello
+
+do
+        f = -> "ok"
+        switch val := f!
+                when "ok"
+                        print "it's ok"
+        -- output: it's ok
+
+
+do
+        g = -> 42
+        switch result := g!
+                when 1, 2
+                        print "small"
+                when 42
+                        print "life universe everything"
+                else
+                        print "other #{result}"
+        -- output: life universe everything
+
+do
+        check = ->
+                if true
+                        "yes"
+                else
+                        "no"
+
+        switch x := check!
+                when "yes"
+                        print "affirmative"
+                else
+                        print "negative"
+        -- output: affirmative
+
+do
+        t = (): tb ->
+                tb = {a: 1}
+                tb.a = 2
+
+        switch data := t!
+                when {a: 2}
+                        print "matched"
+                else
+                        print "not matched"
+
+do
+        clientData = ["Meta", "CUST_1001", "CHK123"]
+        switch clientData
+                when [...metadata, customerId, checksum]
+                        print metadata -- {"Meta"}
+                        print customerId -- "CUST_1001"
+                        print checksum -- "CHK123"
+
+do
+        handlePath = (segments) ->
+                switch segments
+                        when [..._, resource, action]
+                                print "Resource:", resource
+                                print "Action:", action
+
+        handlePath ["admin", "logs", "view"]
+
+nil
diff --git a/spec/inputs/syntax.yue b/spec/inputs/syntax.yue
index a414d6f..a63f629 100644
--- a/spec/inputs/syntax.yue
+++ b/spec/inputs/syntax.yue
@@ -7,7 +7,7 @@ a, bunch, go, here = another, world, nil, nil
 func arg1, arg2, another, arg3
 
 here, we = () ->, yeah
-the, different = () -> approach; yeah
+the, different = (() -> approach), yeah
 
 dad()
 dad(lord)
@@ -321,7 +321,7 @@ ajax url,
         (error) ->
                 print error
 
--- 
+--
 a += 3 - 5
 a *= 3 + 5
 a *= 3
@@ -392,7 +392,7 @@ invokeA(
 v = {
         a -1
         a(
--1)
+        -1)
         a \
 - 1
         a-1
@@ -405,7 +405,7 @@ v = {
 
         a ~1
         a(
-~1)
+        ~1)
         a \
 ~ 1
         a~1
@@ -478,5 +478,65 @@ do
         f2 = ->
                 --
 
+do
+        return res if res ~= ""
+
+
+do
+        return res if res ~= ""
+                --
+
+do
+        -- Simple one-liners
+        x = 1; y = 2
+
+        -- Short related statements
+        i += 1; j += 1
+
+        if condition
+                setup!; run!; cleanup!
+
+        a = 1; b = 2; c = a + b
+        print a; print b; print c
+
+        f = ->
+                a = 1; b = 2; a + b
+
+        a = 1;
+        b = 2;
+
+        success, result = try func!; print result if success
+
+        value = "foo"; print value; value = value .. "bar"; print value
+
+        do
+                if ok then print "ok!"; return 42
+
+        for i=1,3
+                print i; continue
+
+        n = 0
+        while n < 2
+                print "n=", n; n += 1
+
+        obj = {}
+        obj\set 10; obj\get!; print "done"
+
+        with tbl
+                \push 1; print "push"
+
+        a = 5
+        if a > 3
+                print "big"; b = a * 2; print b
+        else
+                print "small"; b = a
+
+        try
+                x = 1; y = 2; print x + y
+        catch err
+                print "error:", err
+
+q = 1 --[[it's q]]; --[[got w]] w = 2; e = 3; print --[[param q]] q, w, e; --[[here]] -- line ends
+
 nil
 
diff --git a/spec/inputs/tables.yue b/spec/inputs/tables.yue
index 0de8a8c..702e04a 100644
--- a/spec/inputs/tables.yue
+++ b/spec/inputs/tables.yue
@@ -245,6 +245,24 @@ menus =
                                 click: ->
                         }
 
+_ =
+        boolean:
+                - true
+                - false
+        float:
+                - 3.14
+                - -6.8523015e+5
+        int:
+                - 123
+                - -0b1010_0111_0100_1010_1110
+        null:
+                nodeName: 'node'
+                parent: nil
+        string:
+                - 'Hello world'
+                - "newline
+newline2"
+
 tb = {...other}
 
 tbMix = {
diff --git a/spec/inputs/test/format_spec.yue b/spec/inputs/test/format_spec.yue
index cbd9d22..3ad2c7f 100644
--- a/spec/inputs/test/format_spec.yue
+++ b/spec/inputs/test/format_spec.yue
@@ -119,7 +119,7 @@ for file in *files
         original_ast = yue.to_ast code
         assert.is_not_nil original_ast
         rewriteLineCol original_ast
-        formated = yue.format code
+        formated = yue.format code, 0, false
         ast = yue.to_ast formated
         assert.is_not_nil ast
         rewriteLineCol ast
diff --git a/spec/inputs/try_catch.yue b/spec/inputs/try_catch.yue
index 4e05bc6..6c29a52 100644
--- a/spec/inputs/try_catch.yue
+++ b/spec/inputs/try_catch.yue
@@ -62,6 +62,126 @@ f = ->
         do
                 <- x
                 local tb, a, b, c
-                f = -> try tb.f a, b, c
+                f1 = -> try tb.f a, b, c
+
+        do
+                f1 = -> do
+                        ok, ... = try func!
+                        ...
+
+        do
+                local func
+                a, b, c = try? func!
+        
+        do
+                a, b, c = try? func!
+
+        do
+                a = (try? func!) ?? "default"
+
+        do
+                f try? func!
+        
+        do
+                f try?
+                        print 123
+                        func!
+                catch e
+                        print e
+                        e
 
         nil
+
+do
+        try
+                func 1, 2, 3
+        catch err
+                print err
+
+        try func 1, 2, 3
+        catch err
+                print err
+
+        try
+                print "trying"
+                func 1, 2, 3
+
+        do
+                success, result = try
+                        func 1, 2, 3
+                catch err
+                        print err
+
+                success, result = try func 1, 2, 3
+
+        tb = {}
+
+        try tb.func
+        try tb.func!
+        try tb.func()
+        try (tb.func!)
+        try (tb\func(1, 2, 3))
+
+        try tb.func 1
+        try tb.func(1)
+
+        if (try func 1
+        catch err
+                print err)
+                print "OK"
+
+        if try (func 1)
+        catch err
+                        print err
+                print "OK"
+
+        do
+                if success, result := try func "abc", 123
+                        print result
+
+                success, result = try func "abc", 123
+                catch err
+                        print err
+
+                print result if success, result := try func "abc", 123
+                catch err
+                        print err
+
+        do
+                try
+                        func 1, 2, 3
+
+                try func 1, 2, 3
+
+        do
+                <- x
+                local tb, a, b, c
+                f1 = -> try tb.f a, b, c
+
+        do
+                f1 = -> do
+                        ok, ... = try func!
+                        ...
+
+        do
+                local func
+                a, b, c = try? func!
+        
+        do
+                a, b, c = try? func!
+
+        do
+                a = (try? func!) ?? "default"
+
+        do
+                f try? func!
+        
+        do
+                f try?
+                        print 123
+                        func!
+                catch e
+                        print e
+                        e
+
+nil
diff --git a/spec/inputs/unicode/destructure.yue b/spec/inputs/unicode/destructure.yue
index 3c3a369..a5ffd5d 100644
--- a/spec/inputs/unicode/destructure.yue
+++ b/spec/inputs/unicode/destructure.yue
@@ -84,7 +84,7 @@ do
 --
 
 do
-        with {元素a,元素b} = 东西
+        with {元素a,元素b} := 东西
                 打印 元素a, 元素b
 
 
diff --git a/spec/inputs/unicode/funcs.yue b/spec/inputs/unicode/funcs.yue
index c563356..cb35500 100644
--- a/spec/inputs/unicode/funcs.yue
+++ b/spec/inputs/unicode/funcs.yue
@@ -98,7 +98,7 @@ _无效变量 = -> 真名 if 某物
 
 变量x = (参数a,
         参数b) ->
-         打印 "什么"
+                打印 "什么"
 
 
 变量y = (参数a="hi",
diff --git a/spec/inputs/unicode/import.yue b/spec/inputs/unicode/import.yue
index c229edb..a7724ab 100644
--- a/spec/inputs/unicode/import.yue
+++ b/spec/inputs/unicode/import.yue
@@ -23,7 +23,7 @@ do
                 字段b, 字段c from 对象z
 
 do
-        import 字段a
+        import 字段a,
                 字段b
                 字段c from 对象z
 
diff --git a/spec/inputs/unicode/macro_export.yue b/spec/inputs/unicode/macro_export.yue
index 3c9a942..56571cd 100644
--- a/spec/inputs/unicode/macro_export.yue
+++ b/spec/inputs/unicode/macro_export.yue
@@ -37,8 +37,8 @@ export macro 复制 = (源, 目标, ...)->
         "
 do
         local _源_, _目标_
-        with _目标_ = #{目标}
-                with _源_ = #{源}
+        with _目标_ := #{目标}
+                with _源_ := #{源}
 #{table.concat for 字段 in *{...} do "
                         _目标_.#{字段} = _源_.#{字段}
 "}"
diff --git a/spec/inputs/unicode/syntax.yue b/spec/inputs/unicode/syntax.yue
index 8a98416..939579b 100644
--- a/spec/inputs/unicode/syntax.yue
+++ b/spec/inputs/unicode/syntax.yue
@@ -7,7 +7,7 @@
 函数 参数1, 参数2, 另外, 参数3
 
 这里, 我们 = () ->, 是的
-这个, 不同 = () -> 方法; 是的
+这个, 不同 = (() -> 方法), 是的
 
 爸爸()
 爸爸(主)
@@ -376,7 +376,7 @@ with 对象
 变量v = {
         变量a -1
         变量a(
--1)
+        -1)
         变量a \
 - 1
         变量a-1
@@ -389,7 +389,7 @@ with 对象
 
         变量a ~1
         变量a(
-~1)
+        ~1)
         变量a \
 ~ 1
         变量a~1
diff --git a/spec/inputs/unicode/vararg.yue b/spec/inputs/unicode/vararg.yue
index e59e114..b508fbb 100644
--- a/spec/inputs/unicode/vararg.yue
+++ b/spec/inputs/unicode/vararg.yue
@@ -55,12 +55,12 @@
         _ = ->
                 列表 = {1, 2, 3, 4, 5}
                 函数名 = (确定) ->
-                  确定, table.unpack 列表
+                        确定, table.unpack 列表
                 确定, ... = 函数名 true
                 打印 确定, ...
 
                 多参数函数 = ->
-                  10, nil, 20, nil, 30
+                        10, nil, 20, nil, 30
 
                 ... = 多参数函数!
                 打印 select "#", ...
diff --git a/spec/inputs/unicode/whitespace.yue b/spec/inputs/unicode/whitespace.yue
index efe55ce..151789a 100644
--- a/spec/inputs/unicode/whitespace.yue
+++ b/spec/inputs/unicode/whitespace.yue
@@ -97,19 +97,19 @@ v = ->
                         变量c -- v3
 
 v1, v2, \
-        v3 = ->
-        变量a; \-- 函数结束于v1
+        v3 = (->
+        变量a), \-- 函数结束于v1
                 变量b, \-- v2
                         变量c -- v3
 
 变量a, 变量b, \
         变量c, 变量d, \
 变量e, 变量f = 1, \
-        f2
-                :abc; \-- 参数2
+        (f2
+                :abc), \-- 参数2
                 3, \
                         4, \
-                                函数5 abc; \-- 参数5
+                                函数5(abc), \-- 参数5
                                         6
 
 for 变量a, \-- 解构1
diff --git a/spec/inputs/unicode/with.yue b/spec/inputs/unicode/with.yue
index ecbfdab..3c15add 100644
--- a/spec/inputs/unicode/with.yue
+++ b/spec/inputs/unicode/with.yue
@@ -45,19 +45,19 @@ do
         with 变量a
                 打印 .世界
 
-        模块 = with _模块 = {}
+        模块 = with _模块 := {}
                 .事物 = "你好"
 
-        with 变量a, 变量b = 东西, 布
+        with 变量a, 变量b := 东西, 布
                 打印 .世界
 
-        变量x = with 变量a, 变量b = 1, 2
+        变量x = with 变量a, 变量b := 1, 2
                 打印 变量a + 变量b
 
-        打印 with 变量a, 变量b = 1, 2
+        打印 with 变量a, 变量b := 1, 2
                 打印 变量a + 变量b
 
-        p = with 你好!.字段x, 世界!.字段y = 1, 2
+        p = with 你好!.字段x, 世界!.字段y := 1, 2
                 打印 变量a + 变量b
 
 --
@@ -68,16 +68,16 @@ do
                 变量x\大写!
 
 do
-        with 变量k = "乔"
+        with 变量k := "乔"
                 打印 \大写!
 
 do
-        with 变量a,变量b,变量c = "", "", ""
+        with 变量a,变量b,变量c := "", "", ""
                 打印 \大写!
 
 do
         变量a = "床铺"
-        with 变量a,变量b,变量c = "", "", ""
+        with 变量a,变量b,变量c := "", "", ""
                 打印 \大写!
 
 do
@@ -85,7 +85,7 @@ do
                 打印 \大写!
 
 do
-        with 变量k.变量j = "乔"
+        with 变量k.变量j := "乔"
                 打印 \大写!
 
 do
@@ -96,7 +96,7 @@ do
 
 do
         with 变量a
-                with .b = 2
+                with .b := 2
                         打印 .c
 
 do
@@ -131,12 +131,12 @@ do
 
 do
         global 掩码
-        with? 掩码 = 实心矩形 宽: w, 高: h, 颜色: 0x66000000
+        with? 掩码 := 实心矩形 宽: w, 高: h, 颜色: 0x66000000
                 .触摸启用 = true
                 .吞噬触摸 = true
 
 do
-        with? 掩码 = 实心矩形 宽: w, 高: h, 颜色: 0x66000000
+        with? 掩码 := 实心矩形 宽: w, 高: h, 颜色: 0x66000000
                 .触摸启用 = true
                 .吞噬触摸 = true
 
diff --git a/spec/inputs/vararg.yue b/spec/inputs/vararg.yue
index 941cd97..4f8a0d7 100644
--- a/spec/inputs/vararg.yue
+++ b/spec/inputs/vararg.yue
@@ -55,12 +55,12 @@ join = (...) ->
         _ = ->
                 list = {1, 2, 3, 4, 5}
                 fn = (ok) ->
-                  ok, table.unpack list
+                        ok, table.unpack list
                 ok, ... = fn true
                 print ok, ...
 
                 fn_many_args = ->
-                  10, nil, 20, nil, 30
+                        10, nil, 20, nil, 30
 
                 ... = fn_many_args!
                 print select "#", ...
@@ -86,3 +86,47 @@ join = (...) ->
                 print ...
         nil
 
+do
+        f1 = (...t) ->
+                print t.n
+                print #t
+                for i = 1, t.n
+                        print t[i]
+
+        f1 1, 2, 3
+        f1 "a", "b", "c", "d"
+        f1!
+
+        f2 = (...args) ->
+                print "args count:", args.n
+                print "args length:", #args
+                for i = 1, args.n
+                        if args[i] == nil
+                                print "position", i, "is nil"
+                        else
+                                print "position", i, ":", args[i]
+
+        f2 1, nil, 3, nil, 5
+
+        f3 = (prefix, ...items) ->
+                result = {}
+                for i = 1, items.n
+                        result[i] = prefix .. tostring items[i]
+                result
+
+        f3 "item_", 1, 2, 3
+
+        f4 = (...empty) ->
+                print "empty count:", empty.n
+                print "empty length:", #empty
+
+        f4!
+
+        process = (...data) ->
+                sum = 0
+                for i = 1, data.n
+                        if type(data[i]) == "number"
+                                sum += data[i]
+                sum
+
+        process 1, 2, 3, "skip", 5
diff --git a/spec/inputs/whitespace.yue b/spec/inputs/whitespace.yue
index 2655961..e501d3d 100644
--- a/spec/inputs/whitespace.yue
+++ b/spec/inputs/whitespace.yue
@@ -128,19 +128,19 @@ v = ->
                         c -- v3
 
 v1, v2, \
-        v3 = ->
-        a; \-- end of function for v1
+        v3 = (->
+        a), \-- end of function for v1
                 b, \-- v2
                         c -- v3
 
 a, b, \
         c, d, \
 e, f = 1, \
-        f2
-                :abc; \-- arg2
+        (f2
+                :abc), \-- arg2
                 3, \
                         4, \
-                                f5 abc; \-- arg5
+                                f5(abc), \-- arg5
                                         6
 
 for a, \-- destruct 1
diff --git a/spec/inputs/with.yue b/spec/inputs/with.yue
index 19b7be1..19ed2a7 100644
--- a/spec/inputs/with.yue
+++ b/spec/inputs/with.yue
@@ -48,21 +48,21 @@ do
         with a -- only one value allowed
                 print .world
 
-        mod = with _M = {}
+        mod = with _M := {}
                 .Thing = "hi"
 
         -- operate on a only
-        with a, b = something, pooh
+        with a, b := something, pooh
                 print .world
 
-        x = with a, b = 1, 2
+        x = with a, b := 1, 2
                 print a + b
 
-        print with a, b = 1, 2
+        print with a, b := 1, 2
                 print a + b
 
         -- assignment lhs must be evaluated in the order they appear
-        p = with hello!.x, world!.y = 1, 2
+        p = with hello!.x, world!.y := 1, 2
                 print a + b
 
 --
@@ -73,16 +73,16 @@ do
                 x\upper!
 
 do
-        with k = "jo"
+        with k := "jo"
                 print \upper!
 
 do
-        with a,b,c = "", "", ""
+        with a,b,c := "", "", ""
                 print \upper!
 
 do
         a = "bunk"
-        with a,b,c = "", "", ""
+        with a,b,c := "", "", ""
                 print \upper!
 
 do
@@ -90,7 +90,7 @@ do
                 print \upper!
 
 do
-        with k.j = "jo"
+        with k.j := "jo"
                 print \upper!
 
 do
@@ -103,7 +103,7 @@ do
 do
         with a
                 -- nested `with`s with assignments should change the scope correctly
-                with .b = 2
+                with .b := 2
                         print .c
 
 do
@@ -138,12 +138,12 @@ do
 
 do
         global mask
-        with? mask = SolidRect width: w, height: h, color: 0x66000000
+        with? mask := SolidRect width: w, height: h, color: 0x66000000
                 .touchEnabled = true
                 .swallowTouches = true
 
 do
-        with? mask = SolidRect width: w, height: h, color: 0x66000000
+        with? mask := SolidRect width: w, height: h, color: 0x66000000
                 .touchEnabled = true
                 .swallowTouches = true
 
@@ -152,4 +152,22 @@ do
                 return with {}
                         return [123]
 
+do
+        f with item
+                if .id > 0
+                        break .content
+
+        a = with tb
+                if .v
+                        break .a
+
+        a = while true
+                break with? tb
+                        break 1
+
+do
+        a = for i = 1, 100
+                with? x := tb[i]
+                        break x if .id := 1
+
 nil