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

jets: cargo fmt + lint

Browse Source
This commit is contained in:
Alex Shelkovnykov 2023-12-19 14:51:21 -03:00
parent 9d65f6ecbc
commit e1e79bbef4
4 changed files with 63 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,9 +919,7 @@ pub fn interpret(context: &mut Context, mut subject: Noun, formula: Noun) -> Res
match nock {
Ok(res) => Ok(res),
Err(err) => {
return Err(exit(context, &snapshot, virtual_frame, err));
}
Err(err) => Err(exit(context, &snapshot, virtual_frame, err)),
}
}

30
rust/ares/src/jets/math.rs
View File

@ -268,19 +268,13 @@ pub mod util {
/// Greater than
pub fn gth(stack: &mut NockStack, a: Atom, b: Atom) -> bool {
if let (Ok(a), Ok(b)) = (a.as_direct(), b.as_direct()) {
if a.data() > b.data() {
true
} else {
false
}
a.data() > b.data()
} else if a.bit_size() > b.bit_size() {
true
} else if a.bit_size() < b.bit_size() {
false
} else if a.as_ubig(stack) > b.as_ubig(stack) {
true
} else {
false
a.as_ubig(stack) > b.as_ubig(stack)
}
}
@ -306,38 +300,26 @@ pub mod util {
/// Less than or equal to
pub fn lte(stack: &mut NockStack, a: Atom, b: Atom) -> bool {
if let (Ok(a), Ok(b)) = (a.as_direct(), b.as_direct()) {
if a.data() <= b.data() {
true
} else {
false
}
a.data() <= b.data()
} else if a.bit_size() < b.bit_size() {
true
} else if a.bit_size() > b.bit_size() {
false
} else if a.as_ubig(stack) <= b.as_ubig(stack) {
true
} else {
false
a.as_ubig(stack) <= b.as_ubig(stack)
}
}
/// Greater than or equal to
pub fn gte(stack: &mut NockStack, a: Atom, b: Atom) -> bool {
if let (Ok(a), Ok(b)) = (a.as_direct(), b.as_direct()) {
if a.data() >= b.data() {
true
} else {
false
}
a.data() >= b.data()
} else if a.bit_size() > b.bit_size() {
true
} else if a.bit_size() < b.bit_size() {
false
} else if a.as_ubig(stack) >= b.as_ubig(stack) {
true
} else {
false
a.as_ubig(stack) >= b.as_ubig(stack)
}
}

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

@ -1,12 +1,12 @@
/** Parsing jets
*/
use either::{Left, Right};
use crate::interpreter::Context;
use crate::jets::math::util::{gte, lte};
use crate::jets::util::{kick, slam, slot};
use crate::jets::Result;
use crate::mem::NockStack;
use crate::noun::{Noun, D, T, YES};
use either::{Left, Right};
use super::math::util::lth;
@ -233,8 +233,7 @@ pub fn jet_plug(context: &mut Context, subject: Noun) -> Result {
if unsafe { q_vex.raw_equals(D(0)) } {
Ok(vex)
}
else {
} else {
let uq_vex = q_vex.as_cell()?.tail().as_cell()?;
let puq_vex = uq_vex.head();
let quq_vex = uq_vex.tail();
@ -370,26 +369,18 @@ pub fn jet_stir(context: &mut Context, subject: Noun) -> Result {
fn stew_wor(stack: &mut NockStack, ort: Noun, wan: Noun) -> Result {
match ort.as_either_atom_cell() {
Left(ort_atom) => {
match wan.as_either_atom_cell() {
Left(wan_atom) => {
Ok(lth(stack, ort_atom, wan_atom))
}
Right(wan_cell) => {
Ok(lth(stack, ort_atom, wan_cell.head().as_atom()?))
}
}
}
Right(ort_cell) => {
match wan.as_either_atom_cell() {
Left(wan_atom) => {
Ok(lth(stack, ort_cell.tail().as_atom()?, wan_atom))
}
Right(wan_cell) => {
Ok(lth(stack, ort_cell.tail().as_atom()?, wan_cell.head().as_atom()?))
}
}
}
Left(ort_atom) => match wan.as_either_atom_cell() {
Left(wan_atom) => Ok(lth(stack, ort_atom, wan_atom)),
Right(wan_cell) => Ok(lth(stack, ort_atom, wan_cell.head().as_atom()?)),
},
Right(ort_cell) => match wan.as_either_atom_cell() {
Left(wan_atom) => Ok(lth(stack, ort_cell.tail().as_atom()?, wan_atom)),
Right(wan_cell) => Ok(lth(
stack,
ort_cell.tail().as_atom()?,
wan_cell.head().as_atom()?,
)),
},
}
}
@ -402,51 +393,48 @@ pub fn jet_stew(context: &mut Context, subject: Noun) -> Result {
let q_tub = tub.as_cell()?.tail();
if unsafe { q_tub.raw_equals(D(0)) } {
return util::fail(context, p_tub);
} else {
let iq_tub = q_tub.as_cell()?.head();
if !iq_tub.as_atom()?.is_direct() {
}
let iq_tub = q_tub.as_cell()?.head();
if !iq_tub.as_atom()?.is_direct() {
return util::fail(context, p_tub);
}
loop {
if unsafe { hel.raw_equals(D(0)) } {
return util::fail(context, p_tub);
} else {
loop {
if unsafe { hel.raw_equals(D(0)) } {
let n_hel = slot(hel, 2)?;
let l_hel = slot(hel, 6)?;
let r_hel = slot(hel, 7)?;
let pn_hel = n_hel.as_cell()?.head();
let qn_hel = n_hel.as_cell()?.tail();
let bit;
if !pn_hel.is_cell() {
bit = iq_tub.as_direct()?.data() == pn_hel.as_direct()?.data();
} else {
let hpn_hel = pn_hel.as_cell()?.head();
let tpn_hel = pn_hel.as_cell()?.tail();
if !hpn_hel.as_atom()?.is_direct() || !tpn_hel.as_atom()?.is_direct() {
return util::fail(context, p_tub);
} else {
let n_hel = slot(hel, 2)?;
let l_hel = slot(hel, 6)?;
let r_hel = slot(hel, 7)?;
let pn_hel = n_hel.as_cell()?.head();
let qn_hel = n_hel.as_cell()?.tail();
let bit;
if !pn_hel.is_cell() {
bit = iq_tub.as_direct()?.data() == pn_hel.as_direct()?.data();
} else {
let hpn_hel = pn_hel.as_cell()?.head();
let tpn_hel = pn_hel.as_cell()?.tail();
if !hpn_hel.as_atom()?.is_direct() || !tpn_hel.as_atom()?.is_direct() {
return util::fail(context, p_tub);
} else {
let iq_tub_atom = iq_tub.as_atom()?;
let hpn_hel_atom = hpn_hel.as_atom()?;
let tpn_hel_atom = tpn_hel.as_atom()?;
bit = gte(&mut context.stack, iq_tub_atom, hpn_hel_atom) && lte(&mut context.stack, iq_tub_atom, tpn_hel_atom);
}
}
if bit {
return slam(context, qn_hel, tub);
} else {
if unsafe { stew_wor(&mut context.stack, iq_tub, pn_hel)?.raw_equals(YES) } {
if unsafe { l_hel.raw_equals(D(0)) } {
}
hel = l_hel;
} else {
hel = r_hel;
}
}
let iq_tub_atom = iq_tub.as_atom()?;
let hpn_hel_atom = hpn_hel.as_atom()?;
let tpn_hel_atom = tpn_hel.as_atom()?;
bit = gte(&mut context.stack, iq_tub_atom, hpn_hel_atom)
&& lte(&mut context.stack, iq_tub_atom, tpn_hel_atom);
}
}
if bit {
return slam(context, qn_hel, tub);
} else if unsafe { stew_wor(&mut context.stack, iq_tub, pn_hel)?.raw_equals(YES) } {
hel = l_hel;
} else {
hel = r_hel;
}
}
}
}
@ -460,9 +448,8 @@ pub fn jet_shim(context: &mut Context, subject: Noun) -> Result {
let q_tub = tub.as_cell()?.tail();
if unsafe { q_tub.raw_equals(D(0)) } {
return util::fail(context, p_tub);
}
else {
util::fail(context, p_tub)
} else {
let p_zep = zep.as_cell()?.head();
let q_zep = zep.as_cell()?.tail();
let iq_tub = q_tub.as_cell()?.head();
@ -472,10 +459,9 @@ pub fn jet_shim(context: &mut Context, subject: Noun) -> Result {
let iq_tub_dat = iq_tub.as_direct()?.data();
if (iq_tub_dat >= p_zep_dat) && (iq_tub_dat <= q_zep_dat) {
return util::next(context, tub);
}
else {
return util::fail(context, p_tub);
util::next(context, tub)
} else {
util::fail(context, p_tub)
}
}
}

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

@ -1,4 +1,5 @@
use crate::hamt::Hamt;
use crate::interpreter;
use crate::interpreter::{inc, interpret, Error};
use crate::jets::cold::Cold;
use crate::jets::hot::{Hot, HotEntry};
@ -10,7 +11,6 @@ use crate::mug::*;
use crate::newt::Newt;
use crate::noun::{Atom, Cell, DirectAtom, Noun, Slots, D, T};
use crate::trace::*;
use crate::interpreter;
use ares_macros::tas;
use signal_hook;
use signal_hook::consts::SIGINT;