imxyy1soope1/nixjit
1
0
Fork 0
Code Issues Pull Requests Actions Projects 1 Releases Activity

fix: attrset update

Browse Source
This commit is contained in:
imxyy_soope_
2025-05-03 14:23:24 +08:00
parent 5e35da49ef
commit 43cfb9be62
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vm/test.rs
View File

@@ -144,7 +144,7 @@ fn test_attrs() {
test_expr("{ a.b = 1; } ? a.b", boolean!(true)); test_expr("{ a.b = 1; } ? a.b", boolean!(true));
test_expr( test_expr(
"{ a.b = 1; } // { a.c = 2 }", "{ a.b = 1; } // { a.c = 2 }",
attrs! { symbol!("a") => attrs!{ symbol!("b") => int!(1), symbol!("c") => int!(2) } }, attrs! { symbol!("a") => attrs!{ symbol!("c") => int!(2) } },
); );
} }
@@ -164,6 +164,6 @@ fn test_let() {
test_expr(r#"let a = { a = 1; }; b = "a"; in a.${b}"#, int!(1)); test_expr(r#"let a = { a = 1; }; b = "a"; in a.${b}"#, int!(1));
test_expr( test_expr(
r#"let b = "c"; in { a.b = 1; } // { a."a${b}" = 2 }"}"#, r#"let b = "c"; in { a.b = 1; } // { a."a${b}" = 2 }"}"#,
attrs! { symbol!("a") => attrs!{ symbol!("b") => int!(1), symbol!("ac") => int!(2) } }, attrs! { symbol!("a") => attrs!{ symbol!("ac") => int!(2) } },
); );
} }

7
src/vm/value/attrset.rs
View File

@@ -26,12 +26,7 @@ impl AttrSet {
pub fn update(mut self, other: AttrSet) -> AttrSet { pub fn update(mut self, other: AttrSet) -> AttrSet {
for (k, v) in other.data.iter() { for (k, v) in other.data.iter() {
if let Some(attr) = self.data.get(k) { self.push_attr(k.clone(), v.clone())
let new_attr = attr.clone().update(v.clone());
self.data.insert_mut(k.clone(), new_attr);
} else {
self.push_attr(k.clone(), v.clone())
}
} }
self self
} }