git.iko.soy/wock
on master help sign in
Added more jets
c1add08iko
nock/src/interpreter.rs+6
compare with master
unifiedsplit
@@ -24,6 +24,7 @@ pub struct Nouns {
24 pub memo: Rc<Noun>,
24 pub memo: Rc<Noun>,
25 pub mean: Rc<Noun>,
25 pub mean: Rc<Noun>,
26 pub slog: Rc<Noun>,
26 pub slog: Rc<Noun>,
27+ pub fast: Rc<Noun>,
27}
28}
28
29
29#[derive(Clone)]
30#[derive(Clone)]
@@ -65,6 +66,7 @@ pub fn generate_interpreter_context() -> InterpreterContext {
65 let memo = Rc::new(Noun::from_bytes(b"memo"));
66 let memo = Rc::new(Noun::from_bytes(b"memo"));
66 let mean = Rc::new(Noun::from_bytes(b"mean"));
67 let mean = Rc::new(Noun::from_bytes(b"mean"));
67 let slog = Rc::new(Noun::from_bytes(b"slog"));
68 let slog = Rc::new(Noun::from_bytes(b"slog"));
69+ let fast = Rc::new(Noun::from_bytes(b"fast"));
68 InterpreterContext {
70 InterpreterContext {
69 jets,
71 jets,
70 double_jets,
72 double_jets,
@@ -81,6 +83,7 @@ pub fn generate_interpreter_context() -> InterpreterContext {
81 memo,
83 memo,
82 mean,
84 mean,
83 slog,
85 slog,
86+ fast,
84 },
87 },
85 big_uints,
88 big_uints,
86 memo: BTreeMap::new(),
89 memo: BTreeMap::new(),
@@ -304,6 +307,9 @@ fn tar_u32<'a>(
304
307
305 (ctx.slog)(&ram(ctx, tank.clone()).unwrap_or(String::new()));
308 (ctx.slog)(&ram(ctx, tank.clone()).unwrap_or(String::new()));
306 eval(ctx)
309 eval(ctx)
310+ } else if *p == ctx.nouns.fast {
311+ // eprintln!("{}", q.as_cell().unwrap().1.as_cell().unwrap().0);
312+ eval(ctx)
307 } else {
313 } else {
308 eval(ctx)
314 eval(ctx)
309 }
315 }
nock/src/jets.rs+105−1
@@ -2,13 +2,14 @@ use core::panic;
2use murmur3::murmur3_32;
2use murmur3::murmur3_32;
3use num_integer::Integer;
3use num_integer::Integer;
4use std::{
4use std::{
5+ borrow::Borrow,
5 collections::BTreeMap,
6 collections::BTreeMap,
6 iter::{once, repeat_n, zip},
7 iter::{once, repeat_n, zip},
7 rc::Rc,
8 rc::Rc,
8};
9};
9
10
10use crate::{
11use crate::{
11− interpreter::{slam_pulled_gate, InterpreterContext, TTanks},
12+ interpreter::{slam_pulled_gate, InterpreterContext, TTanks, EMPTY_TANKS},
12 noun::{self, cell, Atom, Edge, Hair, Nail, Noun},
13 noun::{self, cell, Atom, Edge, Hair, Nail, Noun},
13};
14};
14
15
@@ -107,6 +108,10 @@ pub fn generate_jets() -> Jets {
107 (124976064672625230427889101290245200507, TRIP),
108 (124976064672625230427889101290245200507, TRIP),
108 (4078279288073906183633157465551067635, MUK),
109 (4078279288073906183633157465551067635, MUK),
109 (261900159748071234702685239353558471892, MUG),
110 (261900159748071234702685239353558471892, MUG),
111+ (198191257620924788695943358402651905954, AOR),
112+ (299422828284010240628877806738195667652, DOR),
113+ (166326796552601297695313176538120818632, GOR),
114+ (7942398240152905363972500667649380756, MOR),
110 ])
115 ])
111}
116}
112
117
@@ -1007,6 +1012,105 @@ static MUK: Jet = |_ctx, n| {
1007 Ok(Rc::new(Noun::from_u32(muk(seed, len, key))))
1012 Ok(Rc::new(Noun::from_u32(muk(seed, len, key))))
1008};
1013};
1009
1014
1015+static AOR: Jet = |ctx, n| {
1016+ let (a, b) = n.as_cell().ok_or(EMPTY_TANKS)?;
1017+
1018+ if a == b {
1019+ Ok(ctx.nouns.y.clone())
1020+ } else {
1021+ match (a.borrow(), b.borrow()) {
1022+ (Noun::Cell { .. }, Noun::Atom(_)) => Ok(ctx.nouns.n.clone()),
1023+ (Noun::Cell { p: a_p, q: a_q, .. }, Noun::Cell { p: b_p, q: b_q, .. }) => {
1024+ if a_p == b_p {
1025+ AOR(ctx, &cell(a_q, b_q))
1026+ } else {
1027+ AOR(ctx, &cell(a_p, b_p))
1028+ }
1029+ }
1030+ (Noun::Atom(_), Noun::Cell { .. }) => Ok(ctx.nouns.y.clone()),
1031+ (Noun::Atom(a), Noun::Atom(b)) => {
1032+ let a = a.to_bytes_le();
1033+ let b = b.to_bytes_le();
1034+
1035+ let mut i = 0;
1036+ loop {
1037+ let c = a.get(i).unwrap_or(&0);
1038+ let d = b.get(i).unwrap_or(&0);
1039+
1040+ if a[0] == b[0] {
1041+ i += 1;
1042+ } else {
1043+ if c < d {
1044+ return Ok(ctx.nouns.y.clone());
1045+ } else {
1046+ return Ok(ctx.nouns.n.clone());
1047+ }
1048+ }
1049+ }
1050+ }
1051+ }
1052+ }
1053+};
1054+
1055+static DOR: Jet = |ctx, n| {
1056+ let (a, b) = n.as_cell().ok_or(EMPTY_TANKS)?;
1057+
1058+ if a == b {
1059+ Ok(ctx.nouns.y.clone())
1060+ } else {
1061+ match (a.borrow(), b.borrow()) {
1062+ (Noun::Cell { .. }, Noun::Atom(_)) => Ok(ctx.nouns.n.clone()),
1063+ (Noun::Cell { p: a_p, q: a_q, .. }, Noun::Cell { p: b_p, q: b_q, .. }) => {
1064+ if a_p == b_p {
1065+ DOR(ctx, &cell(a_q, b_q))
1066+ } else {
1067+ DOR(ctx, &cell(a_p, b_p))
1068+ }
1069+ }
1070+ (Noun::Atom(_), Noun::Cell { .. }) => Ok(ctx.nouns.y.clone()),
1071+ (Noun::Atom(a), Noun::Atom(b)) => {
1072+ if a < b {
1073+ Ok(ctx.nouns.y.clone())
1074+ } else {
1075+ Ok(ctx.nouns.n.clone())
1076+ }
1077+ }
1078+ }
1079+ }
1080+};
1081+
1082+static GOR: Jet = |ctx, n| {
1083+ let (a, b) = n.as_cell().ok_or(EMPTY_TANKS)?;
1084+ let c = a.mug();
1085+ let d = b.mug();
1086+
1087+ if c == d {
1088+ DOR(ctx, n)
1089+ } else {
1090+ if c < d {
1091+ Ok(ctx.nouns.y.clone())
1092+ } else {
1093+ Ok(ctx.nouns.n.clone())
1094+ }
1095+ }
1096+};
1097+
1098+static MOR: Jet = |ctx, n| {
1099+ let (a, b) = n.as_cell().ok_or(EMPTY_TANKS)?;
1100+ let c = Noun::from_u32(a.mug()).mug();
1101+ let d = Noun::from_u32(b.mug()).mug();
1102+
1103+ if c == d {
1104+ DOR(ctx, n)
1105+ } else {
1106+ if c < d {
1107+ Ok(ctx.nouns.y.clone())
1108+ } else {
1109+ Ok(ctx.nouns.n.clone())
1110+ }
1111+ }
1112+};
1113+
1010static JUST: DoubleJet = |ctx, n, m| {
1114static JUST: DoubleJet = |ctx, n, m| {
1011 let char = n.as_atom()?;
1115 let char = n.as_atom()?;
1012 let nail = m.as_nail()?;
1116 let nail = m.as_nail()?;
nock/test.hoonnew file+3
@@ -0,0 +1,3 @@
1+|= *
2+=/ target (gor 'd' 'c')
3+(crip "{<target>}")