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

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

Browse Source 
This reverts commit 6b6e3f42627f360cbbad2287968b2a209ab43593.  It was
the wrong fix.
This commit is contained in:
Nicolas Williams
2014-07-13 02:04:27 -05:00
parent 6b6e3f4262
commit cadf8c3cb0
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compile.c
View File

@ -290,30 +290,16 @@ 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;
// 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:
block refd = gen_noop();
for (inst* curr; (curr = block_take(&binder));) {
block b = inst_block(curr);
if (block_bind_subblock(b, body, bindflags)) {
body = BLOCK(b, body);
refd = BLOCK(refd, b);
} else {
unrefd = BLOCK(unrefd, b);
unref_count++;
block_free(b);
}
}
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;
return block_join(refd, body);
}
block gen_function(const char* name, block formals, block body) {