mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Library defs don't bind to each other; fix #479

Browse Source
This commit is contained in:
Nicolas Williams
2014-07-12 18:37:23 -05:00
parent 6e88d419ba
commit 6b6e3f4262
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compile.c
View File

@ -290,16 +290,30 @@ block block_bind(block binder, block body, int bindflags) {
block block_bind_referenced(block binder, block body, int bindflags) {
assert(block_has_only_binders(binder, bindflags));
bindflags |= OP_HAS_BINDING;
block refd = gen_noop();
// Repeatedly bind until there's no remaining references to any of the
// binders in binder.
block unrefd = gen_noop();
int unref_count = 0, last = -1;
loop:
for (inst* curr; (curr = block_take(&binder));) {
block b = inst_block(curr);
if (block_bind_subblock(b, body, bindflags)) {
refd = BLOCK(refd, b);
body = BLOCK(b, body);
} else {
block_free(b);
unrefd = BLOCK(unrefd, b);
unref_count++;
}
}
return block_join(refd, body);
if (unref_count == 0 || unref_count == last) {
block_free(unrefd);
return body;
}
last = unref_count;
unref_count = 0;
binder = unrefd;
unrefd = gen_noop();
goto loop;
}
block gen_function(const char* name, block formals, block body) {