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

unify logic for flopped/unflopped +mook

Browse Source
This commit is contained in:
Alex Shelkovnykov 2023-09-15 21:36:09 -06:00
parent 25c0ad7778
commit 82e2fcbd91
2 changed files with 22 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
rust/ares/src/jets/nock.rs
View File

@ -39,7 +39,7 @@ pub mod util {
use crate::jets::util::rip;
use crate::mem::NockStack;
use crate::newt::Newt;
use crate::noun::{tape, Cell, CellMemory, Noun, D, T};
use crate::noun::{tape, Cell, Noun, D, T};
use ares_macros::tas;
use std::result;
@ -72,148 +72,20 @@ pub mod util {
// XX: trim traces longer than 1024 frames
let mut res = D(0);
let mut list = original_list;
if flop {
loop {
if unsafe { list.raw_equals(D(0)) } {
break;
}
let cell = list.as_cell()?;
let trace = cell.head().as_cell()?;
let tag = trace.head().as_direct()?;
let dat = trace.tail();
let tank: Noun = match tag.data() {
tas!(b"mean") => {
if let Ok(atom) = dat.as_atom() {
let tape = rip(stack, 3, 1, atom)?;
T(stack, &[LEAF, tape])
} else {
let virt = T(stack, &[dat, dat.as_cell()?.head()]);
let load = T(stack, &[virt, D(0)]);
let subj = T(stack, &[D(0), load, D(0)]);
let tone = jet_mink(stack, newt, subj)?.as_cell()?;
if unsafe { !tone.head().raw_equals(D(0)) } {
let tape = tape(stack, "####");
T(stack, &[LEAF, tape])
} else {
// XX: need to check that this is actually a tank
// return leaf+"mean.mook" if not
tone.tail()
}
}
}
tas!(b"spot") => {
let spot = dat.as_cell()?;
let pint = spot.tail().as_cell()?;
let pstr = pint.head().as_cell()?;
let pend = pint.tail().as_cell()?;
let colo = T(stack, &[D(b':' as u64), D(0)]);
let trel = T(stack, &[colo, D(0), D(0)]);
let smyt = smyt(stack, spot.head())?;
let aura = D(tas!(b"ud")).as_direct()?;
let str_lin = scow(stack, aura, pstr.head().as_atom()?)?;
let str_col = scow(stack, aura, pstr.tail().as_atom()?)?;
let end_lin = scow(stack, aura, pend.head().as_atom()?)?;
let end_col = scow(stack, aura, pend.tail().as_atom()?)?;
let mut list: Cell;
unsafe {
list = end_col.as_cell()?;
loop {
if let Some(_) = list.tail().atom() {
break;
}
list = list.tail().as_cell()?;
}
// "{end_col}]>"
let p4 = T(stack, &[D(b']' as u64), D(b'>' as u64), D(0)]);
(*list.tail_as_mut()) = p4;
list = end_lin.as_cell()?;
loop {
if let Some(_) = list.tail().atom() {
break;
}
list = list.tail().as_cell()?;
}
// "{end_lin} {end_col}]>"
let p3 = T(stack, &[D(b' ' as u64), end_col]);
(*list.tail_as_mut()) = p3;
list = str_col.as_cell()?;
loop {
if let Some(_) = list.tail().atom() {
break;
}
list = list.tail().as_cell()?;
}
// "{str_col}].[{end_lin} {end_col}]>"
let p2 = T(
stack,
&[D(b']' as u64), D(b'.' as u64), D(b'[' as u64), end_lin],
);
(*list.tail_as_mut()) = p2;
list = str_lin.as_cell()?;
loop {
if let Some(_) = list.tail().atom() {
break;
}
list = list.tail().as_cell()?;
}
// "{str_lin} {str_col}].[{end_lin} {end_col}]>"
let p1 = T(stack, &[D(b' ' as u64), str_col]);
(*list.tail_as_mut()) = p1;
// "<[{str_lin} {str_col}].[{end_lin} {end_col}]>"
let tape = T(stack, &[D(b'<' as u64), D(b'[' as u64), str_lin]);
let finn = T(stack, &[LEAF, tape]);
T(stack, &[ROSE, trel, smyt, finn, D(0)])
}
}
_ => {
let tape = rip(stack, 3, 1, tag.as_atom())?;
T(
stack,
&[
D(tas!(b"m")),
D(tas!(b"o")),
D(tas!(b"o")),
D(tas!(b"k")),
D(tas!(b".")),
tape,
],
)
} // XX: TODO
// %hand
// %hunk
// %lose
};
res = T(stack, &[tank, res]);
list = cell.tail();
}
let toon = Cell::new(stack, D(2), res);
Ok(toon)
} else { unsafe {
unsafe {
let mut res = D(0);
let mut list = original_list;
// Unused if flopping
let (mut new_cell, mut new_memory) = Cell::new_raw_mut(stack);
let mut memory: *mut CellMemory = new_memory;
let mut memory = new_memory;
// loop guaranteed to run at least once
loop {
if list.raw_equals(D(0)) {
break;
} else if res.raw_equals(D(0)) {
} else if !flop && res.raw_equals(D(0)) {
res = new_cell.as_noun();
} else {
} else if !flop {
(new_cell, new_memory) = Cell::new_raw_mut(stack);
(*memory).tail = new_cell.as_noun();
memory = new_memory
@ -261,7 +133,7 @@ pub mod util {
let end_lin = scow(stack, aura, pend.head().as_atom()?)?;
let end_col = scow(stack, aura, pend.tail().as_atom()?)?;
let mut list: Cell = end_col.as_cell()?;
let mut list = end_col.as_cell()?;
loop {
if let Some(_) = list.tail().atom() {
break;
@ -333,14 +205,21 @@ pub mod util {
// %lose
};
(*memory).head = tank;
if flop {
res = T(stack, &[tank, res]);
} else {
(*memory).head = tank;
}
list = cell.tail();
}
(*memory).tail = D(0);
if !flop {
(*memory).tail = D(0);
}
let toon = Cell::new(stack, D(2), res);
Ok(toon)
} }
}
}
pub fn smyt(stack: &mut NockStack, path: Noun) -> jets::Result {
@ -355,7 +234,7 @@ pub mod util {
}
fn smyt_help(stack: &mut NockStack, path: Noun) -> jets::Result {
// XX: Need deferred Cell allocation, like u3i_defcons in Vere
// XX: switch to using Cell:new_raw_mut
if unsafe { path.raw_equals(D(0)) } {
return Ok(D(0));
}

4
rust/ares/src/serf.rs
View File

@ -106,7 +106,7 @@ pub fn serf() -> io::Result<()> {
}
Err(NockErr::Error(trace)) => {
let tone = Cell::new(stack, D(2), trace);
let tang = mook(stack, &mut Some(newt), tone, true)
let tang = mook(stack, &mut Some(newt), tone, false)
.expect("serf: play: +mook crashed on bail")
.tail();
let goof = T(stack, &[D(tas!(b"exit")), tang]);
@ -142,7 +142,7 @@ pub fn serf() -> io::Result<()> {
Err(NockErr::Error(trace)) => {
// XX: Our Arvo can't currently handle %crud, so just bail
let tone = Cell::new(stack, D(2), trace);
let tang = mook(stack, &mut Some(newt), tone, true)
let tang = mook(stack, &mut Some(newt), tone, false)
.expect("serf: play: +mook crashed on bail")
.tail();
let goof = T(stack, &[D(tas!(b"exit")), tang]);