Ark/leporello-js
1
0
Fork 0
mirror of https://github.com/leporello-js/leporello-js synced 2026-01-13 13:04:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Dmitry Vasilev
2023-06-21 13:50:01 +03:00
parent 2cf7d4bafc
commit dac2fd047e
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/eval.js
View File

@@ -447,7 +447,7 @@ export const eval_codestring = (codestring, scope) =>
`
))(codestring, scope)
const get_args_scope = (fn_node, args) => {
const get_args_scope = (fn_node, args, closure) => {
const arg_names =
collect_destructuring_identifiers(fn_node.function_args)
.map(i => i.value)
@@ -464,7 +464,10 @@ const get_args_scope = (fn_node, args) => {
*/
const codestring = `(([${destructuring}]) => [${arg_names.join(',')}])(__args)`
const {ok, value, error} = eval_codestring(codestring, {__args: args})
const {ok, value, error} = eval_codestring(codestring, {
...closure,
__args: args,
})
if(!ok) {
// TODO show exact destructuring error
@@ -1142,7 +1145,11 @@ export const eval_frame = (calltree_node, modules) => {
} else {
// TODO default values for destructuring can be function calls
const args_scope_result = get_args_scope(node, calltree_node.args)
const args_scope_result = get_args_scope(
node,
calltree_node.args,
calltree_node.fn.__closure
)
// TODO fine-grained destructuring error, only for identifiers that
// failed destructuring