From bf3b8432b3db279f9a85ec4d1500ee2588cf785b Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 7 Sep 2017 16:47:49 -0700 Subject: [PATCH] About working. But very slow. --- app/talk.hoon | 8 ++++---- lib/twitter.hoon | 2 +- sys/arvo.hoon | 2 +- sys/hoon.hoon | 11 +++++------ sys/vane/ames.hoon | 2 +- sys/vane/clay.hoon | 1 - sys/vane/dill.hoon | 1 + sys/vane/eyre.hoon | 13 ++++++++++--- sys/vane/ford.hoon | 8 +++++--- sys/vane/jael.hoon | 15 ++++++++------- sys/zuse.hoon | 3 +-- 11 files changed, 37 insertions(+), 29 deletions(-) diff --git a/app/talk.hoon b/app/talk.hoon index 34c3de7ae..aad063376 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -1420,7 +1420,7 @@ [%brown ~] %^ ra-consume & our.hid :^ (shaf %init eny.hid) - (my [[%& our.hid (main our.hid)] *envelope %pending] ~) + [[[%& our.hid (main our.hid)] *envelope %pending] ~ ~] now.hid [~ %app %tree 'receiving forum posts, ;join %posts for details'] :: @@ -1431,7 +1431,7 @@ %^ ra-consume & src.hid :* (shaf %comt eny.hid) - (my [[%& our.hid man] *envelope %pending] ~) + [[[%& our.hid man] *envelope %pending] ~ ~] now.hid (sy /fora-post eyre+pax ~) :- %mor :~ @@ -1461,7 +1461,7 @@ [%brown ~] %^ ra-consume & our.hid :^ (shaf %init eny.hid) - (my [[%& our.hid (main our.hid)] *envelope %pending] ~) + [[[%& our.hid (main our.hid)] *envelope %pending] ~ ~] now.hid [~ %app %tree 'receiving comments, ;join %comments for details'] :: @@ -1472,7 +1472,7 @@ %^ ra-consume & src.hid :* (shaf %comt eny.hid) - (my [[%& our.hid man] *envelope %pending] ~) + [[[%& our.hid man] *envelope %pending] ~ ~] now.hid (sy /comment eyre+pax ~) :- %mor :~ diff --git a/lib/twitter.hoon b/lib/twitter.hoon index c0f9f01dd..18448ba33 100644 --- a/lib/twitter.hoon +++ b/lib/twitter.hoon @@ -32,7 +32,7 @@ ?- med $get [url med *math ~] $post - =+ hed=(my content-type+['application/x-www-form-urlencoded']~ ~) + =+ hed=(my:nl content-type+['application/x-www-form-urlencoded']~ ~) [url(r ~) med hed ?~(r.url ~ (some (as-octt +:(tail:en-purl r.url))))] == :: diff --git a/sys/arvo.hoon b/sys/arvo.hoon index b12006130..a006699b3 100644 --- a/sys/arvo.hoon +++ b/sys/arvo.hoon @@ -1,6 +1,6 @@ :: :: :::: 6: layer six - !: + :: ~> %slog.[0 leaf+"arvo-boot"] =< |= {now/@da ovo/*} ^- * diff --git a/sys/hoon.hoon b/sys/hoon.hoon index 70440917a..2f7fdac05 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -1,4 +1,3 @@ -!: :: :: :::: /sys/hoon :: :: :: @@ -1539,15 +1538,15 @@ :: ++ ly :: list from raw noun |* a/* - ^+((homo (limo a)) a) + le:nl :: ++ my :: map from raw noun |* a/* - (malt ^+((homo (limo a)) a)) + my:nl :: ++ sy :: set from raw noun |* a/* - (silt ^+((homo (limo a)) a)) + si:nl :: ++ nl ^% @@ -7677,8 +7676,8 @@ [dox p.q] ?> ?=($elm -.q) :: ~_ (dunk(sut [%cell q.q.p p.p]) %fire-wet) - =. p.p ?:(fab p.p (redo(sut p.p) q.q.p)) - :: =. p.p (redo(sut p.p) q.q.p) + :: =. p.p ?:(fab p.p (redo(sut p.p) q.q.p)) + =. p.p (redo(sut p.p) q.q.p) ?> ?| !vet (~(has in rib) [sut dox p.q]) !=(** (mull(sut p, rib (~(put in rib) sut dox p.q)) %noun dox p.q)) diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon index 1790c079d..2c3a7eda8 100644 --- a/sys/vane/ames.hoon +++ b/sys/vane/ames.hoon @@ -1,4 +1,4 @@ -!: :: :: +:: :: :: :::: /hoon/ames/arvo :::::: vane prelude :: :: :: |= pit/vase :: kernel vase diff --git a/sys/vane/clay.hoon b/sys/vane/clay.hoon index 3c7717cce..b529e7746 100644 --- a/sys/vane/clay.hoon +++ b/sys/vane/clay.hoon @@ -1,4 +1,3 @@ -!: :: clay (4c), revision control :: :: This is split in three top-level sections: structure definitions, main diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index ff64ce033..86c6d78e1 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -1,3 +1,4 @@ +^% !: :: dill (4d), terminal handling :: diff --git a/sys/vane/eyre.hoon b/sys/vane/eyre.hoon index ec00067cd..b9a2b3e37 100644 --- a/sys/vane/eyre.hoon +++ b/sys/vane/eyre.hoon @@ -1,4 +1,4 @@ -!: :: %eyre, http servant +:: :: %eyre, http servant !? 164 :::: |= pit/vase @@ -1476,9 +1476,16 @@ %.(grab-json =>(dejs (ot ship+(su fed:ag) code+(mu so) ~))) :: $delt + :: XX: restored old code to fix for redo + :: ~| parsing+bod + :: :- %del + :: %.(grab-json =>(dejs-soft (ot ship+(su fed:ag)))) + :: ~| parsing+bod - :- %del - %.(grab-json =>(dejs-soft (ot ship+(su fed:ag)))) + =+ jon=(need (de-json q:(need bod))) + ?> ?=($o -.jon) + =+ sip=(~(get by p.jon) %ship) + [%del ?~(sip ~ [~ ((su:dejs fed:ag) u.sip)])] == == == -- diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon index a9350eee5..9cc18c4e4 100644 --- a/sys/vane/ford.hoon +++ b/sys/vane/ford.hoon @@ -592,8 +592,10 @@ =< abet |- ^+ ..exec ?~ zuk ..exec - $(zuk t.zuk, ..exec `_..exec`(camp van.i.zuk ren.i.zuk bem.i.zuk)) - == + %= $ + zuk t.zuk + ..exec `_..exec`(camp van.p.i.zuk ren.q.i.zuk bem.q.i.zuk) + == == :: ++ expo :: return gift |= gef/gift:able @@ -1188,7 +1190,7 @@ |= {cof/cafe fro/(set mark)} ^- (bolt (list mark)) ?: (~(has in tag) p.won) (fine cof (flop pax)) - =+ for=(skip (~(tap by fro)) ~(has by war)) + =+ for=(skip (~(tap in fro)) ~(has by war)) =. for (sort for aor) :: XX useful? =: q.won (~(gas to q.won) for) war (~(gas by war) (turn for |=(mark [+< pax]))) diff --git a/sys/vane/jael.hoon b/sys/vane/jael.hoon index 2303e91c5..f15159dca 100644 --- a/sys/vane/jael.hoon +++ b/sys/vane/jael.hoon @@ -1,5 +1,6 @@ !: :: /van/jael :: :: %reference/0 +^% !? 150 :: :: @@ -1728,7 +1729,7 @@ ++ as-hotel :: XX moveme |= a/ship ^- (map {ship bloq} pile) =/ b (xeb (xeb a)) - =- (my - ~) + =- (my:nl - ~) :- [(sein a) b] (put:py (rsh (dec b) 1 a)) :: @@ -1756,9 +1757,9 @@ =/ pas/@p (shaf %pass tid.taz) =* inv inv.taz ?< (~(has by shy) pas) - =. +>.$ (add-rite pas [%email (sy who.inv ~)]) + =. +>.$ (add-rite pas [%email (si:nl who.inv ~)]) %+ mov-rite [rex pas] - [%fungi (my [%upl pla.inv] [%usr sta.inv] ~)] + [%fungi (my:nl [%upl pla.inv] [%usr sta.inv] ~)] :: :: increase existing balance :: {$reinvite aut/passcode pla/@ud sta/@ud} @@ -1767,7 +1768,7 @@ =/ pas/@p (shaf %pass tid.taz) ?> (~(has by shy) pas) %+ mov-rite [rex pas] - [%fungi (my [%upl pla.taz] [%usr sta.taz] ~)] + [%fungi (my:nl [%upl pla.taz] [%usr sta.taz] ~)] :: :: split passcode balance :: {$reinvite aut/passcode tid/passcode inv/{who/mail pla/@ud sta/@ud}} @@ -1776,11 +1777,11 @@ =/ pas/@p (shaf %pass tid.taz) =* inv inv.taz ?< (~(has by shy) pas) - =. +>.$ (add-rite pas [%email (sy who.inv ~)]) + =. +>.$ (add-rite pas [%email (si:nl who.inv ~)]) :: XX history =/ ole/@p (shaf %pass aut.taz) %+ mov-rite [ole pas] - [%fungi (my [%upl pla.inv] [%usr sta.inv] ~)] + [%fungi (my:nl [%upl pla.inv] [%usr sta.inv] ~)] :: :: redeem ship invitation :: {$claim aut/passcode her/@p tik/ticket} @@ -1791,7 +1792,7 @@ =/ len (xeb (xeb her.taz)) =/ fun ?+((clan her.taz) !! $duke %upl, $king %usr) =. +>.$ - (del-rite pas [%fungi (my [fun 1] ~)]) + (del-rite pas [%fungi (my:nl [fun 1] ~)]) =. +>.$ (del-rite rex [%hotel (as-hotel her.taz)]) =/ who (need %.(%email ~(expose up (lawn pas)))) diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 4a2ec28a2..7393f032d 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -1,5 +1,4 @@ -!: :: /van/zuse -^% +:: :: /van/zuse :: :: %reference/1 :: %zuse: arvo library. ::