From 24d513d8917de0a8c23916837e5ea7fbb550db8b Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sat, 29 Jan 2022 21:36:25 +0100
Subject: [PATCH] Enable for loop over captured args

---
 src/eval/mod.rs        |  25 +++++++++++--------------
 src/eval/value.rs      |  11 ++++++++---
 tests/ref/code/for.png | Bin 3123 -> 4003 bytes
 tests/typ/code/for.typ |   6 ++++++
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index d459ba6ea..05fa7ebad 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -642,16 +642,8 @@ impl Eval for CallArgs {
                             value: Spanned::new(value, span),
                         }));
                     }
-                    v => {
-                        if let Value::Dyn(dynamic) = &v {
-                            if let Some(args) = dynamic.downcast::<Args>() {
-                                items.extend(args.items.iter().cloned());
-                                continue;
-                            }
-                        }
-
-                        bail!(expr.span(), "cannot spread {}", v.type_name())
-                    }
+                    Value::Args(args) => items.extend(args.items),
+                    v => bail!(expr.span(), "cannot spread {}", v.type_name()),
                 },
             }
         }
@@ -716,10 +708,6 @@ impl Eval for ClosureExpr {
 
             // Put the remaining arguments into the sink.
             if let Some(sink) = &sink {
-                dynamic! {
-                    Args: "arguments",
-                }
-
                 ctx.scopes.def_mut(sink, args.take());
             }
 
@@ -868,6 +856,15 @@ impl Eval for ForExpr {
             (Some(k), v, Value::Dict(dict)) => {
                 iter!(for (k => key, v => value) in dict.into_iter());
             }
+            (None, v, Value::Args(args)) => {
+                iter!(for (v => value) in args.items.into_iter()
+                    .filter(|arg| arg.name.is_none())
+                    .map(|arg| arg.value.v));
+            }
+            (Some(k), v, Value::Args(args)) => {
+                iter!(for (k => key, v => value) in args.items.into_iter()
+                    .map(|arg| (arg.name.map_or(Value::None, Value::Str), arg.value.v)));
+            }
             (_, _, Value::Str(_)) => {
                 bail!(pattern.span(), "mismatched pattern");
             }
diff --git a/src/eval/value.rs b/src/eval/value.rs
index 3b1ef3f7a..e64f6cc6d 100644
--- a/src/eval/value.rs
+++ b/src/eval/value.rs
@@ -4,7 +4,7 @@ use std::fmt::{self, Debug, Formatter};
 use std::hash::Hash;
 use std::rc::Rc;
 
-use super::{ops, Array, Class, Dict, Function, Node};
+use super::{ops, Args, Array, Class, Dict, Function, Node};
 use crate::diag::StrResult;
 use crate::geom::{Angle, Color, Fractional, Length, Linear, Relative, RgbaColor};
 use crate::layout::Layout;
@@ -46,6 +46,8 @@ pub enum Value {
     Node(Node),
     /// An executable function.
     Func(Function),
+    /// Captured arguments to a function.
+    Args(Args),
     /// A class of nodes.
     Class(Class),
     /// A dynamic value.
@@ -88,6 +90,7 @@ impl Value {
             Self::Dict(_) => Dict::TYPE_NAME,
             Self::Node(_) => Node::TYPE_NAME,
             Self::Func(_) => Function::TYPE_NAME,
+            Self::Args(_) => Args::TYPE_NAME,
             Self::Class(_) => Class::TYPE_NAME,
             Self::Dyn(v) => v.type_name(),
         }
@@ -151,6 +154,7 @@ impl Debug for Value {
             Self::Dict(v) => Debug::fmt(v, f),
             Self::Node(_) => f.pad("<template>"),
             Self::Func(v) => Debug::fmt(v, f),
+            Self::Args(v) => Debug::fmt(v, f),
             Self::Class(v) => Debug::fmt(v, f),
             Self::Dyn(v) => Debug::fmt(v, f),
         }
@@ -219,12 +223,12 @@ impl Dynamic {
     }
 
     /// Whether the wrapped type is `T`.
-    pub fn is<T: 'static>(&self) -> bool {
+    pub fn is<T: Type + 'static>(&self) -> bool {
         self.0.as_any().is::<T>()
     }
 
     /// Try to downcast to a reference to a specific type.
-    pub fn downcast<T: 'static>(&self) -> Option<&T> {
+    pub fn downcast<T: Type + 'static>(&self) -> Option<&T> {
         self.0.as_any().downcast_ref()
     }
 
@@ -404,6 +408,7 @@ primitive! { Function: "function",
         move |ctx, args| v.construct(ctx, args).map(Value::Node)
     )
 }
+primitive! { Args: "arguments", Args }
 primitive! { Class: "class", Class }
 
 impl Cast<Value> for Value {
diff --git a/tests/ref/code/for.png b/tests/ref/code/for.png
index 1ef08f7ad689ab2a7f7761cc93ffc6580e0175c6..f9d42124379567d17a461d83f2ab0cdb52f75677 100644
GIT binary patch
literal 4003
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

literal 3123
zcmZ{nc{J3G8pnTT27@ppvc;fmSq5n=6_b5yVk{X%mV|6&4Ix`)87cc-Xe139OIgO6
z?E6@oQkG2C31Q^E-E;4I&$;K`&mYfup1+^-e9rfIh&Iz_XBA)t0D#@lK*t;a7$AT3
z>CnFlAp8z50|0FMhC14q;OW)bdv+MtQy(^$wt;B1gp2?aScd^-%;Yt>bgmKOz33YI
z%*y_Jfc@m{n%??PPt1)Fmu*#K`DpKor1`H+8ohRZd=f9M?uu_sFBNs_Iqj{yF?DG`
z^G!xB8Rtbc7^WS@x8I4N<+kVC$ydvzDWaDDMg>9dE9O#()*FHfXp6f;k_!K8XiH%)
z`eESItFtV7=3EseZP!rRXL5=#EI*ykD5~pn^hSgA*wq8cI6M5)2TPi<zL*%BW>51v
z-Bw|4B`d~|`z|Qh@%vIB0s;<qD$dNr;Ru^XB{tlev5JF7_6^s<!Cu0Mrqmw&CjTf+
zwTT!Qe3y=fh|hG?o*5_Z@PLY1UahNl5$O?OcA*q$w#Y|sB?~CbB*8(;cM}n{0+E$-
zrqIFd?^HAtSvQ#TeoZ6tIsTj)?MZSQ{-&D`p1Ck=hTd_=v|a6?+*UG{)}`IT|7n&=
zCtD~8DR&jM3})}D67Ccwn9Z$n#Rz3Z_3vUM_YL06tb5K>!U(%tg2B&o9l*p0rKT^k
zpo2^pH-*=bwH09m+1cVyXX*HuferFGT~LR8x7RxignWs3(B@(yhaqzFyFr$=IYGXo
zzEA<dTi+KKYPgZE#Mu#t#5aX4Fx2c<t{8oFb)={TVD(tox7I=e+2-?`wKiCeQS2VC
zN^mQeT6-dC?)G2<td=+!mm((~g;ZPRUOFJ23TItX+2a_CV^;?s;d-MGP0dQ;8#X!q
zpEGTkwO6@?b6c(~wsy$tj;){cPhL4L)?D3n96B(7ASJZ}#fJ>V)9to<2$By-Xfd?h
zn|9cjNJ12RT)B&6-f#q9l9!krp2<cjZyDOiB{L*a(d!W=NGVl@J2OwUhZGo^tLPj|
zpUQg7*f^6|vivz=O98x@!%U80`U$s~Nwlq)hJ5#i9y)IpG^MvGgELXN1U&D;f;(-&
z5GE3RD-W;{V-?^(dGC-FngxaMKUlvV?i5F1ThdHav^2|Ca_xa;LA=taUuc18PMLRI
zGw_Yx*<nn|D6yx3->q+odhJ;bCa)gyfLsKj>C(RO)6eFTM9=Q14Km*-Lq#4OerdBu
zF`26WkcJeh7h352AqNZ0yZq9kU|XX6$Reud9x_KnYo#^Vq{KvNf>*HBZ@+`JicN1W
zy?}si+X*NtDl9c~z$_LJe-C_X5}LtV=9j@fvuC;4fx6SsO)4@7KkEyMGiB5E0aNG}
zvR?`*&)z!03o78PF3i)$6Ff`yi>1bB#Ek_83yCf>e5IqUQv=n=7EsuNj~(Pk+9qxY
zKQJCfl4TJ+!;d6dpWx$UMKdcctf#B$AXkpdR~OA40+;8+zI8tXMy(knFZ#w4rakkJ
z5ZK*tHQeb8Qcp^xZ3{A1Yq&D|)g$zDXtAgC3%;`%b*A}B0iQS=%Xgo@uQkE-lBTqq
z%er(BXXO9jEkeJhIR=Z;kL`|gU$4)-Z<@$s*y#pwtlmAIl_TECh87gv$>fUkIaJpJ
zU@DGdUG~QG_fP$9Y2}pF?C2f{MQ%+zPunG}-q^F$H6Z@*mFp)8mB?sT=%)~B{kg|3
zjb82fJPyn?an^gBv9U9ZW1MHPrb_ZUXV#DPSBpFn!Hw+y3<^3};__(#e$+K`4BcWv
z@7`sGqb7g=_(lCOGg4r0AbBL1%q60tT37b7nI>BpW-crJpbpfx?w-Zy{B8eLc-0F~
zz#%UfDf#gZa6Mo3(|~8QA2z(S%3D5fzd4EiVce5=;E)lT7YHYjJ?LkTDq63nY~S4E
z0ev(0N|=;rdC{O0e3JFcQ9tKpBvnIdiQ0A?i()#**E&(MCDNZr8i+DCnp)$esPMJ<
zQZZ#!cfZCgq9R8WE?&5<-<!}pT>f8P{Esm|UyUj6>+35Qp{1CoXJvigP((FvY@W;K
zvbLOXz+(&Nhf=%xl4DA<Y#;3|HRK!%Q2Z%(=Qzfyd?r*YWZ9e;+(FiV8Z4lF!R)@#
zBPm+XAV((4sU5E3aiO|F>5nG_1;VZ)2aKV;b~HKTZeIN28D5rD4s@<1+tWu49*iz_
zvJkgNYHpCsPn0pmfqRRUb*FGO+0nj;itYJ|^ZE%PrrJ{VYw}>H94Rk($kO_PQXg~!
z$MPk-0rrwgwFo&4DfC|v)H3y5Diuv+xj&;dIco<cOlUC1YS~X$WWJ!`GK6??pZM<;
zU9VabBROw5|59BDcA^(NNs@GRrQWQhw}q*nY#_f9@UXZz|G7)7{;l_7IY=4QD1MYB
zJyPVdZ7+scU^D8RH6HvRuW|qOm3YppP-NV_qv`@{M|l==Bk6t(K=bUCXnRev2Axmr
z2M9;O2D0p4dEy2stnPi?<+H;DuU4C~VA^qiKbwdaR!ufZ<%logF)uZj@d^s$<jK2Y
zKZDSQlLD*2kMx?Ek9}WXJ3Sx>%5&rkPid!g2syqudXM&v=Z_lQTW7C11v1hd<Ui8H
zv~EP2{JKHlhyQ*D0yE6pmtC$CGN6SL8er)U*~&XFv}tA?o9w(1Nz!PQ=i}G#L`j`M
z9qVS6de*{#JevW$$bqp|ViWkkqyP^tXS2bLlaENlCqV?OWCp_H3?PmI;Kh39uoB6)
zvD^pOj@X~}GysB$Nm(Cas^(txLAyxE@mCEngL<>K0@dZsTrunycdcX~pMRqbVDWQe
zz}U{ZEgqJ@7pM%v!AJa3HYA7bpc|_*gB-lHS#gOFUH)}GRydE<!v{%lQjM5CeB*rT
zO+BD(|J&l?VkNBCUx97|v*RD?mum~#<0E@vVqvTrx&ow&qa>SE)Z}wmuyG?Jp^PE=
z@@fHWCgLpg2NndIvw)-XD&64Z&hE}~TX+mA<imSvl&(J*sXUfT(FMzch=<|5JfMte
z3YehvBAO<A?%ITR-OTFFxY(4#bR+b!muk+kQ_Yka0iEnn(9|KxkvVi4&i`aVu5unT
z)$Ud^<yCuv9cClHZkw~SB-Ow$68jEivdjLE@^tb_1sW_)z#OyB;1!fMcX|c&Ac$8Y
zzE~nI6}`-Y?O(H>0((9v`B|_I@ejq`Yxgwoe>q!RuGi{ERga`_K!T;wfw|$`?-+OX
z?^@d5N46OUQ{D;}_N`>IH5Nbq)k(Lb3T`w9wI5|qI?u8A`nlhvA}o)rsl<!Im`ECX
zX}p@cLgUCzp@FGgOGvgyboLt$0oj;lgel#rk`Xo5C+qdKWMib%n@_3YX0}ykMEK}$
zJhiWHIA5<&N=Bx9`QAZ!uB*?AThSW+{`uEK4WebYVi~Vqy}EEp&mBMff8y1@H1gLG
z54Z}WgOv8}k{8lO%Z-gz7-Wo%{viJr0~ttqhWaH}0iK+}LY=~OU*D*Q#R96&!N$hA
zFHbodc2B99NPrH)+Z{9r#FVg6;#z=On^xwjMz{X#bDk4*n3(bTbA?JntUP+WK$*^q
zs`6qg&(}?<uj}4Z&Zxc8(8$eV8{$wXVKX35tBB3X9b+tVlA)f0H68zo%LJ4BC=%oc
z{@%%ZYNB=<E&WLF#Y>IyE`-fxKOK>H)UxUk=~t^oP@Qj#)UB{-w>a2*D=YbBJ=Qc!
z)X`+)CG)hP#h|SWs3x}GMrvTPSp_+7Tv+V+Hd~KzxJ4m;zWH@>9R}hU)kx1hQg`H0
z{NS$#f9aL3P>X@AI4|Tfv5SWb(?0~EtgNgiFsbP!i`RS&rfp?VtB~zf|1o~+zTICF
zxYrI69k&$q9ww%TN}&DT>>H?g#OrHBrrl<`91!t`-_G;xVUh)qCMLzMnNKLL^n@Je
ze{wxGIArvRwOfFDxXtUkNi3F^8zr0Sy%KT{)0Et0Ksce59&u7mU1)D$%kQ6C#7@BS
zifzf2j;@0AR?emZAh~PNz`kPdA=h$_%>Pc%|6cKJi16Q>-%}9EWAxKwUu6074H)X0
K=~SW|qyGU#Hq9>p

diff --git a/tests/typ/code/for.typ b/tests/typ/code/for.typ
index 2569f5a7f..02bd0a277 100644
--- a/tests/typ/code/for.typ
+++ b/tests/typ/code/for.typ
@@ -32,6 +32,12 @@
 // Should output `2345`.
 #for v in (1, 2, 3, 4, 5, 6, 7) [#if v >= 2 and v <= 5 { repr(v) }]
 
+// Loop over captured arguments.
+#let f1(..args) = for v in args { (repr(v),) }
+#let f2(..args) = for k, v in args { (repr(k) + ": " + repr(v),) }
+#let f(..args) = join(sep: ", ", ..f1(..args), ..f2(..args))
+#f(1, a: 2)
+
 ---
 #let out = ()