max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 16:26:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge r20344 & r20346.

Browse source
This commit is contained in:
Nicolas Pierron 2010-03-14 11:58:07 +00:00
parent 2fb0df83e9
commit 741b7577c1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/aterm-helper.pl
View file

@ -147,6 +147,7 @@ while (<STDIN>) {
print HEADER "extern ATerm $name;\n"; print HEADER "extern ATerm $name;\n";
print IMPL "ATerm $name = 0;\n"; print IMPL "ATerm $name = 0;\n";
$init .= " $name = $value;\n"; $init .= " $name = $value;\n";
$init .= " ATprotect(&$name);\n";
} }
elsif (/^\s*init\s+(\w+)\s*$/) { elsif (/^\s*init\s+(\w+)\s*$/) {

8
src/libexpr/parser.y
View file

@ -85,6 +85,10 @@ static Expr fixAttrs(bool recursive, ATermList as)
{ {
Tree attrs; Tree attrs;
/* This ATermMap is needed to ensure that the `leaf' fields in the
Tree nodes are not garbage collected. */
ATermMap gcRoots;
for (ATermIterator i(as); i; ++i) { for (ATermIterator i(as); i; ++i) {
ATermList names, attrPath; Expr src, e; ATerm name, pos; ATermList names, attrPath; Expr src, e; ATerm name, pos;
@ -95,7 +99,9 @@ static Expr fixAttrs(bool recursive, ATermList as)
throw ParseError(format("duplicate definition of attribute `%1%' at %2%") throw ParseError(format("duplicate definition of attribute `%1%' at %2%")
% showAttrPath(ATmakeList1(*j)) % showPos(pos)); % showAttrPath(ATmakeList1(*j)) % showPos(pos));
Tree & t(attrs.children[*j]); Tree & t(attrs.children[*j]);
t.leaf = fromScope ? makeVar(*j) : makeSelect(src, *j); Expr leaf = fromScope ? makeVar(*j) : makeSelect(src, *j);
gcRoots.set(leaf, leaf);
t.leaf = leaf;
t.pos = pos; t.pos = pos;
if (recursive && fromScope) t.recursive = false; if (recursive && fromScope) t.recursive = false;
} }