mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): split out AttributeSet::from_ast helper

Browse source 
Change-Id: Id43dbd06aef14cf01b4901d9b3668d790cd2b5ae
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6805
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2022-09-29 18:07:50 +03:00 committed by tazjin
parent 9e9dde0106
commit 9cd5f03835
1 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
tvix/eval/src/compiler/bindings.rs
View file

@ -51,6 +51,36 @@ impl ToSpan for AttributeSet {
}
}
impl AttributeSet {
fn from_ast(c: &Compiler, node: &ast::AttrSet) -> Self {
AttributeSet {
span: c.span_for(node),
// Kind of the attrs depends on the first time it is
// encountered. We actually believe this to be a Nix
// bug: https://github.com/NixOS/nix/issues/7111
kind: if node.rec_token().is_some() {
BindingsKind::RecAttrs
} else {
BindingsKind::Attrs
},
inherits: ast::HasEntry::inherits(node).collect(),
entries: ast::HasEntry::attrpath_values(node)
.map(|entry| {
let span = c.span_for(&entry);
(
span,
entry.attrpath().unwrap().attrs(),
entry.value().unwrap(),
)
})
.collect(),
}
}
}
// Data structures to track the bindings observed in the second pass, and
// forward the information needed to compile their value.
enum Binding {
@ -78,32 +108,7 @@ impl Binding {
// and recurse.
Binding::Plain { expr } => match expr {
ast::Expr::AttrSet(existing) => {
let nested = AttributeSet {
span: c.span_for(existing),
// Kind of the attrs depends on the first time it is
// encountered. We actually believe this to be a Nix
// bug: https://github.com/NixOS/nix/issues/7111
kind: if existing.rec_token().is_some() {
BindingsKind::RecAttrs
} else {
BindingsKind::Attrs
},
inherits: ast::HasEntry::inherits(existing).collect(),
entries: ast::HasEntry::attrpath_values(existing)
.map(|entry| {
let span = c.span_for(&entry);
(
span,
entry.attrpath().unwrap().attrs(),
entry.value().unwrap(),
)
})
.collect(),
};
let nested = AttributeSet::from_ast(c, existing);
*self = Binding::Set(nested);
self.merge(c, value);
}