Skip to content

Commit

Permalink
add yue.format() function. fix yue ast to code function issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
pigpigyyy committed Dec 13, 2023
1 parent de5fdb3 commit 3c4cbff
Show file tree
Hide file tree
Showing 8 changed files with 535 additions and 76 deletions.
126 changes: 126 additions & 0 deletions spec/inputs/test/format_spec.yue
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
files = [
"spec/inputs/macro_export.yue"
"spec/inputs/attrib.yue"
"spec/inputs/macro.yue"
"spec/inputs/using.yue"
"spec/inputs/whitespace.yue"
"spec/inputs/nil_coalescing.yue"
"spec/inputs/stub.yue"
"spec/inputs/pipe.yue"
"spec/inputs/teal_lang.yue"
"spec/inputs/string.yue"
"spec/inputs/local.yue"
"spec/inputs/tables.yue"
"spec/inputs/operators.yue"
"spec/inputs/lists.yue"
"spec/inputs/compile_doc.yue"
"spec/inputs/switch.yue"
"spec/inputs/multiline_chain.yue"
"spec/inputs/existential.yue"
"spec/inputs/export_default.yue"
"spec/inputs/assign.yue"
"spec/inputs/literals.yue"
"spec/inputs/luarocks_upload.yue"
"spec/inputs/ambiguous.yue"
"spec/inputs/bubbling.yue"
"spec/inputs/try_catch.yue"
"spec/inputs/funcs.yue"
"spec/inputs/do.yue"
"spec/inputs/with.yue"
"spec/inputs/export.yue"
"spec/inputs/macro_todo.yue"
"spec/inputs/backcall.yue"
"spec/inputs/cond.yue"
"spec/inputs/in_expression.yue"
"spec/inputs/comprehension.yue"
"spec/inputs/macro_teal.yue"
"spec/inputs/import.yue"
"spec/inputs/unless_else.yue"
"spec/inputs/destructure.yue"
"spec/inputs/return.yue"
"spec/inputs/loops.yue"
"spec/inputs/class.yue"
"spec/inputs/vararg.yue"
"spec/inputs/goto.yue"
"spec/inputs/metatable.yue"
"spec/inputs/syntax.yue"
"spec/inputs/global.yue"
"spec/inputs/plus.yue"
"spec/inputs/test/class_spec.yue"
"spec/inputs/test/table_spreading_spec.yue"
"spec/inputs/test/loops_spec.yue"
"spec/inputs/test/format_spec.yue"
"spec/inputs/unicode/macro_export.yue"
"spec/inputs/unicode/attrib.yue"
"spec/inputs/unicode/macro.yue"
"spec/inputs/unicode/using.yue"
"spec/inputs/unicode/whitespace.yue"
"spec/inputs/unicode/nil_coalescing.yue"
"spec/inputs/unicode/stub.yue"
"spec/inputs/unicode/pipe.yue"
"spec/inputs/unicode/string.yue"
"spec/inputs/unicode/local.yue"
"spec/inputs/unicode/tables.yue"
"spec/inputs/unicode/operators.yue"
"spec/inputs/unicode/lists.yue"
"spec/inputs/unicode/switch.yue"
"spec/inputs/unicode/multiline_chain.yue"
"spec/inputs/unicode/existential.yue"
"spec/inputs/unicode/export_default.yue"
"spec/inputs/unicode/assign.yue"
"spec/inputs/unicode/literals.yue"
"spec/inputs/unicode/ambiguous.yue"
"spec/inputs/unicode/bubbling.yue"
"spec/inputs/unicode/try_catch.yue"
"spec/inputs/unicode/funcs.yue"
"spec/inputs/unicode/do.yue"
"spec/inputs/unicode/with.yue"
"spec/inputs/unicode/export.yue"
"spec/inputs/unicode/macro_todo.yue"
"spec/inputs/unicode/backcall.yue"
"spec/inputs/unicode/cond.yue"
"spec/inputs/unicode/in_expression.yue"
"spec/inputs/unicode/comprehension.yue"
"spec/inputs/unicode/import.yue"
"spec/inputs/unicode/unless_else.yue"
"spec/inputs/unicode/destructure.yue"
"spec/inputs/unicode/return.yue"
"spec/inputs/unicode/loops.yue"
"spec/inputs/unicode/class.yue"
"spec/inputs/unicode/vararg.yue"
"spec/inputs/unicode/goto.yue"
"spec/inputs/unicode/metatable.yue"
"spec/inputs/unicode/syntax.yue"
"spec/inputs/unicode/global.yue"
"spec/inputs/unicode/plus.yue"
]

import "yue"

rewriteLineCol = (item)->
item[2] = 0
item[3] = 0
for i = 4, #item
switch type item[i] when "table"
if item[i][1] == "comment"
table.remove item, i
rewriteLineCol item
return
rewriteLineCol item[i]

<- describe "format"
for file in *files
<- it file
f = io.open file
code = f\read "a*"
f\close!

original_ast = yue.to_ast code
assert.is_not_nil original_ast
rewriteLineCol original_ast
formated = yue.format code
ast = yue.to_ast formated
assert.is_not_nil ast
rewriteLineCol ast
assert.same original_ast, ast

133 changes: 133 additions & 0 deletions spec/outputs/test/format_spec.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
local files = {
"spec/inputs/macro_export.yue",
"spec/inputs/attrib.yue",
"spec/inputs/macro.yue",
"spec/inputs/using.yue",
"spec/inputs/whitespace.yue",
"spec/inputs/nil_coalescing.yue",
"spec/inputs/stub.yue",
"spec/inputs/pipe.yue",
"spec/inputs/teal_lang.yue",
"spec/inputs/string.yue",
"spec/inputs/local.yue",
"spec/inputs/tables.yue",
"spec/inputs/operators.yue",
"spec/inputs/lists.yue",
"spec/inputs/compile_doc.yue",
"spec/inputs/switch.yue",
"spec/inputs/multiline_chain.yue",
"spec/inputs/existential.yue",
"spec/inputs/export_default.yue",
"spec/inputs/assign.yue",
"spec/inputs/literals.yue",
"spec/inputs/luarocks_upload.yue",
"spec/inputs/ambiguous.yue",
"spec/inputs/bubbling.yue",
"spec/inputs/try_catch.yue",
"spec/inputs/funcs.yue",
"spec/inputs/do.yue",
"spec/inputs/with.yue",
"spec/inputs/export.yue",
"spec/inputs/macro_todo.yue",
"spec/inputs/backcall.yue",
"spec/inputs/cond.yue",
"spec/inputs/in_expression.yue",
"spec/inputs/comprehension.yue",
"spec/inputs/macro_teal.yue",
"spec/inputs/import.yue",
"spec/inputs/unless_else.yue",
"spec/inputs/destructure.yue",
"spec/inputs/return.yue",
"spec/inputs/loops.yue",
"spec/inputs/class.yue",
"spec/inputs/vararg.yue",
"spec/inputs/goto.yue",
"spec/inputs/metatable.yue",
"spec/inputs/syntax.yue",
"spec/inputs/global.yue",
"spec/inputs/plus.yue",
"spec/inputs/test/class_spec.yue",
"spec/inputs/test/table_spreading_spec.yue",
"spec/inputs/test/loops_spec.yue",
"spec/inputs/test/format_spec.yue",
"spec/inputs/unicode/macro_export.yue",
"spec/inputs/unicode/attrib.yue",
"spec/inputs/unicode/macro.yue",
"spec/inputs/unicode/using.yue",
"spec/inputs/unicode/whitespace.yue",
"spec/inputs/unicode/nil_coalescing.yue",
"spec/inputs/unicode/stub.yue",
"spec/inputs/unicode/pipe.yue",
"spec/inputs/unicode/string.yue",
"spec/inputs/unicode/local.yue",
"spec/inputs/unicode/tables.yue",
"spec/inputs/unicode/operators.yue",
"spec/inputs/unicode/lists.yue",
"spec/inputs/unicode/switch.yue",
"spec/inputs/unicode/multiline_chain.yue",
"spec/inputs/unicode/existential.yue",
"spec/inputs/unicode/export_default.yue",
"spec/inputs/unicode/assign.yue",
"spec/inputs/unicode/literals.yue",
"spec/inputs/unicode/ambiguous.yue",
"spec/inputs/unicode/bubbling.yue",
"spec/inputs/unicode/try_catch.yue",
"spec/inputs/unicode/funcs.yue",
"spec/inputs/unicode/do.yue",
"spec/inputs/unicode/with.yue",
"spec/inputs/unicode/export.yue",
"spec/inputs/unicode/macro_todo.yue",
"spec/inputs/unicode/backcall.yue",
"spec/inputs/unicode/cond.yue",
"spec/inputs/unicode/in_expression.yue",
"spec/inputs/unicode/comprehension.yue",
"spec/inputs/unicode/import.yue",
"spec/inputs/unicode/unless_else.yue",
"spec/inputs/unicode/destructure.yue",
"spec/inputs/unicode/return.yue",
"spec/inputs/unicode/loops.yue",
"spec/inputs/unicode/class.yue",
"spec/inputs/unicode/vararg.yue",
"spec/inputs/unicode/goto.yue",
"spec/inputs/unicode/metatable.yue",
"spec/inputs/unicode/syntax.yue",
"spec/inputs/unicode/global.yue",
"spec/inputs/unicode/plus.yue"
}
local yue = require("yue")
local rewriteLineCol
rewriteLineCol = function(item)
item[2] = 0
item[3] = 0
for i = 4, #item do
do
local _exp_0 = type(item[i])
if "table" == _exp_0 then
if item[i][1] == "comment" then
table.remove(item, i)
rewriteLineCol(item)
return
end
rewriteLineCol(item[i])
end
end
end
end
return describe("format", function()
for _index_0 = 1, #files do
local file = files[_index_0]
it(file, function()
local f = io.open(file)
local code = f:read("a*")
f:close()
local original_ast = yue.to_ast(code)
assert.is_not_nil(original_ast)
rewriteLineCol(original_ast)
local formated = yue.format(code)
local ast = yue.to_ast(formated)
assert.is_not_nil(ast)
rewriteLineCol(ast)
return assert.same(original_ast, ast)
end)
end
end)
2 changes: 1 addition & 1 deletion src/yue_wasm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ std::string exec(const std::string& codes) {
};

execStr(R"yuescript(
_G.__output = {}
_G.__output = []
_G.print = (...)->
_G.__output[] = table.concat [tostring select i, ... for i = 1, select "#", ...], " "
_G.__output[] = "\n"
Expand Down
Loading

0 comments on commit 3c4cbff

Please sign in to comment.