Move route from context to VM

3 files changed, 9 insertions, 12 deletions

diff --git a/src/library/structure/heading.rs b/src/library/structure/heading.rs
index 1cfcb6d0..a0973b90 100644
--- a/src/library/structure/heading.rs
+++ b/src/library/structure/heading.rs
@@ -55,7 +55,7 @@ impl HeadingNode {
     pub const BELOW: Leveled<Option<BlockSpacing>> =
         Leveled::Value(Some(Ratio::new(0.55).into()));
 
-    fn construct(_: &mut Context, args: &mut Args) -> TypResult<Content> {
+    fn construct(_: &mut Machine, args: &mut Args) -> TypResult<Content> {
         Ok(Content::show(Self {
             body: args.expect("body")?,
             level: args.named("level")?.unwrap_or(NonZeroUsize::new(1).unwrap()),
@@ -142,8 +142,8 @@ impl<T: Cast + Clone> Leveled<T> {
             Self::Value(value) => value.clone(),
             Self::Mapping(mapping) => mapping(level),
             Self::Func(func, span) => {
-                let args = Args::from_values(*span, [Value::Int(level.get() as i64)]);
-                func.call(ctx, args)?.cast().at(*span)?
+                let args = Args::new(*span, [Value::Int(level.get() as i64)]);
+                func.call_detached(ctx, args)?.cast().at(*span)?
             }
         })
     }
diff --git a/src/library/structure/list.rs b/src/library/structure/list.rs
index 7686a3f4..84603eb3 100644
--- a/src/library/structure/list.rs
+++ b/src/library/structure/list.rs
@@ -56,7 +56,7 @@ impl<const L: ListKind> ListNode<L> {
     #[property(resolve)]
     pub const SPACING: BlockSpacing = Ratio::one().into();
 
-    fn construct(_: &mut Context, args: &mut Args) -> TypResult<Content> {
+    fn construct(_: &mut Machine, args: &mut Args) -> TypResult<Content> {
         Ok(Content::show(Self {
             start: args.named("start")?.unwrap_or(1),
             tight: args.named("tight")?.unwrap_or(true),
@@ -216,8 +216,8 @@ impl Label {
             }
             Self::Content(content) => content.clone(),
             Self::Func(func, span) => {
-                let args = Args::from_values(*span, [Value::Int(number as i64)]);
-                func.call(ctx, args)?.display()
+                let args = Args::new(*span, [Value::Int(number as i64)]);
+                func.call_detached(ctx, args)?.display()
             }
         })
     }
diff --git a/src/library/structure/table.rs b/src/library/structure/table.rs
index f39ea978..cd70db30 100644
--- a/src/library/structure/table.rs
+++ b/src/library/structure/table.rs
@@ -30,7 +30,7 @@ impl TableNode {
     #[property(resolve, shorthand(around))]
     pub const BELOW: Option<BlockSpacing> = Some(Ratio::one().into());
 
-    fn construct(_: &mut Context, args: &mut Args) -> TypResult<Content> {
+    fn construct(_: &mut Machine, args: &mut Args) -> TypResult<Content> {
         let columns = args.named("columns")?.unwrap_or_default();
         let rows = args.named("rows")?.unwrap_or_default();
         let base_gutter: Vec<TrackSizing> = args.named("gutter")?.unwrap_or_default();
@@ -128,11 +128,8 @@ impl<T: Cast + Clone> Celled<T> {
         Ok(match self {
             Self::Value(value) => value.clone(),
             Self::Func(func, span) => {
-                let args = Args::from_values(*span, [
-                    Value::Int(x as i64),
-                    Value::Int(y as i64),
-                ]);
-                func.call(ctx, args)?.cast().at(*span)?
+                let args = Args::new(*span, [Value::Int(x as i64), Value::Int(y as i64)]);
+                func.call_detached(ctx, args)?.cast().at(*span)?
             }
         })
     }