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

jets: move useful function into jet utils

Browse Source
This commit is contained in:
Alex Shelkovnykov 2023-12-07 12:18:40 -03:00
parent 030218df9f
commit 2f86f30b8a
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rust/ares/src/jets.rs
View File

@ -327,7 +327,11 @@ pub mod util {
}
pub fn assert_jet(context: &mut Context, jet: Jet, sam: Noun, res: Noun) {
let sam = T(&mut context.stack, &[D(0), sam, D(0)]);
assert_jet_door(context, jet, sam, D(0), res)
}
pub fn assert_jet_door(context: &mut Context, jet: Jet, sam: Noun, pay: Noun, res: Noun) {
let sam = T(&mut context.stack, &[D(0), sam, pay]);
let jet_res = assert_no_alloc(|| jet(context, sam).unwrap());
assert_noun_eq(&mut context.stack, jet_res, res);
}

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

@ -340,9 +340,8 @@ pub fn jet_stag(context: &mut Context, subject: Noun) -> Result {
pub mod util {
use crate::interpreter::{inc, Context};
use crate::jets::util::test::*;
use crate::jets::{Jet, Result};
use crate::noun::{Cell, Noun, D, T};
use crate::jets::Result;
use crate::noun::{Noun, D, T};
use std::cmp::Ordering;
pub fn last(zyc: Noun, naz: Noun) -> Result {
@ -400,19 +399,6 @@ pub mod util {
pub fn fail(context: &mut Context, hair: Noun) -> Result {
Ok(T(&mut context.stack, &[hair, D(0)]))
}
pub fn assert_jet_in_door(
context: &mut Context,
jet: Jet,
sam: Noun, //&[fn(&mut Context) -> Noun], // regular sample
ctx: Noun, //&[fn(&mut Context) -> Noun], // door sample as context
res: Noun,
) {
let pay = Cell::new(&mut context.stack, sam, ctx).as_noun();
let sbj = Cell::new(&mut context.stack, D(0), pay).as_noun();
let jet_res = jet(context, sbj).unwrap();
assert_noun_eq(&mut context.stack, jet_res, res);
}
}
#[cfg(test)]
@ -421,18 +407,12 @@ mod tests {
use crate::jets::util::test::*;
use crate::noun::{D, T};
use crate::serialization::cue;
use ibig::ubig;
#[test]
fn test_easy() {
let c = &mut init_context();
/*
'a' at +6 of easy
[[1 1] "abc"] at +6 of (easy 'a')
*/
// ((easy 'a') [[1 1] "abc"])
// [[1 1] "abc"]
let sam_jam = A(&mut c.stack, &ubig!(3205468216717221061))
@ -445,7 +425,7 @@ mod tests {
.unwrap();
let ans = cue(&mut c.stack, ans_jam);
let ctx = T(&mut c.stack, &[D(0), D(97), D(0)]);
util::assert_jet_in_door(c, jet_easy, sam, ctx, ans);
assert_jet_door(c, jet_easy, sam, ctx, ans);
// ((easy %foo) [[1 1] "abc"])
// [[1 1] "abc"]
@ -459,6 +439,6 @@ mod tests {
.unwrap();
let ans = cue(&mut c.stack, ans_jam);
let ctx = T(&mut c.stack, &[D(0), D(0x6f6f66), D(0)]);
util::assert_jet_in_door(c, jet_easy, sam, ctx, ans);
assert_jet_door(c, jet_easy, sam, ctx, ans);
}
}