urbit/ares
1
1
Fork 0
mirror of https://github.com/urbit/ares.git synced 2024-11-23 09:06:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

wip: push current stir, trying to fix bugs

Browse Source
This commit is contained in:
Matthew LeVan 2023-12-07 14:20:53 -05:00
parent 45eff27f62
commit 695a878754
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
rust/ares/src/jets/parse.rs
View File

@ -225,6 +225,12 @@ pub fn jet_sfix(context: &mut Context, subject: Noun) -> Result {
} }
} }
#[derive(Copy, Clone)]
struct StirPair {
pub har: Noun,
pub res: Noun,
}
pub fn jet_stir(context: &mut Context, subject: Noun) -> Result { pub fn jet_stir(context: &mut Context, subject: Noun) -> Result {
context.stack.frame_push(0); context.stack.frame_push(0);
@ -234,10 +240,16 @@ pub fn jet_stir(context: &mut Context, subject: Noun) -> Result {
let raq = slot(van, 26)?; let raq = slot(van, 26)?;
let fel = slot(van, 27)?; let fel = slot(van, 27)?;
// XX should we use a struct for this? eprintln!("stir: got my nouns");
// +$ edge [p=hair q=(unit [p=* q=nail])] // +$ edge [p=hair q=(unit [p=* q=nail])]
let hair = T(&mut context.stack, &[D(1), D(1)]); let hair = T(&mut context.stack, &[D(1), D(1)]);
let mut par_u = T(&mut context.stack, &[hair, D(0)]); let mut par_u = StirPair{
har: hair,
res: D(0),
};
eprintln!("stir: prepared pair");
// initial accumulator (deconstructed) // initial accumulator (deconstructed)
let mut p_wag: Noun; let mut p_wag: Noun;
@ -249,12 +261,14 @@ pub fn jet_stir(context: &mut Context, subject: Noun) -> Result {
let mut vex = slam(context, fel, tub)?.as_cell()?; let mut vex = slam(context, fel, tub)?.as_cell()?;
let mut p_vex = vex.head(); let mut p_vex = vex.head();
let mut q_vex = vex.tail(); let mut q_vex = vex.tail();
eprintln!("stir: got vex");
while !unsafe { q_vex.raw_equals(D(0)) } { while !unsafe { q_vex.raw_equals(D(0)) } {
let puq_vex = q_vex.as_cell()?.head(); let puq_vex = q_vex.as_cell()?.head();
let quq_vex = q_vex.as_cell()?.tail(); let quq_vex = q_vex.as_cell()?.tail();
par_u = T(&mut context.stack, &[p_vex, puq_vex]); par_u.har = p_vex;
unsafe { *(context.stack.push()) = par_u }; par_u.res = puq_vex;
unsafe { *(context.stack.push::<StirPair>()) = par_u };
tub = quq_vex; tub = quq_vex;
@ -262,6 +276,7 @@ pub fn jet_stir(context: &mut Context, subject: Noun) -> Result {
p_vex = vex.head(); p_vex = vex.head();
q_vex = vex.tail(); q_vex = vex.tail();
} }
eprintln!("stir: vex loop done");
p_wag = p_vex; p_wag = p_vex;
puq_wag = rud; puq_wag = rud;
@ -269,16 +284,20 @@ pub fn jet_stir(context: &mut Context, subject: Noun) -> Result {
} }
// unwind the stack, folding parse results into [wag] by way of [raq] // unwind the stack, folding parse results into [wag] by way of [raq]
eprintln!("stir: unwinding stack");
while !context.stack.stack_is_empty() { while !context.stack.stack_is_empty() {
p_wag = util::last(p_wag, puq_wag)?; p_wag = util::last(p_wag, puq_wag)?;
let sam = T(&mut context.stack, &[par_u.as_cell()?.tail(), puq_wag]); let sam = T(&mut context.stack, &[par_u.res, puq_wag]);
puq_wag = slam(context, raq, sam)?; puq_wag = slam(context, raq, sam)?;
par_u = unsafe { *(context.stack.top()) }; unsafe { context.stack.pop::<StirPair>(); };
unsafe { context.stack.pop::<Noun>(); }; par_u = unsafe { *(context.stack.top::<StirPair>()) };
} }
eprintln!("stir: unwind done");
unsafe { context.stack.frame_pop(); }; unsafe { context.stack.frame_pop(); };
eprintln!("stir: done");
Ok(T(&mut context.stack, &[p_wag, D(0), puq_wag, quq_wag])) Ok(T(&mut context.stack, &[p_wag, D(0), puq_wag, quq_wag]))
} }