From 0e3706b22ff0a2ec9ac1894ad4a63534d3c98bad Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Thu, 19 Mar 2015 15:19:19 -0700 Subject: [PATCH] Fix network. --- arvo/ames.hoon | 6 +++--- main/app/dojo/core.hook | 8 ++++---- main/sur/console/core.hook | 29 +++++++++++++++-------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/arvo/ames.hoon b/arvo/ames.hoon index 540f13e5f..4842dc10b 100644 --- a/arvo/ames.hoon +++ b/arvo/ames.hoon @@ -631,12 +631,12 @@ =^ gim ..weft wisp :_ +>.$ ^- (list rock) - =+ wit=(met ?:(fak.ton 18 13) q.gim) + =+ wit=(met ?:(fak.ton 16 13) q.gim) ?< =(0 wit) ?: =(1 wit) =+ yup=(spit [our her] p.gim q.gim) [yup ~] - =+ ruv=(rip ?:(fak.ton 18 13) q.gim) + =+ ruv=(rip ?:(fak.ton 16 13) q.gim) =+ gom=(shaf %thug q.gim) =+ inx=0 |- ^- (list rock) @@ -1409,7 +1409,7 @@ =+ [nix=0 rax=*(list ,@)] |- ^- @ ?: =(p.duv nix) - (can ?:(fak.ton.fox 18 13) (turn (flop rax) |=(a=@ [1 a]))) + (can ?:(fak.ton.fox 16 13) (turn (flop rax) |=(a=@ [1 a]))) $(nix +(nix), rax [(need (~(get by q.duv) nix)) rax]) -- :: --la:ho:um:am :: diff --git a/main/app/dojo/core.hook b/main/app/dojo/core.hook index 10c0f5790..ac7a2579d 100644 --- a/main/app/dojo/core.hook +++ b/main/app/dojo/core.hook @@ -377,7 +377,7 @@ |= cag=cage ^+ +>+> ?> ?=(^ per) - ?^ q.q.cag + ?: |(?=(^ q.q.cag) =((lent buf.say) q.q.cag)) dy-abet(per ~) =^ lic say (~(transmit cs say) u.per) (dy-rush(per ~) %mor [%bel ~] [%det lic] ~) @@ -473,12 +473,12 @@ ++ dy-made-dial :: dialog product |= cag=cage ^+ +>+> - ?. ?=([~ ~ *] q.q.cag) + ?. ?=(^ q.q.cag) ~& %dy-made-dial-fail (dy-rash %bel ~) - =+ tan=((list tank) +14.q.q.cag) + =+ tan=((list tank) +2.q.q.cag) =. +>+>.$ (he-rush %tan tan) - =+ vax=(spec (slot 15 q.cag)) + =+ vax=(spec (slot 3 q.cag)) ?+ -.q.vax !! %& ?~ +.q.vax diff --git a/main/sur/console/core.hook b/main/sur/console/core.hook index d06755051..6b85e6ff9 100644 --- a/main/sur/console/core.hook +++ b/main/sur/console/core.hook @@ -17,38 +17,39 @@ |* out=$+(* *) :: output structure $+(console-input (console-result out)) :: output function :: :: -++ console-result :: standard output +++ console-result :: conditional result |* out=$+(* *) :: output structure - %- unit :: ~ is invalid - %- unit :: ~ is prefix - %+ pair (list tank) :: + $|(@ud (console-product out)) :: error position +:: :: +++ console-product :: success result + |* out=$+(* *) :: + %+ pair (list tank) :: %+ each (unit out) :: ~ is abort (pair console-prompt (console-dialog out)) :: ask and continue :: :: ++ console-so :: construct result |* pro=* :: - [~ u=[~ u=[p=*(list tank) q=[%& p=[~ u=pro]]]]] :: + [p=*(list tank) q=[%& p=[~ u=pro]]] :: :: :: ++ console-yo :: add output tank |* [tan=tank res=(console-result)] :: - ?~ res ~ :: - ?~ u.res [~ u=~] :: - [~ u=[~ u=[p=[i=tan t=p.u.u.res] q=q.u.u.res]]] :: + ?@ res res :: + [p=[i=tan t=p.res] q=q.res] :: :: :: ++ console-lo :: construct prompt |* [pom=console-prompt mor=(console-dialog)] :: - [~ u=[~ u=[p=*(list tank) q=[%| p=pom q=mor]]]] :: + [p=*(list tank) q=[%| p=pom q=mor]] :: :: :: ++ console-no :: empty result - [~ u=[~ u=[p=*(list tank) q=~]]] :: + [p=*(list tank) q=~] :: :: :: ++ console-go :: parse by rule |* [sef=_rule fun=$+(* *)] :: |= txt=console-input :: - =+ yid=(ruse txt sef) :: - ?~ yid ~ :: - ?~ u.yid [~ u=~] :: - (fun u.u.yid) :: + =+ vex=(sef [0 0] txt) :: + ?: |(!=((lent txt) q.p.vex) ?=(~ q.vex)) :: + q.p.vex :: + (fun p.u.q.vex) :: :: :: ++ console-clock ,[own=@ud his=@ud] :: vector clock ++ console-edit :: shared state change