From 65f2cca2518674ba959ec28895dadc9d1b93aaad Mon Sep 17 00:00:00 2001 From: dzaima Date: Sun, 1 Aug 2021 04:12:46 +0300 Subject: [PATCH] better fork_c1 --- src/core/derv.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/core/derv.c b/src/core/derv.c index 956d5d07..2bedc32f 100644 --- a/src/core/derv.c +++ b/src/core/derv.c @@ -24,7 +24,16 @@ B md2D_c1(B t, B x) { return c(Md2,c(Md2D, t)->m2)->c1(t, x); } B md2D_c2(B t, B w, B x) { return c(Md2,c(Md2D, t)->m2)->c2(t, w, x); } B tr2D_c1(B t, B x) { return c1(c(Atop,t)->g, c1(c(Atop,t)->h, x)); } B tr2D_c2(B t, B w, B x) { return c1(c(Atop,t)->g, c2(c(Atop,t)->h, w, x)); } -B fork_c1(B t, B x) { B g=c1(c(Fork,t)->h, inc(x)); return c2(c(Fork,t)->g, c1i(c(Fork,t)->f, x), g); } +B fork_c1(B t, B x) { + B f = c(Fork,t)->f; errMd(f); + B h = c(Fork,t)->h; + if (isFun(f)) { + B hr = c1(h, inc(x)); + return c2(c(Fork,t)->g, c(Fun,f)->c1(f,x), hr); + } else { + return c2(c(Fork,t)->g, inc(f), c1(h, x)); + } +} B fork_c2(B t, B w, B x) { B g=c2(c(Fork,t)->h, inc(w), inc(x)); return c2(c(Fork,t)->g, c2i(c(Fork,t)->f, w, x), g); } B md2H_c1(B d, B x) { Md1D* m=c(Md1D,d); Md2H* t=c(Md2H,m->m1); return md2D_c1(m_md2D(t->m2, m->f, t->g), x); } B md2H_c2(B d, B w, B x) { Md1D* m=c(Md1D,d); Md2H* t=c(Md2H,m->m1); return md2D_c2(m_md2D(t->m2, m->f, t->g), w, x); }