From 378ebe5f5601f11c3f428c17bed492012feb251e Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 12 Jun 2023 15:40:43 +0200
Subject: Delayed errors

Fixes #785. Thanks to @Dherse for the idea!
---
 src/eval/func.rs | 25 +++++++++++++++++--------
 src/eval/mod.rs  | 19 ++++++++++++-------
 2 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'src/eval')

diff --git a/src/eval/func.rs b/src/eval/func.rs
index 1745dfb1..28d4a40d 100644
--- a/src/eval/func.rs
+++ b/src/eval/func.rs
@@ -11,7 +11,7 @@ use super::{
     Value, Vm,
 };
 use crate::diag::{bail, SourceResult, StrResult};
-use crate::model::{ElemFunc, Introspector, Locator, Vt};
+use crate::model::{DelayedErrors, ElemFunc, Introspector, Locator, Vt};
 use crate::syntax::ast::{self, AstNode, Expr, Ident};
 use crate::syntax::{SourceId, Span, SyntaxNode};
 use crate::World;
@@ -102,9 +102,10 @@ impl Func {
                     self,
                     vm.world(),
                     route,
-                    TrackedMut::reborrow_mut(&mut vm.vt.tracer),
-                    vm.vt.locator.track(),
                     vm.vt.introspector,
+                    vm.vt.locator.track(),
+                    TrackedMut::reborrow_mut(&mut vm.vt.delayed),
+                    TrackedMut::reborrow_mut(&mut vm.vt.tracer),
                     vm.depth + 1,
                     args,
                 )
@@ -129,9 +130,10 @@ impl Func {
         let mut locator = Locator::chained(vt.locator.track());
         let vt = Vt {
             world: vt.world,
-            tracer: TrackedMut::reborrow_mut(&mut vt.tracer),
-            locator: &mut locator,
             introspector: vt.introspector,
+            locator: &mut locator,
+            delayed: TrackedMut::reborrow_mut(&mut vt.delayed),
+            tracer: TrackedMut::reborrow_mut(&mut vt.tracer),
         };
         let mut vm = Vm::new(vt, route.track(), id, scopes);
         let args = Args::new(self.span(), args);
@@ -326,9 +328,10 @@ impl Closure {
         this: &Func,
         world: Tracked<dyn World + '_>,
         route: Tracked<Route>,
-        tracer: TrackedMut<Tracer>,
-        locator: Tracked<Locator>,
         introspector: Tracked<Introspector>,
+        locator: Tracked<Locator>,
+        delayed: TrackedMut<DelayedErrors>,
+        tracer: TrackedMut<Tracer>,
         depth: usize,
         mut args: Args,
     ) -> SourceResult<Value> {
@@ -344,7 +347,13 @@ impl Closure {
 
         // Prepare VT.
         let mut locator = Locator::chained(locator);
-        let vt = Vt { world, tracer, locator: &mut locator, introspector };
+        let vt = Vt {
+            world,
+            introspector,
+            locator: &mut locator,
+            delayed,
+            tracer,
+        };
 
         // Prepare VM.
         let mut vm = Vm::new(vt, route, closure.location, scopes);
diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index e6016218..fe11606a 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -62,9 +62,6 @@ use ecow::{EcoString, EcoVec};
 use unicode_segmentation::UnicodeSegmentation;
 
 use self::func::{CapturesVisitor, Closure};
-use crate::diag::{
-    bail, error, At, SourceError, SourceResult, StrResult, Trace, Tracepoint,
-};
 use crate::model::{
     Content, Introspector, Label, Locator, Recipe, ShowableSelector, Styles, Transform,
     Unlabellable, Vt,
@@ -75,6 +72,10 @@ use crate::syntax::{
 };
 use crate::util::PathExt;
 use crate::World;
+use crate::{
+    diag::{bail, error, At, SourceError, SourceResult, StrResult, Trace, Tracepoint},
+    model::DelayedErrors,
+};
 
 const MAX_ITERATIONS: usize = 10_000;
 const MAX_CALL_DEPTH: usize = 64;
@@ -102,11 +103,13 @@ pub fn eval(
     // Prepare VT.
     let mut locator = Locator::default();
     let introspector = Introspector::default();
+    let mut delayed = DelayedErrors::default();
     let vt = Vt {
         world,
-        tracer,
-        locator: &mut locator,
         introspector: introspector.track(),
+        locator: &mut locator,
+        delayed: delayed.track_mut(),
+        tracer,
     };
 
     // Prepare VM.
@@ -151,12 +154,14 @@ pub fn eval_string(
     // Prepare VT.
     let mut tracer = Tracer::default();
     let mut locator = Locator::default();
+    let mut delayed = DelayedErrors::default();
     let introspector = Introspector::default();
     let vt = Vt {
         world,
-        tracer: tracer.track_mut(),
-        locator: &mut locator,
         introspector: introspector.track(),
+        locator: &mut locator,
+        delayed: delayed.track_mut(),
+        tracer: tracer.track_mut(),
     };
 
     // Prepare VM.
-- 
cgit v1.2.3