Finish moving ++from into bowl.

This commit is contained in:
C. Guy Yarvin 2015-05-28 00:56:08 -07:00
parent 7ec596e1b5
commit ae67dcdf34
7 changed files with 27 additions and 31 deletions

View File

@ -741,11 +741,11 @@
he-abet:(~(he-type he [ost.hid ~] (~(got by hoc) ost.hid)) act) he-abet:(~(he-type he [ost.hid ~] (~(got by hoc) ost.hid)) act)
:: ::
++ made ++ made
|= [then dep=@uvH reg=(each gage tang)] |= [way=wire dep=@uvH reg=(each gage tang)]
he-abet:(~(he-made he [[ost.hid ~] (~(got by hoc) ost.hid)]) way dep reg) he-abet:(~(he-made he [[ost.hid ~] (~(got by hoc) ost.hid)]) way dep reg)
:: ::
++ unto ++ unto
|= [then cit=cuft] |= [way=wire cit=cuft]
he-abet:(~(he-unto he [[ost.hid ~] (~(got by hoc) ost.hid)]) cit) he-abet:(~(he-unto he [[ost.hid ~] (~(got by hoc) ost.hid)]) cit)
:: ::
++ pull ++ pull

View File

@ -50,20 +50,20 @@
:::: :: :: :::: :: ::
:: :: :: :: :: ::
++ coup-kiln-fancy :: ++ coup-kiln-fancy ::
|= [then saw=(unit tang)] |= [way=wire saw=(unit tang)]
(ably (take-coup-fancy:(kiln-work hid (able %kiln)) way +<+)) (ably (take-coup-fancy:(kiln-work hid (able %kiln)) way +<+))
:: ::
++ coup-kiln-spam :: ++ coup-kiln-spam ::
|= [then saw=(unit tang)] |= [way=wire saw=(unit tang)]
~? ?=(^ saw) [%kiln-spam-lame u.saw] ~? ?=(^ saw) [%kiln-spam-lame u.saw]
[~ +>] [~ +>]
:: ::
++ coup-drum :: ++ coup-drum ::
|= [then saw=(unit tang)] |= [way=wire saw=(unit tang)]
(ably (take-coup:(drum-work hid (able %drum)) way +<+)) (ably (take-coup:(drum-work hid (able %drum)) way +<+))
:: ::
++ diff-sole-effect-drum ++ diff-sole-effect-drum
|= [then sole-effect] |= [way=wire sole-effect]
(ably (diff-sole-effect:(drum-work hid (able %drum)) way +<+)) (ably (diff-sole-effect:(drum-work hid (able %drum)) way +<+))
:: ::
++ poke-hood-begin :: ++ poke-hood-begin ::
@ -115,27 +115,27 @@
(ably (poke-will:(helm-work hid (able %helm)) +<)) (ably (poke-will:(helm-work hid (able %helm)) +<))
:: ::
++ mere-kiln :: ++ mere-kiln ::
|= [then are=(each (set path) (pair term tang))] |= [way=wire are=(each (set path) (pair term tang))]
(ably (take-mere:(kiln-work hid (able %kiln)) way +<+)) (ably (take-mere:(kiln-work hid (able %kiln)) way +<+))
:: ::
++ made-kiln :: ++ made-kiln ::
|= [then @uvH (each gage tang)] |= [way=wire @uvH (each gage tang)]
(ably (take-made:(kiln-work hid (able %kiln)) way +<+)) (ably (take-made:(kiln-work hid (able %kiln)) way +<+))
:: ::
++ init-helm :: ++ init-helm ::
|= [then *] |= [way=wire *]
[~ +>] [~ +>]
:: ::
++ note-helm :: ++ note-helm ::
|= [then (pair ,@tD tank)] |= [way=wire (pair ,@tD tank)]
(ably (take-note:(helm-work hid (able %helm)) way +<+)) (ably (take-note:(helm-work hid (able %helm)) way +<+))
:: ::
++ reap-drum ++ reap-drum
|= [then saw=(unit tang)] |= [way=wire saw=(unit tang)]
(ably (reap:(drum-work hid (able %drum)) way +<+)) (ably (reap:(drum-work hid (able %drum)) way +<+))
:: ::
++ onto-drum :: ++ onto-drum ::
|= [then saw=(each ,[term @tas @da] tang)] |= [way=wire saw=(each ,[term @tas @da] tang)]
(ably (take-onto:(drum-work hid (able %drum)) way +<+)) (ably (take-onto:(drum-work hid (able %drum)) way +<+))
:: ::
++ peer-drum ++ peer-drum
@ -143,10 +143,10 @@
(ably (peer:(drum-work hid (able %drum)) +<)) (ably (peer:(drum-work hid (able %drum)) +<))
:: ::
++ quit-drum ++ quit-drum
|= then |= way=wire
(ably (quit:(drum-work hid (able %drum)) way)) (ably (quit:(drum-work hid (able %drum)) way))
:: ::
++ went-helm :: ++ went-helm ::
|= [then her=ship kay=cape] |= [way=wire her=ship kay=cape]
(ably (take-went:(helm-work hid (able %helm)) way +<+)) (ably (take-went:(helm-work hid (able %helm)) way +<+))
-- --

View File

@ -97,7 +97,7 @@
:: :: :: :: :: ::
:::: :: :: console UI :::: :: :: console UI
:: :: :: :: :: ::
++ work :: conslle action ++ work :: console action
|= act=sole-action :: |= act=sole-action ::
=+ say=(~(got by eye) ost) :: =+ say=(~(got by eye) ost) ::
|^ ?:(?=(%det -.act) (delt +.act) dive) :: |^ ?:(?=(%det -.act) (delt +.act) dive) ::
@ -177,10 +177,10 @@
:::: :: :: handlers :::: :: :: handlers
:: :: :: :: :: ::
++ coup-octo :: move acknowledge ++ coup-octo :: move acknowledge
|= [then saw=(unit tang)] :: |= [way=wire saw=(unit tang)] ::
abet:(~(coup-octo ce ost src) way saw) :: abet:(~(coup-octo ce ost src) way saw) ::
++ diff-octo-update :: friend update ++ diff-octo-update :: friend update
|= [then mex=(each game tape)] :: |= [way=wire mex=(each game tape)] ::
abet:(~(diff-octo-update ce ost src) way mex) :: abet:(~(diff-octo-update ce ost src) way mex) ::
++ peer-octo :: urbit peer ++ peer-octo :: urbit peer
|= path :: |= path ::
@ -201,11 +201,11 @@
abet:(~(pull-octo ce ost src) +<) :: abet:(~(pull-octo ce ost src) +<) ::
++ pull-sole :: disconnect console ++ pull-sole :: disconnect console
|= path :: |= path ::
abet:(~(pull-sole ce ost src) +<) :: abet:(~(pull-sole ce ost src) +<) ::
++ quit-octo :: unlinked by friend ++ quit-octo :: unlinked by friend
|= then :: |= way=wire ::
abet:(~(quit-octo ce ost src) way) :: abet:(~(quit-octo ce ost src) way) ::
++ reap-octo :: linked to friend ++ reap-octo :: linked to friend
|= [then saw=(unit tang)] :: |= [way=wire saw=(unit tang)] ::
abet:(~(reap-octo ce ost src) way saw) :: abet:(~(reap-octo ce ost src) way saw) ::
-- --

View File

@ -1679,12 +1679,12 @@
ra-abet:(~(ra-sole ra ost.hid ~) act) ra-abet:(~(ra-sole ra ost.hid ~) act)
:: ::
++ diff-talk-report :: ++ diff-talk-report ::
|= [then rad=report] |= [way=wire rad=report]
%+ etch-friend way |= [man=span cuz=station] %+ etch-friend way |= [man=span cuz=station]
ra-abet:(~(ra-diff-talk-report ra ost.hid ~) man cuz rad) ra-abet:(~(ra-diff-talk-report ra ost.hid ~) man cuz rad)
:: ::
++ coup-repeat :: ++ coup-repeat ::
|= [then saw=(unit tang)] |= [way=wire saw=(unit tang)]
%+ etch-repeat [%repeat way] |= [num=@ud src=@p man=span] %+ etch-repeat [%repeat way] |= [num=@ud src=@p man=span]
ra-abet:(~(ra-coup-repeat ra ost.hid ~) [num src man] saw) ra-abet:(~(ra-coup-repeat ra ost.hid ~) [num src man] saw)
:: ::
@ -1712,7 +1712,7 @@
?>(?=(%repeat -.wer) (fun p.wer q.wer r.wer)) ?>(?=(%repeat -.wer) (fun p.wer q.wer r.wer))
:: ::
++ reap-friend :: ++ reap-friend ::
|= [then saw=(unit tang)] |= [way=wire saw=(unit tang)]
^- (quip move +>) ^- (quip move +>)
?~ saw [~ +>] ?~ saw [~ +>]
%+ etch-friend [%friend way] |= [man=span cuz=station] %+ etch-friend [%friend way] |= [man=span cuz=station]
@ -1720,7 +1720,7 @@
ra-abet:(~(ra-quit ra ost.hid ~) man cuz) ra-abet:(~(ra-quit ra ost.hid ~) man cuz)
:: ::
++ quit-friend :: ++ quit-friend ::
|= then |= way=wire
%+ etch-friend [%friend way] |= [man=span cuz=station] %+ etch-friend [%friend way] |= [man=span cuz=station]
ra-abet:(~(ra-retry ra ost.hid ~) man cuz) ra-abet:(~(ra-retry ra ost.hid ~) man cuz)
:: ::

View File

@ -33,8 +33,8 @@
pol=(map ship mast) :: apps by ship pol=(map ship mast) :: apps by ship
== :: == ::
++ gest :: subscriber data ++ gest :: subscriber data
$: sup=(map bone (pair ship path)) :: subscribers $: sup=bitt :: incoming subscribers
pus=(jug path bone) :: srebircsbus neb=boat :: outgoing subscribers
qel=(map bone ,@ud) :: queue meter qel=(map bone ,@ud) :: queue meter
== :: == ::
++ mast :: ship state ++ mast :: ship state
@ -790,7 +790,6 @@
|= pax=path |= pax=path
%_ +>.$ %_ +>.$
sup.ged (~(put by sup.ged) ost [q.q.pry pax]) sup.ged (~(put by sup.ged) ost [q.q.pry pax])
pus.ged (~(put ju pus.ged) pax ost)
== ==
:: ::
++ ap-poke :: apply %poke ++ ap-poke :: apply %poke
@ -875,7 +874,6 @@
?~ wim + ?~ wim +
%_ + %_ +
sup.ged (~(del by sup.ged) ost) sup.ged (~(del by sup.ged) ost)
pus.ged (~(del ju pus.ged) q.u.wim ost)
qel.ged (~(del by qel.ged) ost) qel.ged (~(del by qel.ged) ost)
== ==
:: ::
@ -883,7 +881,6 @@
=+ wim=(~(get by sup.ged) ost) =+ wim=(~(get by sup.ged) ost)
?~ wim ~&(%ap-pull-none +) ?~ wim ~&(%ap-pull-none +)
=: sup.ged (~(del by sup.ged) ost) =: sup.ged (~(del by sup.ged) ost)
pus.ged (~(del ju pus.ged) q.u.wim ost)
qel.ged (~(del by qel.ged) ost) qel.ged (~(del by qel.ged) ost)
== ==
=+ cug=(ap-find %pull q.u.wim) =+ cug=(ap-find %pull q.u.wim)

View File

@ -9663,7 +9663,6 @@
++ slad $+ [(unit (set monk)) term beam] :: undertyped ++ slad $+ [(unit (set monk)) term beam] :: undertyped
(unit (unit (cask))) :: (unit (unit (cask))) ::
++ slut $+(* (unit (unit))) :: old namespace ++ slut $+(* (unit (unit))) :: old namespace
++ then ,[way=wire] :: backward problem
++ vile :: reflexive constants ++ vile :: reflexive constants
$: typ=type :: -:!>(*type) $: typ=type :: -:!>(*type)
duc=type :: -:!>(*duct) duc=type :: -:!>(*duct)

View File

@ -1826,7 +1826,7 @@
lys=@da :: last sent lys=@da :: last sent
pac=rock :: packet data pac=rock :: packet data
== :: == ::
++ bitt (map bone (pair ship path)) :: outgoing subs ++ bitt (map bone (pair ship path)) :: incoming subs
++ blob :: fs blob ++ blob :: fs blob
$% [%delta p=lobe q=[p=mark q=lobe] r=page] :: delta on q $% [%delta p=lobe q=[p=mark q=lobe] r=page] :: delta on q
[%direct p=lobe q=page] :: immediate [%direct p=lobe q=page] :: immediate