From 147eb556316c673859fd7da7b479c3f3f8f4bdaa Mon Sep 17 00:00:00 2001 From: Li Jin Date: Mon, 23 Oct 2023 11:07:40 +0800 Subject: remove unnecessary multiline declaration for list table assignment. --- spec/inputs/tables.yue | 10 +- spec/outputs/tables.lua | 244 +++++++++++++++++++++++++----------------------- 2 files changed, 132 insertions(+), 122 deletions(-) (limited to 'spec') diff --git a/spec/inputs/tables.yue b/spec/inputs/tables.yue index 53a53ae..0de8a8c 100644 --- a/spec/inputs/tables.yue +++ b/spec/inputs/tables.yue @@ -40,7 +40,7 @@ ya = { 1,2,3, key: 100, 343, "hello", umm: 232 } x = { 1,2, 4343, 343 ,343 } -x = [ 1,2, +x1 = [ 1,2, 4343, 343 ,343 ] g, p = { @@ -258,24 +258,24 @@ tbMix = { ... -- perform the Lua table behavior here } -tbMixA = { +do tbMixA = { ...[i for i = 1, 10] 11 } -tbMixA = [ +do tbMixA = [ ...[i for i = 1, 10] 11 ] -tbMixB = { +do tbMixB = { ... ... -- only the first item in vararg been accessed here ... {...} ... {......} 1, 2, 3 } -tbMixB = [ +do tbMixB = [ ... ... -- only the first item in vararg been accessed here ... {...} ... {......} diff --git a/spec/outputs/tables.lua b/spec/outputs/tables.lua index f836d58..911f677 100644 --- a/spec/outputs/tables.lua +++ b/spec/outputs/tables.lua @@ -52,7 +52,7 @@ local x = { 343, 343 } -x = { +local x1 = { 1, 2, 4343, @@ -428,149 +428,159 @@ do end tbMix = _tab_0 end -local tbMixA do - local _tab_0 = { } - local _obj_0 + local tbMixA do - local _accum_0 = { } - local _len_0 = 1 - for i = 1, 10 do - _accum_0[_len_0] = i - _len_0 = _len_0 + 1 + local _tab_0 = { } + local _obj_0 + do + local _accum_0 = { } + local _len_0 = 1 + for i = 1, 10 do + _accum_0[_len_0] = i + _len_0 = _len_0 + 1 + end + _obj_0 = _accum_0 end - _obj_0 = _accum_0 - end - local _idx_0 = 1 - for _key_0, _value_0 in pairs(_obj_0) 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 + local _idx_0 = 1 + for _key_0, _value_0 in pairs(_obj_0) 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 + _tab_0[#_tab_0 + 1] = 11 + tbMixA = _tab_0 end - _tab_0[#_tab_0 + 1] = 11 - tbMixA = _tab_0 end do - local _tab_0 = { } - local _obj_0 + local tbMixA do - local _accum_0 = { } - local _len_0 = 1 - for i = 1, 10 do - _accum_0[_len_0] = i - _len_0 = _len_0 + 1 + local _tab_0 = { } + local _obj_0 + do + local _accum_0 = { } + local _len_0 = 1 + for i = 1, 10 do + _accum_0[_len_0] = i + _len_0 = _len_0 + 1 + end + _obj_0 = _accum_0 end - _obj_0 = _accum_0 - end - local _idx_0 = #_tab_0 + 1 - for _index_0 = 1, #_obj_0 do - local _value_0 = _obj_0[_index_0] - _tab_0[_idx_0] = _value_0 - _idx_0 = _idx_0 + 1 + local _idx_0 = #_tab_0 + 1 + for _index_0 = 1, #_obj_0 do + local _value_0 = _obj_0[_index_0] + _tab_0[_idx_0] = _value_0 + _idx_0 = _idx_0 + 1 + end + _tab_0[#_tab_0 + 1] = 11 + tbMixA = _tab_0 end - _tab_0[#_tab_0 + 1] = 11 - tbMixA = _tab_0 end -local tbMixB do - local _tab_0 = { } - local _obj_0 = ... - local _idx_0 = 1 - for _key_0, _value_0 in pairs(_obj_0) 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 + local tbMixB + do + local _tab_0 = { } + local _obj_0 = ... + local _idx_0 = 1 + for _key_0, _value_0 in pairs(_obj_0) 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 - end - local _obj_1 = { - ... - } - local _idx_1 = 1 - for _key_0, _value_0 in pairs(_obj_1) do - if _idx_1 == _key_0 then - _tab_0[#_tab_0 + 1] = _value_0 - _idx_1 = _idx_1 + 1 - else - _tab_0[_key_0] = _value_0 + local _obj_1 = { + ... + } + local _idx_1 = 1 + for _key_0, _value_0 in pairs(_obj_1) do + if _idx_1 == _key_0 then + _tab_0[#_tab_0 + 1] = _value_0 + _idx_1 = _idx_1 + 1 + else + _tab_0[_key_0] = _value_0 + end + end + local _obj_2 + do + local _tab_1 = { } + local _obj_3 = ... + local _idx_2 = 1 + for _key_0, _value_0 in pairs(_obj_3) do + if _idx_2 == _key_0 then + _tab_1[#_tab_1 + 1] = _value_0 + _idx_2 = _idx_2 + 1 + else + _tab_1[_key_0] = _value_0 + end + end + _obj_2 = _tab_1 end - end - local _obj_2 - do - local _tab_1 = { } - local _obj_3 = ... local _idx_2 = 1 - for _key_0, _value_0 in pairs(_obj_3) do + for _key_0, _value_0 in pairs(_obj_2) do if _idx_2 == _key_0 then - _tab_1[#_tab_1 + 1] = _value_0 + _tab_0[#_tab_0 + 1] = _value_0 _idx_2 = _idx_2 + 1 else - _tab_1[_key_0] = _value_0 + _tab_0[_key_0] = _value_0 end end - _obj_2 = _tab_1 - end - local _idx_2 = 1 - for _key_0, _value_0 in pairs(_obj_2) do - if _idx_2 == _key_0 then - _tab_0[#_tab_0 + 1] = _value_0 - _idx_2 = _idx_2 + 1 - else - _tab_0[_key_0] = _value_0 - end + _tab_0[#_tab_0 + 1] = 1 + _tab_0[#_tab_0 + 1] = 2 + _tab_0[#_tab_0 + 1] = 3 + tbMixB = _tab_0 end - _tab_0[#_tab_0 + 1] = 1 - _tab_0[#_tab_0 + 1] = 2 - _tab_0[#_tab_0 + 1] = 3 - tbMixB = _tab_0 end do - local _tab_0 = { } - local _obj_0 = ... - local _idx_0 = #_tab_0 + 1 - for _index_0 = 1, #_obj_0 do - local _value_0 = _obj_0[_index_0] - _tab_0[_idx_0] = _value_0 - _idx_0 = _idx_0 + 1 - end - local _obj_1 = { - ... - } - local _idx_1 = #_tab_0 + 1 - for _index_0 = 1, #_obj_1 do - local _value_0 = _obj_1[_index_0] - _tab_0[_idx_1] = _value_0 - _idx_1 = _idx_1 + 1 - end - local _obj_2 + local tbMixB do - local _tab_1 = { } - local _obj_3 = ... - local _idx_2 = 1 - for _key_0, _value_0 in pairs(_obj_3) do - if _idx_2 == _key_0 then - _tab_1[#_tab_1 + 1] = _value_0 - _idx_2 = _idx_2 + 1 - else - _tab_1[_key_0] = _value_0 + local _tab_0 = { } + local _obj_0 = ... + local _idx_0 = #_tab_0 + 1 + for _index_0 = 1, #_obj_0 do + local _value_0 = _obj_0[_index_0] + _tab_0[_idx_0] = _value_0 + _idx_0 = _idx_0 + 1 + end + local _obj_1 = { + ... + } + local _idx_1 = #_tab_0 + 1 + for _index_0 = 1, #_obj_1 do + local _value_0 = _obj_1[_index_0] + _tab_0[_idx_1] = _value_0 + _idx_1 = _idx_1 + 1 + end + local _obj_2 + do + local _tab_1 = { } + local _obj_3 = ... + local _idx_2 = 1 + for _key_0, _value_0 in pairs(_obj_3) do + if _idx_2 == _key_0 then + _tab_1[#_tab_1 + 1] = _value_0 + _idx_2 = _idx_2 + 1 + else + _tab_1[_key_0] = _value_0 + end end + _obj_2 = _tab_1 end - _obj_2 = _tab_1 - end - local _idx_2 = #_tab_0 + 1 - for _index_0 = 1, #_obj_2 do - local _value_0 = _obj_2[_index_0] - _tab_0[_idx_2] = _value_0 - _idx_2 = _idx_2 + 1 + local _idx_2 = #_tab_0 + 1 + for _index_0 = 1, #_obj_2 do + local _value_0 = _obj_2[_index_0] + _tab_0[_idx_2] = _value_0 + _idx_2 = _idx_2 + 1 + end + _tab_0[#_tab_0 + 1] = 1 + _tab_0[#_tab_0 + 1] = 2 + _tab_0[#_tab_0 + 1] = 3 + tbMixB = _tab_0 end - _tab_0[#_tab_0 + 1] = 1 - _tab_0[#_tab_0 + 1] = 2 - _tab_0[#_tab_0 + 1] = 3 - tbMixB = _tab_0 end local template = { foo = "Hello", -- cgit v1.2.3-55-g6feb