From ba92dee46bac9fa6b16aacd551c56e2a0f72a68f Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 11 Sep 2014 00:55:44 +0000 Subject: [PATCH] basic skeleton of %sire --- arvo/gall.hoon | 40 ++++++++++++++++++++++++++++++++-------- main/app/test/core.hook | 21 +++++++++++++++++++-- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/arvo/gall.hoon b/arvo/gall.hoon index 3770581fe..f33d5dd85 100644 --- a/arvo/gall.hoon +++ b/arvo/gall.hoon @@ -1,4 +1,4 @@ -:: :: %gall, user-level applications +!: :: %gall, user-level applications !? 164 :::: |= pit=vase @@ -37,6 +37,7 @@ [%load p=cage] :: continue boot [%mess p=ship q=cage] :: typed message [%show p=ship q=path] :: subscribe + [%sire p=term q=span] :: spawn subprocess [%nuke p=ship] :: clear duct [%take p=path q=vase] :: user result == :: @@ -571,6 +572,13 @@ say (rite q.orf) == :: + ++ birf + |= [wir=wire hon=duct caq=vase] + ^- toil + ?> ?=([%pass p=* q=%g r=[p=%sire q=term r=span]] q.caq) + :: [[[%g wir] hon] r.q.caq] + [hon r.q.caq] + :: ++ blow ^+ . => (give %nice ~) @@ -847,7 +855,11 @@ ++ nile [%done ~ [%$ [%cube 0 [%atom %n]] ~]] :: null silk ++ obey :: process app moves |= vax=vase - %_(+> mow (weld (flop (said vax)) mow)) + =+ sax=(said vax) + %_ +>.$ + mow (weld (flop -.sax) mow) + vey.sat (~(gas to vey.sat) +.sax) + == :: ++ quem :: queue action |= kon=knob :: content @@ -869,9 +881,13 @@ :: ++ said |= vud=vase - |- ^- (list move) - ?: =(~ q.vud) ~ - [(sump (slot 2 vud)) $(vud (slot 3 vud))] + |- ^- [(list move) (list toil)] + ?: =(~ q.vud) [~ ~] + =+ sud=(sump (slot 2 vud)) + =+ res=$(vud (slot 3 vud)) + ?: ?=(%& -.sud) + [[p.sud -.res] +.res] + [-.res [p.sud +.res]] :: ++ show :: subscribe |= [you=ship pax=path] :: subscription @@ -884,17 +900,21 @@ :: ++ sump |= wec=vase - ^- move - :- (need (~(get by r.zam.sat) ((hard bone) -.q.wec))) + ^- (each move toil) + =+ hon=(need (~(get by r.zam.sat) ((hard bone) -.q.wec))) =+ caq=(spec (slot 3 wec)) ?+ q.caq ~&(%sump-bad !!) :: [%pass p=* q=@tas r=[p=@tas q=*]] - :^ %pass (away %u ((hard path) p.q.caq)) + =+ wir=(away %u ((hard path) p.q.caq)) + ?: ?=(%sire p.r.q.caq) [%| (birf wir hon caq)] + :+ %& hon + :^ %pass wir (need ((sand %tas) ((hard ,@) q.q.caq))) [%meta (spec (slot 15 caq))] :: [%give p=[p=@tas q=*]] + :+ %& hon :- %give ?: ?=(%mean p.p.q.caq) [%mean (ares q.p.q.caq)] ?: ?=(%nice p.p.q.caq) [%nice ~] @@ -982,6 +1002,10 @@ ?> ?=(^ huv.sat) (yawl [%peek (scot %p p.kon) q.kon] u.huv.sat sam) (give(qic.sat ~) %dumb ~) + :: + %sire + ~& [%sirens-lost kon] + +>.$ :: %take ?. (warm %pour) diff --git a/main/app/test/core.hook b/main/app/test/core.hook index 5742f786c..e1525e7c6 100644 --- a/main/app/test/core.hook +++ b/main/app/test/core.hook @@ -30,8 +30,9 @@ [%nice ~] :: success == :: ++ note :: system request - $% $: %g :: to %ames + $% $: %g :: to %gall $% [%mess p=hapt q=ship r=cage] :: + [%sire p=term q=span] :: == == == :: ++ test :: test template $_ ^? |% :: @@ -67,6 +68,21 @@ ^- [(list move) _+>] !! -- + ++ sire + ^- test + |% + ++ poke + |+ [ost=bone you=ship] + ^- [(list move) _+>] + :_ +>.$ + :~ [ost %pass /hi %g %sire %demo %baby] + [ost %give %nice ~] + == + ++ pour + |+ [ost=bone pax=path sih=*] + ^- [(list move) _+>] + !! + -- ++ poke-local ^- test => |% @@ -104,7 +120,7 @@ ^- [(list move) _+>] :_ +>.$ :_ ~ =+ ^= zez - %+ ~(axel ^ze lat.hid *dome *rang) + %+ ~(edit ^ze lat.hid *dome *rang) lat.hid [%& [0v0 0v0] [/hello %ins 'hello, world']~] =+ `[l=@da d=dome r=rang]`+<.zez @@ -194,6 +210,7 @@ ^- (list ,[@t test]) => et :~ [%succeed succeed] + [%sire sire] [%ze ze] [%poke-local poke-local] ==