Fix network.

This commit is contained in:
C. Guy Yarvin 2015-03-19 15:19:19 -07:00
parent b65636a0bf
commit 0e3706b22f
3 changed files with 22 additions and 21 deletions

View File

@ -631,12 +631,12 @@
=^ gim ..weft wisp =^ gim ..weft wisp
:_ +>.$ :_ +>.$
^- (list rock) ^- (list rock)
=+ wit=(met ?:(fak.ton 18 13) q.gim) =+ wit=(met ?:(fak.ton 16 13) q.gim)
?< =(0 wit) ?< =(0 wit)
?: =(1 wit) ?: =(1 wit)
=+ yup=(spit [our her] p.gim q.gim) =+ yup=(spit [our her] p.gim q.gim)
[yup ~] [yup ~]
=+ ruv=(rip ?:(fak.ton 18 13) q.gim) =+ ruv=(rip ?:(fak.ton 16 13) q.gim)
=+ gom=(shaf %thug q.gim) =+ gom=(shaf %thug q.gim)
=+ inx=0 =+ inx=0
|- ^- (list rock) |- ^- (list rock)
@ -1409,7 +1409,7 @@
=+ [nix=0 rax=*(list ,@)] =+ [nix=0 rax=*(list ,@)]
|- ^- @ |- ^- @
?: =(p.duv nix) ?: =(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]) $(nix +(nix), rax [(need (~(get by q.duv) nix)) rax])
-- :: --la:ho:um:am -- :: --la:ho:um:am
:: ::

View File

@ -377,7 +377,7 @@
|= cag=cage |= cag=cage
^+ +>+> ^+ +>+>
?> ?=(^ per) ?> ?=(^ per)
?^ q.q.cag ?: |(?=(^ q.q.cag) =((lent buf.say) q.q.cag))
dy-abet(per ~) dy-abet(per ~)
=^ lic say (~(transmit cs say) u.per) =^ lic say (~(transmit cs say) u.per)
(dy-rush(per ~) %mor [%bel ~] [%det lic] ~) (dy-rush(per ~) %mor [%bel ~] [%det lic] ~)
@ -473,12 +473,12 @@
++ dy-made-dial :: dialog product ++ dy-made-dial :: dialog product
|= cag=cage |= cag=cage
^+ +>+> ^+ +>+>
?. ?=([~ ~ *] q.q.cag) ?. ?=(^ q.q.cag)
~& %dy-made-dial-fail ~& %dy-made-dial-fail
(dy-rash %bel ~) (dy-rash %bel ~)
=+ tan=((list tank) +14.q.q.cag) =+ tan=((list tank) +2.q.q.cag)
=. +>+>.$ (he-rush %tan tan) =. +>+>.$ (he-rush %tan tan)
=+ vax=(spec (slot 15 q.cag)) =+ vax=(spec (slot 3 q.cag))
?+ -.q.vax !! ?+ -.q.vax !!
%& %&
?~ +.q.vax ?~ +.q.vax

View File

@ -17,38 +17,39 @@
|* out=$+(* *) :: output structure |* out=$+(* *) :: output structure
$+(console-input (console-result out)) :: output function $+(console-input (console-result out)) :: output function
:: :: :: ::
++ console-result :: standard output ++ console-result :: conditional result
|* out=$+(* *) :: output structure |* out=$+(* *) :: output structure
%- unit :: ~ is invalid $|(@ud (console-product out)) :: error position
%- unit :: ~ is prefix :: ::
%+ pair (list tank) :: ++ console-product :: success result
|* out=$+(* *) ::
%+ pair (list tank) ::
%+ each (unit out) :: ~ is abort %+ each (unit out) :: ~ is abort
(pair console-prompt (console-dialog out)) :: ask and continue (pair console-prompt (console-dialog out)) :: ask and continue
:: :: :: ::
++ console-so :: construct result ++ console-so :: construct result
|* pro=* :: |* pro=* ::
[~ u=[~ u=[p=*(list tank) q=[%& p=[~ u=pro]]]]] :: [p=*(list tank) q=[%& p=[~ u=pro]]] ::
:: :: :: ::
++ console-yo :: add output tank ++ console-yo :: add output tank
|* [tan=tank res=(console-result)] :: |* [tan=tank res=(console-result)] ::
?~ res ~ :: ?@ res res ::
?~ u.res [~ u=~] :: [p=[i=tan t=p.res] q=q.res] ::
[~ u=[~ u=[p=[i=tan t=p.u.u.res] q=q.u.u.res]]] ::
:: :: :: ::
++ console-lo :: construct prompt ++ console-lo :: construct prompt
|* [pom=console-prompt mor=(console-dialog)] :: |* [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 ++ console-no :: empty result
[~ u=[~ u=[p=*(list tank) q=~]]] :: [p=*(list tank) q=~] ::
:: :: :: ::
++ console-go :: parse by rule ++ console-go :: parse by rule
|* [sef=_rule fun=$+(* *)] :: |* [sef=_rule fun=$+(* *)] ::
|= txt=console-input :: |= txt=console-input ::
=+ yid=(ruse txt sef) :: =+ vex=(sef [0 0] txt) ::
?~ yid ~ :: ?: |(!=((lent txt) q.p.vex) ?=(~ q.vex)) ::
?~ u.yid [~ u=~] :: q.p.vex ::
(fun u.u.yid) :: (fun p.u.q.vex) ::
:: :: :: ::
++ console-clock ,[own=@ud his=@ud] :: vector clock ++ console-clock ,[own=@ud his=@ud] :: vector clock
++ console-edit :: shared state change ++ console-edit :: shared state change