@@ -1,15 +1,23 @@
11use core::str;
22use std::borrow::Borrow;
33use std::collections::BTreeMap;
4+use std::collections::HashMap;
45use std::rc::Rc;
6+use std::sync::Mutex;
57
68use fplist::cons;
79use fplist::PersistentList;
10+use lazy_static::lazy_static;
811use num_bigint::BigUint;
912
1013use crate::jets::*;
1114use crate::noun::*;
1215
16+// #[cfg(feature = "count-jets")]
17+lazy_static! {
18+ pub static ref JET_COUNTER: Mutex<HashMap<Atom, u32>> = Mutex::new(HashMap::new());
19+}
20+
1321#[derive(Clone)]
1422pub struct Nouns {
1523 pub y: Rc<Noun>,
@@ -24,6 +32,7 @@ pub struct Nouns {
2432 pub memo: Rc<Noun>,
2533 pub mean: Rc<Noun>,
2634 pub slog: Rc<Noun>,
35+ pub fast: Rc<Noun>,
2736}
2837
2938#[derive(Clone)]
@@ -65,6 +74,7 @@ pub fn generate_interpreter_context() -> InterpreterContext {
6574 let memo = Rc::new(Noun::from_bytes(b"memo"));
6675 let mean = Rc::new(Noun::from_bytes(b"mean"));
6776 let slog = Rc::new(Noun::from_bytes(b"slog"));
77+ let fast = Rc::new(Noun::from_bytes(b"fast"));
6878 InterpreterContext {
6979 jets,
7080 double_jets,
@@ -81,6 +91,7 @@ pub fn generate_interpreter_context() -> InterpreterContext {
8191 memo,
8292 mean,
8393 slog,
94+ fast,
8495 },
8596 big_uints,
8697 memo: BTreeMap::new(),
@@ -193,7 +204,7 @@ fn hax(
193204
194205fn tar_u32<'a>(
195206 ctx: &mut InterpreterContext,
196− subj: Rc<Noun>,
207+ subj: &'a Rc<Noun>,
197208 op: u32,
198209 formula: &'a Rc<Noun>,
199210) -> Result<Rc<Noun>, TTanks> {
@@ -216,16 +227,16 @@ fn tar_u32<'a>(
216227 match ctx.jets.get(&hash) {
217228 Some(f) => f(ctx, sample),
218229 None => {
219− let foo = tar(ctx, subj.clone(), &b)?;
230+ let foo = tar(ctx, subj, &b)?;
220231 let bar = tar(ctx, subj, &c)?;
221− tar(ctx, foo, &bar)
232+ tar(ctx, &foo, &bar)
222233 }
223234 }
224235 }
225236 _ => {
226− let foo = tar(ctx, subj.clone(), &b)?;
237+ let foo = tar(ctx, subj, &b)?;
227238 let bar = tar(ctx, subj, &c)?;
228− tar(ctx, foo, &bar)
239+ tar(ctx, &foo, &bar)
229240 }
230241 }
231242 }
@@ -236,7 +247,7 @@ fn tar_u32<'a>(
236247 4 => Ok(Rc::new(lus(&*tar(ctx, subj, &formula)?)?)),
237248 5 => {
238249 let (b, c) = formula.as_cell().ok_or(TTanks::new())?;
239− let foo = tar(ctx, subj.clone(), &b)?;
250+ let foo = tar(ctx, subj, &b)?;
240251 let bar = tar(ctx, subj, &c)?;
241252 Ok(tis(ctx, &foo, &bar).clone())
242253 }
@@ -244,29 +255,29 @@ fn tar_u32<'a>(
244255 let (b, c) = formula.as_cell().ok_or(TTanks::new())?;
245256 let (c, d) = c.as_cell().ok_or(TTanks::new())?;
246257
247− let bar = tar_u32(ctx, subj.clone(), 4, &cell(&ctx.nouns.four.clone(), &b))?;
258+ let bar = tar_u32(ctx, subj, 4, &cell(&ctx.nouns.four.clone(), &b))?;
248259
249− let foo = tar_u32(ctx, ctx.nouns.two_three.clone(), 0, &bar)?;
250− let foo = tar_u32(ctx, cell(&c, &d), 0, &foo)?;
260+ let foo = tar_u32(ctx, &ctx.nouns.two_three.clone(), 0, &bar)?;
261+ let foo = tar_u32(ctx, &cell(&c, &d), 0, &foo)?;
251262
252263 tar(ctx, subj, &foo)
253264 }
254265 7 => {
255266 let (b, c) = formula.as_cell().ok_or(TTanks::new())?;
256267 let foo = tar(ctx, subj, &b)?;
257− tar(ctx, foo, &c)
268+ tar(ctx, &foo, &c)
258269 }
259270 8 => {
260271 let (b, c) = formula.as_cell().ok_or(TTanks::new())?;
261− let foo = tar(ctx, subj.clone(), &b)?;
262− tar(ctx, cell(&foo, &subj), &c)
272+ let foo = tar(ctx, subj, &b)?;
273+ tar(ctx, &cell(&foo, &subj), &c)
263274 }
264275 9 => {
265276 let (b, c) = formula.as_cell().ok_or(TTanks::new())?;
266277 let foo = tar(ctx, subj, &c)?;
267278 tar_u32(
268279 ctx,
269− foo,
280+ &foo,
270281 2,
271282 &cell(&ctx.nouns.sig_one, &cell(&ctx.nouns.sig, &b)),
272283 )
@@ -276,7 +287,7 @@ fn tar_u32<'a>(
276287 let (b, c) = b.as_cell().ok_or(TTanks::new())?;
277288 let b = b.as_atom().ok_or(TTanks::new())?;
278289
279− let foo = tar(ctx, subj.clone(), &c)?;
290+ let foo = tar(ctx, subj, &c)?;
280291 let bar = tar(ctx, subj, &d)?;
281292 hax(ctx, b, &foo, &bar)
282293 }
@@ -285,7 +296,7 @@ fn tar_u32<'a>(
285296 match b.borrow() {
286297 Noun::Atom(_) => tar(ctx, subj, &d),
287298 Noun::Cell { p, q, .. } => {
288− let eval = |ctx: &mut InterpreterContext| tar(ctx, subj.clone(), &d);
299+ let eval = |ctx: &mut InterpreterContext| tar(ctx, subj, &d);
289300 if *p == ctx.nouns.memo {
290301 let hash = cell(&subj, &d).hash();
291302 match ctx.memo.get(&hash) {
@@ -299,11 +310,33 @@ fn tar_u32<'a>(
299310 } else if *p == ctx.nouns.mean {
300311 with_trace((subj.clone(), q.clone()), eval(ctx))
301312 } else if *p == ctx.nouns.slog {
302− let noun = tar(ctx, subj.clone(), &q)?;
313+ let noun = tar(ctx, subj, &q)?;
303314 let (_prio, tank) = noun.as_cell().ok_or(TTanks::new())?;
304315
305316 (ctx.slog)(&ram(ctx, tank.clone()).unwrap_or(String::new()));
306317 eval(ctx)
318+ } else if *p == ctx.nouns.fast {
319+ if cfg!(feature = "count-jets") {
320+ let tag = q.as_cell().unwrap().1.as_cell().unwrap().0.as_atom();
321+ match tag {
322+ None => (),
323+ Some(tag) => {
324+ let mut counter = JET_COUNTER.lock().unwrap();
325+ match counter.get(tag) {
326+ None => {
327+ counter.insert(tag.clone(), 1);
328+ ()
329+ }
330+ Some(v) => {
331+ let v = *v;
332+ counter.insert(tag.clone(), v + 1);
333+ ()
334+ }
335+ }
336+ }
337+ }
338+ }
339+ eval(ctx)
307340 } else {
308341 eval(ctx)
309342 }
@@ -323,24 +356,22 @@ fn ram(ctx: &mut InterpreterContext, tank: Rc<Noun>) -> Option<String> {
323356 Noun::Cell { p, q, .. } => {
324357 let tag = p.as_atom()?.to_bytes_le();
325358 if tag == b"leaf" {
326− let mut bytes = crip(ctx, q.clone()).ok()?.as_atom()?.to_bytes_le();
359+ let mut bytes = crip(ctx, q.clone()).ok()?.as_bytes()?;
327360 Some(String::from(str::from_utf8_mut(&mut bytes).ok()?))
328361 } else if tag == b"palm" {
329− let (mid, foo) = q.as_cell()?;
330− let (open, foo) = foo.as_cell()?;
331− let (flat_open, foo) = foo.as_cell()?;
332− let (close, tanks) = foo.as_cell()?;
362+ let (spacers, tanks) = q.as_cell()?;
363+ let (mid, open, flat_open, close) = spacers.tuple_4()?;
333364
334− let mut mid = mid.as_bytes()?;
365+ let mut mid = crip(ctx, mid.clone()).ok()?.as_bytes()?;
335366 let mid = String::from(str::from_utf8_mut(&mut mid).ok()?);
336367
337− let mut open = open.as_bytes()?;
368+ let mut open = crip(ctx, open.clone()).ok()?.as_bytes()?;
338369 let open = String::from(str::from_utf8_mut(&mut open).ok()?);
339370
340− let mut flat_open = flat_open.as_bytes()?;
371+ let mut flat_open = crip(ctx, flat_open.clone()).ok()?.as_bytes()?;
341372 let flat_open = String::from(str::from_utf8_mut(&mut flat_open).ok()?);
342373
343− let mut close = close.as_bytes()?;
374+ let mut close = crip(ctx, close.clone()).ok()?.as_bytes()?;
344375 let close = String::from(str::from_utf8_mut(&mut close).ok()?);
345376
346377 let mut target = String::new();
@@ -363,17 +394,16 @@ fn ram(ctx: &mut InterpreterContext, tank: Rc<Noun>) -> Option<String> {
363394
364395 Some(target)
365396 } else if tag == b"rose" {
366− let (mid, foo) = q.as_cell()?;
367− let (open, foo) = foo.as_cell()?;
368− let (close, tanks) = foo.as_cell()?;
397+ let (spacers, tanks) = q.as_cell()?;
398+ let (mid, open, close) = spacers.tuple_3()?;
369399
370− let mut mid = mid.as_bytes()?;
400+ let mut mid = crip(ctx, mid.clone()).ok()?.as_bytes()?;
371401 let mid = String::from(str::from_utf8_mut(&mut mid).ok()?);
372402
373− let mut open = open.as_bytes()?;
403+ let mut open = crip(ctx, open.clone()).ok()?.as_bytes()?;
374404 let open = String::from(str::from_utf8_mut(&mut open).ok()?);
375405
376− let mut close = close.as_bytes()?;
406+ let mut close = crip(ctx, close.clone()).ok()?.as_bytes()?;
377407 let close = String::from(str::from_utf8_mut(&mut close).ok()?);
378408
379409 let mut target = String::new();
@@ -404,8 +434,15 @@ fn ram(ctx: &mut InterpreterContext, tank: Rc<Noun>) -> Option<String> {
404434pub fn ram_ttanks(ctx: &mut InterpreterContext, tanks: TTanks) -> String {
405435 let mut target = String::new();
406436
407− for tank in tanks.iter() {
437+ let mut first = true;
438+ for tank in tanks.iter().collect::<Vec<_>>().iter().cloned().rev() {
439+ if !first {
440+ target.push('\n');
441+ }
442+
408443 target.push_str(&*ram_ttank(ctx, tank.clone()));
444+
445+ first = false;
409446 }
410447
411448 target
@@ -414,12 +451,16 @@ pub fn ram_ttanks(ctx: &mut InterpreterContext, tanks: TTanks) -> String {
414451pub fn ram_ttank(ctx: &mut InterpreterContext, ttank: TTank) -> String {
415452 let (subj, q) = ttank;
416453
417− let tank = match tar(ctx, subj.clone(), &q) {
454+ let tank = match tar(ctx, &subj, &q) {
418455 Ok(gate) => match eval_pulled_gate(ctx, gate) {
419456 Ok(tank) => tank,
420− Err(_) => return String::new(),
457+ Err(_) => {
458+ return String::new();
459+ }
421460 },
422− Err(_) => return String::new(),
461+ Err(_) => {
462+ return String::new();
463+ }
423464 };
424465 ram(ctx, tank).unwrap_or(String::new())
425466}
@@ -443,13 +484,13 @@ pub const EMPTY_TANKS: TTanks = TTanks::new();
443484
444485pub fn tar<'a>(
445486 ctx: &mut InterpreterContext,
446− subj: Rc<Noun>,
487+ subj: &'a Rc<Noun>,
447488 formula: &'a Noun,
448489) -> Result<Rc<Noun>, TTanks> {
449490 let (op, formula) = formula.as_cell().ok_or(TTanks::new())?;
450491 match op.borrow() {
451492 Noun::Cell { .. } => {
452− let foo = tar(ctx, subj.clone(), &op)?;
493+ let foo = tar(ctx, subj, &op)?;
453494 let bar = tar(ctx, subj, &formula)?;
454495 Ok(cell(&foo, &bar))
455496 }
@@ -470,7 +511,7 @@ pub fn eval_gate(
470511 ctx: &mut InterpreterContext,
471512 gate_factory: &Rc<Noun>,
472513) -> Result<Rc<Noun>, TTanks> {
473− let pulled_gate = tar(ctx, ctx.nouns.sig.clone(), &gate_factory)?;
514+ let pulled_gate = tar(ctx, &ctx.nouns.sig.clone(), &gate_factory)?;
474515 eval_pulled_gate(ctx, pulled_gate)
475516}
476517
@@ -479,7 +520,7 @@ pub fn slam(
479520 gate_factory: &Rc<Noun>,
480521 sample: &Rc<Noun>,
481522) -> Result<Rc<Noun>, TTanks> {
482− let gate = tar(ctx, ctx.nouns.sig.clone(), &gate_factory)?;
523+ let gate = tar(ctx, &ctx.nouns.sig.clone(), &gate_factory)?;
483524
484525 eval_pulled_gate(ctx, replace_sample(&gate, sample)?)
485526}
@@ -489,7 +530,7 @@ pub fn slam(
489530pub fn eval_pulled_gate(ctx: &mut InterpreterContext, gate: Rc<Noun>) -> Result<Rc<Noun>, TTanks> {
490531 tar(
491532 ctx,
492− gate,
533+ &gate,
493534 &cell(
494535 &Rc::new(Noun::Atom(BigUint::new(vec![9]))),
495536 &cell(&ctx.nouns.two, &cell(&ctx.nouns.sig, &ctx.nouns.one)),