Feat: lots of improvements

tests/forth/randomness.rs

@@ -1,4 +1,5 @@
 use super::harness::*;
+use cagire::forth::ResolvedValue;
 
 #[test]
 fn rand_in_range() {
@@ -253,3 +254,14 @@ fn wchoose_quotation() {
         .unwrap();
     assert_eq!(stack_int(&f), 20);
 }
+
+#[test]
+fn choose_trace_resolved_span() {
+    let script = "sine tri 2 choose";
+    let (_f, trace) = run_with_trace(script);
+    assert_eq!(trace.resolved.len(), 1, "expected 1 resolved entry: {:?}", trace.resolved);
+    let (span, ref val) = trace.resolved[0];
+    assert_eq!(span.start, 11);
+    assert_eq!(span.end, 17);
+    assert!(matches!(val, ResolvedValue::Str(s) if s.as_ref() == "sine" || s.as_ref() == "tri"));
+}