From 6f4939dee86367ac9055ccefcad3e192fe99ab48 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Wed, 15 Oct 2014 18:07:21 -0700 Subject: [PATCH 1/4] Updated ++stir to roll interface --- arvo/hoon.hoon | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 4f6ce202a..9c1e7e8bb 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -2588,13 +2588,13 @@ :: ++ stir ~/ %stir - |* [rud=* raq=_|*([a=* b=*] [a b]) fel=_rule] + |* [raq=_|*([a=* b=*] [a b]) fel=_rule] ~/ %fun |= tub=nail - ^- (like ,_rud) + ^- (like ,_+<+.raq) =+ vex=(fel tub) ?~ q.vex - [p.vex [~ rud tub]] + [p.vex [~ +<+.raq tub]] =+ wag=$(tub q.u.q.vex) ?> ?=(^ q.wag) [(last p.vex p.wag) [~ (raq p.u.q.vex p.u.q.wag) q.u.q.wag]] @@ -2623,7 +2623,7 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2eD, parsing (combinators) :: :: -++ bend :: conditional comp +++ bend :: optional comp ~/ %bend |* raq=_|*([a=* b=*] [~ u=[a b]]) ~/ %fun @@ -2701,7 +2701,7 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2eE, parsing (composers) :: :: -++ bass +++ bass :: MSB base n |* [wuc=@ tyd=_rule] %+ cook |= waq=(list ,@) @@ -2710,7 +2710,7 @@ =|([p=@ q=@] |.((add p (mul wuc q)))) tyd :: -++ boss +++ boss :: LSB base n |* [wuc=@ tyd=_rule] %+ cook |= waq=(list ,@) @@ -2719,27 +2719,27 @@ =|([p=@ q=@] |.((add p (mul wuc q)))) tyd :: -++ ifix +++ ifix :: infix |* [fel=[p=_rule q=_rule] hof=_rule] ;~(pfix p.fel ;~(sfix hof q.fel)) :: -++ more +++ more :: delimited 0 or more |* [bus=_rule fel=_rule] ;~(pose (most bus fel) (easy ~)) :: -++ most +++ most :: delimited 1 or more |* [bus=_rule fel=_rule] ;~(plug fel (star ;~(pfix bus fel))) :: -++ plus |*(fel=_rule ;~(plug fel (star fel))) -++ slug - |* [rud=* raq=_|*([a=* b=*] [a b])] +++ plus |*(fel=_rule ;~(plug fel (star fel))) :: 1 or more times +++ slug :: compose delimeted 1+ + |* raq=_|*([a=* b=*] [a b]) |* [bus=_rule fel=_rule] - ;~((comp raq) fel (stir rud raq ;~(pfix bus fel))) + ;~((comp raq) fel (stir raq ;~(pfix bus fel))) :: ++ star :: 0 or more times |* fel=_rule - (stir `(list ,_(wonk *fel))`~ |*([a=* b=*] [a b]) fel) + (stir |*([a=* b=*] `(list ,_(wonk *fel))`[a b]) fel) :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2eF, parsing (ascii) :: :: @@ -9433,7 +9433,7 @@ ++ rope :: wing form %+ knee *wing |. ~+ - %+ (slug `wing`~ |=([a=wing b=wing] (weld a b))) + %+ (slug |=([a=wing b=_`wing`~] (weld a b))) dot ;~ pose %+ cook From d395914602c330bf4a65b256498908edd32c9039 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Thu, 16 Oct 2014 11:57:24 -0700 Subject: [PATCH 2/4] Fixed hymn:grow:js/door --- main/mar/js/door.hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/mar/js/door.hook b/main/mar/js/door.hook index f224da4a3..1b9c8f19f 100644 --- a/main/mar/js/door.hook +++ b/main/mar/js/door.hook @@ -7,7 +7,7 @@ ++ psal ;script ;- (trip mud) == - ++ hymn ;html:(head:"{psal}" body) + ++ hymn ;html:(head:"+{psal}" body) -- ++ grab |% :: convert from ++ noun cord :: clam from %noun From b4f6e6920f559065eb781cd9e9343011f73d178a Mon Sep 17 00:00:00 2001 From: Galen Wolfe-Pauly Date: Thu, 16 Oct 2014 12:53:38 -0700 Subject: [PATCH 3/4] Fixed %eyre nyp in epic --- arvo/eyre.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arvo/eyre.hoon b/arvo/eyre.hoon index 142ddeb24..fc2fa8c4a 100644 --- a/arvo/eyre.hoon +++ b/arvo/eyre.hoon @@ -1,3 +1,4 @@ +!: :: :: %eyre, http servant !? 164 :::: @@ -1546,8 +1547,9 @@ == |= [for=mark toe=tube] ^- seam + =+ nyp=?.(=(%i (cut 3 [1 1] nep)) /[nep] /[nep]/(rsh 3 1 (scot %p you))) :^ %fun for - toe(s (weld s.toe `path`[~(rent co (flux [nep ~] quy)) %web ~])) + toe(s (weld s.toe `path`[~(rent co (flux nyp quy)) %web ~])) ?. won ~ :_ ~ =- =+ pey="{(scag 2 (trip nep))}v" From 07d4d4bd1a51640b04f6bdef3c5b81b293dec535 Mon Sep 17 00:00:00 2001 From: Anton Dyudin Date: Thu, 16 Oct 2014 14:12:16 -0700 Subject: [PATCH 4/4] Revert "Updated ++stir to roll interface" This reverts commit 5a31374a1b05d000ba2c983fe1f53676b50fbc08. --- arvo/hoon.hoon | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 9c1e7e8bb..4f6ce202a 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -2588,13 +2588,13 @@ :: ++ stir ~/ %stir - |* [raq=_|*([a=* b=*] [a b]) fel=_rule] + |* [rud=* raq=_|*([a=* b=*] [a b]) fel=_rule] ~/ %fun |= tub=nail - ^- (like ,_+<+.raq) + ^- (like ,_rud) =+ vex=(fel tub) ?~ q.vex - [p.vex [~ +<+.raq tub]] + [p.vex [~ rud tub]] =+ wag=$(tub q.u.q.vex) ?> ?=(^ q.wag) [(last p.vex p.wag) [~ (raq p.u.q.vex p.u.q.wag) q.u.q.wag]] @@ -2623,7 +2623,7 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2eD, parsing (combinators) :: :: -++ bend :: optional comp +++ bend :: conditional comp ~/ %bend |* raq=_|*([a=* b=*] [~ u=[a b]]) ~/ %fun @@ -2701,7 +2701,7 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2eE, parsing (composers) :: :: -++ bass :: MSB base n +++ bass |* [wuc=@ tyd=_rule] %+ cook |= waq=(list ,@) @@ -2710,7 +2710,7 @@ =|([p=@ q=@] |.((add p (mul wuc q)))) tyd :: -++ boss :: LSB base n +++ boss |* [wuc=@ tyd=_rule] %+ cook |= waq=(list ,@) @@ -2719,27 +2719,27 @@ =|([p=@ q=@] |.((add p (mul wuc q)))) tyd :: -++ ifix :: infix +++ ifix |* [fel=[p=_rule q=_rule] hof=_rule] ;~(pfix p.fel ;~(sfix hof q.fel)) :: -++ more :: delimited 0 or more +++ more |* [bus=_rule fel=_rule] ;~(pose (most bus fel) (easy ~)) :: -++ most :: delimited 1 or more +++ most |* [bus=_rule fel=_rule] ;~(plug fel (star ;~(pfix bus fel))) :: -++ plus |*(fel=_rule ;~(plug fel (star fel))) :: 1 or more times -++ slug :: compose delimeted 1+ - |* raq=_|*([a=* b=*] [a b]) +++ plus |*(fel=_rule ;~(plug fel (star fel))) +++ slug + |* [rud=* raq=_|*([a=* b=*] [a b])] |* [bus=_rule fel=_rule] - ;~((comp raq) fel (stir raq ;~(pfix bus fel))) + ;~((comp raq) fel (stir rud raq ;~(pfix bus fel))) :: ++ star :: 0 or more times |* fel=_rule - (stir |*([a=* b=*] `(list ,_(wonk *fel))`[a b]) fel) + (stir `(list ,_(wonk *fel))`~ |*([a=* b=*] [a b]) fel) :::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: section 2eF, parsing (ascii) :: :: @@ -9433,7 +9433,7 @@ ++ rope :: wing form %+ knee *wing |. ~+ - %+ (slug |=([a=wing b=_`wing`~] (weld a b))) + %+ (slug `wing`~ |=([a=wing b=wing] (weld a b))) dot ;~ pose %+ cook