ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-29 04:04:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test'

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2015-07-13 16:09:26 -04:00
commit 34a35b7b98
83 changed files with 927 additions and 789 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ape/bit.hoon
View File

@ -4,7 +4,7 @@
::
/? 314
/- *talk, *bit-api
/+ talk, sole, http, mean
/+ talk, sole, http
!:
:::: sivtyv-barnel
:: be sure to have oauth2-code markk

28
ape/dojo.hoon
View File

@ -84,7 +84,7 @@
++ card :: general card
$% [%diff %sole-effect sole-effect] ::
[%send wire [ship term] clap] ::
[%exec wire @p beak (unit silk)] ::
[%exec wire @p (unit ,[beak silk])] ::
[%deal wire sock term club] ::
== ::
++ move (pair bone card) :: user-level move
@ -232,17 +232,17 @@
|= [way=wire kas=silk]
^+ +>+>
?> ?=(~ pux)
(he-card(poy `+>+<(pux `way)) %exec way our.hid dy-beak `kas)
(he-card(poy `+>+<(pux `way)) %exec way our.hid `[dy-beak kas])
::
++ dy-stop :: stop work
^+ +>
?~ pux +>
(he-card(poy ~) %exec u.pux our.hid dy-beak ~)
(he-card(poy ~) %exec u.pux our.hid ~)
::
++ dy-slam :: call by ford
|= [way=wire gat=vase sam=vase]
^+ +>+>
(dy-ford way %call [%done ~ %noun gat] [%done ~ %noun sam])
(dy-ford way %call [%$ %noun gat] [%$ %noun sam])
::
++ dy-diff :: send effects, abet
|= fec=sole-effect
@ -369,7 +369,9 @@
::
++ dy-done :: dialog submit
|= txt=tape
?> ?=(^ pro)
?. ?=(^ pro)
~& %dy-no-prompt
(dy-diff %bel ~)
(dy-slam /dial u.pro !>(txt))
::
++ dy-over :: finish construction
@ -421,12 +423,12 @@
::
++ dy-cage |=(num=@ud (~(got by rez) num)) :: known cage
++ dy-vase |=(num=@ud q:(dy-cage num)) :: known vase
++ dy-silk-vase |=(vax=vase [%done ~ %noun vax]) :: vase to silk
++ dy-silk-vase |=(vax=vase [%$ %noun vax]) :: vase to silk
++ dy-silk-config :: configure
|= [cag=cage cig=dojo-config]
^- silk
:+ %ride [%cnzy %$]
:+ %mute [%done ~ cag]
:+ %mute [%$ cag]
^- (list (pair wing silk))
:* :- [[~ 12] ~]
(dy-silk-vase !>([now=now.hid eny=eny.hid bec=he-beak]))
@ -452,7 +454,7 @@
::
++ dy-twig-head :: dynamic state
^- vase
:(slop !>(`our=@p`our.hid) !>(`tym=@da`now.hid) !>(`eny=@uvI`eny.hid))
:(slop !>(`our=@p`our.hid) !>(`now=@da`now.hid) !>(`eny=@uvI`eny.hid))
::
++ dy-made-dial :: dialog product
|= cag=cage
@ -492,7 +494,7 @@
%ec [/hand [%cast p.q.u.cud (dy-mare q.q.u.cud)]]
%ex [/hand (dy-mare p.q.u.cud)]
%tu :- /hand
:+ %done ~
:- %$
:- %noun
|- ^- vase
?~ p.q.u.cud !!
@ -504,7 +506,7 @@
++ dy-mare :: build expression
|= gen=twig
^- silk
[%ride gen [[%done ~ %$ dy-twig-head] [%reef ~]]]
[%ride gen [[%$ %$ dy-twig-head] [%reef ~]]]
::
++ dy-step :: advance project
|= nex=@ud
@ -518,7 +520,7 @@
++ he-dope :: sole user of ++dp
|= txt=tape ::
^- (each (unit dojo-command) hair) :: prefix/result
=+ vex=(dp-command:dp [1 1] txt) ::
=+ vex=((full dp-command):dp [1 1] txt) ::
?. =(+((lent txt)) q.p.vex) :: fully parsed
[%| p.p.vex (dec q.p.vex)] :: syntax error
[%& ?~(q.vex ~ `p.u.q.vex)] :: prefix/complete
@ -550,7 +552,7 @@
(he-card %send way [him dap] cop)
::
++ he-diff :: emit update
|= fec=sole-effect
|= fec=sole-effect
^+ +>
(he-card %diff %sole-effect fec)
::
@ -670,6 +672,7 @@
++ peer-sole
|= [pax=path]
^- (quip move +>)
:: ~& [%dojo-peer ost.hid pax]
~? !=(src.hid our.hid) [%dojo-peer-stranger ost.hid src.hid pax]
:: ?> =(src.hid our.hid)
~? (~(has by hoc) ost.hid) [%dojo-peer-replaced ost.hid pax]
@ -689,6 +692,7 @@
++ poke-sole-action
|= [act=sole-action]
^- (quip move +>)
~| [%dojo-poke ost.hid -.act (~(run by hoc) ,~)]
:: ~& [%dojo-poke ost.hid src.hid act]
:: ~? !=(src.hid our.hid) [%dojo-poke ost.hid src.hid]
he-abet:(~(he-type he [ost.hid ~] (~(got by hoc) ost.hid)) act)

56
ape/hood.hoon
View File

@ -71,38 +71,40 @@
++ from-helm (from-lib %helm [..$ ,_abet]:(helm-work))
++ from-kiln (from-lib %kiln [..$ ,_abet]:(kiln-work))
::
++ poke-dill-belt (wrap poke-dill-belt):from-drum
++ poke-helm-init (wrap poke-init):from-helm
++ poke-helm-verb (wrap poke-verb):from-helm
++ poke-helm-send-hi (wrap poke-send-hi):from-helm
++ poke-helm-hi (wrap poke-hi):from-helm
++ poke-hood-link (wrap poke-link):from-drum
++ poke-hood-mass (wrap poke-mass):from-helm
++ poke-hood-mount (wrap poke-mount):from-kiln
++ poke-hood-unmount (wrap poke-unmount):from-kiln
++ poke-hood-sync (wrap poke-sync):from-kiln
++ poke-hood-unsync (wrap poke-unsync):from-kiln
++ poke-hood-begin (wrap poke-begin):from-helm
++ poke-hood-invite (wrap poke-invite):from-helm
++ poke-hood-merge (wrap poke-merge):from-kiln
++ poke-hood-reload (wrap poke-reload):from-helm
++ poke-hood-reset (wrap poke-reset):from-helm
++ poke-hood-start (wrap poke-start):from-drum
++ poke-hood-reload-desk (wrap poke-reload-desk):from-helm
++ poke-kiln-cp (wrap poke-cp):from-kiln
++ poke-kiln-rm (wrap poke-rm):from-kiln
++ poke-kiln-mv (wrap poke-mv):from-kiln
++ poke-kiln-schedule (wrap poke-schedule):from-kiln
++ poke-will (wrap poke-will):from-helm
++ init-helm |=([way=wire *] [~ +>])
++ made-kiln (wrap take-made):from-kiln
++ mere-kiln (wrap take-mere):from-kiln
++ mere-kiln-sync (wrap take-mere-sync):from-kiln
++ made-kiln (wrap take-made):from-kiln
++ init-helm |=([way=wire *] [~ +>])
++ note-helm (wrap take-note):from-helm
++ reap-drum-phat (wrap reap-phat):from-drum
++ onto-drum (wrap take-onto):from-drum
++ peer-drum (wrap peer):from-drum
++ poke-dill-belt (wrap poke-dill-belt):from-drum
++ poke-drum-link (wrap poke-link):from-drum
++ poke-drum-start (wrap poke-start):from-drum
++ poke-helm-hi (wrap poke-hi):from-helm
++ poke-helm-init (wrap poke-init):from-helm
++ poke-helm-invite (wrap poke-invite):from-helm
++ poke-helm-mass (wrap poke-mass):from-helm
++ poke-helm-reload (wrap poke-reload):from-helm
++ poke-helm-reload-desk (wrap poke-reload-desk):from-helm
++ poke-helm-reset (wrap poke-reset):from-helm
++ poke-helm-send-hi (wrap poke-send-hi):from-helm
++ poke-helm-verb (wrap poke-verb):from-helm
++ poke-hood-begin (wrap poke-begin):from-helm
++ poke-hood-sync (wrap poke-sync):from-kiln
++ poke-kiln-cp (wrap poke-cp):from-kiln
++ poke-kiln-label (wrap poke-label):from-kiln
++ poke-kiln-merge (wrap poke-merge):from-kiln
++ poke-kiln-mount (wrap poke-mount):from-kiln
++ poke-kiln-mv (wrap poke-mv):from-kiln
++ poke-kiln-rm (wrap poke-rm):from-kiln
++ poke-kiln-schedule (wrap poke-schedule):from-kiln
++ poke-kiln-sync (wrap poke-sync):from-kiln
++ poke-kiln-unmount (wrap poke-unmount):from-kiln
++ poke-kiln-unsync (wrap poke-unsync):from-kiln
++ poke-will (wrap poke-will):from-helm
++ quit-drum-phat (wrap quit-phat):from-drum
++ went-helm (wrap take-went):from-helm
++ reap-drum-phat (wrap reap-phat):from-drum
++ woot-helm (wrap take-woot):from-helm
++ writ-kiln-sync (wrap take-writ):from-kiln
--

7
ape/talk.hoon
View File

@ -109,7 +109,7 @@
++ sh :: per console
|_ $: coz=(list command) :: talk actions
she=shell
==
==
++ sh-expr wide:(vang & [&1:% &2:% (scot %da now.hid) |3:%])
::
++ sh-scad :: command parser
@ -782,7 +782,7 @@
%_(+> coz [cod coz])
::
++ sh-twig-head ^- vase :: eval data
:(slop !>(`our=@p`our.hid) !>(`tym=@da`now.hid) !>(`eny=@uvI`eny.hid))
:(slop !>(`our=@p`our.hid) !>(`now=@da`now.hid) !>(`eny=@uvI`eny.hid))
::
++ sh-work :: do work
|= job=work
@ -1659,6 +1659,7 @@
?+ -.sep ~&(tr-lost/sep "")
%fat
=+ rem=$(sep q.sep)
?: (gth (lent rem) 60) (trim 62 rem)
=- "{rem} {(trim (sub 60 (lent rem)) -)}"
?+ -.p.sep "..."
%tank ~(ram re %rose [" " `~] +.p.sep)
@ -1686,7 +1687,7 @@
:: ~& [%talk-peer src ost pax]
?: ?=([%sole *] pax)
?> =(our.hid src.hid)
?< (~(has by shells) ost.hid)
~? (~(has by shells) ost.hid) [%talk-peer-replaced ost.hid pax]
ra-abet:(~(ra-console ra ost.hid ~) src.hid t.pax)
:: ~& [%talk-peer-data ost.hid src.hid pax]
ra-abet:(~(ra-subscribe ra ost.hid ~) src.hid pax)

76
arvo/ames.hoon
View File

@ -1,4 +1,4 @@
!: :: ames (4a), networking
:: :: ames (4a), networking
::
|= pit=vase
=> =~
@ -13,13 +13,13 @@
$% [%kick p=@da] ::
== == ::
$: %g :: to %gall
$% [%rote p=sack q=path r=*] ::
[%roth p=sack q=path r=*] ::
$% [%deal p=sock q=cush] ::
== == ::
$: @tas :: to any
$% [%init p=@p] ::
[%want p=sock q=path r=*] ::
[%wart p=sock q=@tas r=path s=*] ::
[%west p=sack q=path r=*] ::
== == == ::
++ sign :: in result $<-
$? $: %a :: from %ames
@ -27,12 +27,12 @@
== == ::
$: %g :: from %gall
$% [%unto p=cuft] ::
[%mack p=(unit tang)] :: message ack
[%mean p=ares] :: XX old, clean up
[%nice ~] ::
== == ::
$: @tas ::
$% [%crud p=@tas q=(list tank)] :: by any
[%mack p=(unit tang)] :: message ack
== == == ::
--
::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -1672,7 +1672,7 @@
:+ (scot %p p.p.bon)
(scot %p q.p.bon)
q.q.bon
[hen %pass pax %g %rote p.bon /hood 0 %m %will wil]~
[hen %pass pax %g %west p.bon /ge/hood 0 %m %will wil]~
?> ?=([@ @ *] t.q.q.bon)
:_ fox
=+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon]
@ -1710,64 +1710,18 @@
:~ [hen [%slip %e %wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]]
==
::
%ta
=+ gox=((hard ,[p=@p q=@pG r=gens s=pass]) r.bon)
=+ gus=(need (~(us go ton.fox) p.p.bon))
=^ wyl gus (born:gus now gox)
=. ton.fox (~(su go ton.fox) gus)
:_ fox
:~ :- hen
[%pass /ta/beginning %a %want p.bon [%r %ta t.t.q.q.bon] `(unit will)`wyl]
==
%re :: %re
:_ fox
:~ [hen [%slip %c %wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]]
==
::
%ye :: %ye
:: ~& [%ye bon]
?> =(p.p.bon (sein q.p.bon))
=+ ^= paz ^- (list ,@p)
%+ skim pals:(~(um am [now fox]) p.p.bon)
|=(a=@p =(p.p.bon (sein a)))
:_ fox
%+ turn paz
|= him=ship
:- hen
[%pass /ye %g %rote `sack`p.bon /ye 0 %m %helm-ye ((hard ,@t) r.bon)]
==
::
%mulk
:: ~& [%mulk p.bon q.bon]
?> ?=([@ @ *] q.q.bon)
?> ?=(%q i.q.q.bon)
?+ i.t.q.q.bon
~& %mulk-bad
:_ fox
:~ :- (claw p.p.bon)
[%sick %wart p.bon i.t.q.q.bon t.t.q.q.bon r.bon]
==
::
%ge :: %gall request
=* imp t.t.q.q.bon
?> (levy imp (sane %ta))
=+ ^= pax
:+ (scot %p p.p.bon)
(scot %p q.p.bon)
q.q.bon
:: ~& [%ames-gall-request p.bon imp pax]
:_ fox [hen %pass pax %g %rote p.bon imp r.bon]~
::
%gh :: %gall response
=* imp t.t.q.q.bon
?> (levy imp (sane %ta))
=+ ^= pax
:+ (scot %p p.p.bon)
(scot %p q.p.bon)
q.q.bon
:: ~& [%ames-gall-response p.bon imp pax]
:_ fox [hen %pass pax %g %roth p.bon imp r.bon]~
==
?> ?=(?(%a %c %e %g) i.q.q.bon)
=+ pax=[(scot %p p.p.bon) (scot %p q.p.bon) q.q.bon]
:_ fox [hen %pass pax i.q.q.bon %west p.bon t.q.q.bon r.bon]~
::
%ouzo
:: ~& [%send now p.bon `@p`(mug (shaf %flap q.bon))]
@ -1798,7 +1752,7 @@
%went [~ +>]
%mack ?~ +>.sih $(sih [%g %nice ~]) :: XX using old code
$(sih [%g %mean `[%mack +>+.sih]])
%unto ~|([%ames-unto tea hen +>-.sih] !!)
%unto [~ +>]
?(%mean %nice) :: XX obsolete
?: ?=([%ye ~] tea)
[~ +>.$]
@ -1824,6 +1778,18 @@
^- [(list move) _+>]
?: ?=(%crud -.kyz)
[[[hen [%slip %d %flog kyz]] ~] +>]
?: ?=(%west -.kyz)
?> ?=([%ta ~] q.kyz)
=+ gox=((hard ,[p=@p q=@pG r=gens s=pass]) r.kyz)
=+ gus=(need (~(us go ton.fox) p.p.kyz))
=^ wyl gus (born:gus now gox)
=. ton.fox (~(su go ton.fox) gus)
:_ +>.$
=+ ^= pax
:+ (scot %p p.p.kyz)
(scot %p q.p.kyz)
q.kyz
[hen %pass pax %g %deal p.kyz %hood %poke %will !>(wyl)]~
?: ?=(%wegh -.kyz)
~& %ames-weighing
[[hen %give %mass wegh]~ +>]

10
arvo/time.hoon → arvo/behn.hoon
View File

@ -1,4 +1,4 @@
:: :: %time, just a timer
:: :: %behn, just a timer
!? 164
!:::
|= pit=vase
@ -12,7 +12,7 @@
== ::
++ broq |* [a=_,* b=_,*] :: brodal skew qeu
(list (sqeu a b)) ::
++ gift gift-time :: out result <-$
++ gift gift-behn :: out result <-$
++ kiss :: in request ->$
$% [%rest p=@da] :: cancel alarm
[%wait p=@da] :: set alarm
@ -161,10 +161,10 @@
q.hic
^- kiss
?: ?=(%soft -.q.hic)
:: ~& [%time-call-soft (,@tas `*`-.p.q.hic)]
:: ~& [%behn-call-soft (,@tas `*`-.p.q.hic)]
((hard kiss) p.q.hic)
?: (~(nest ut -:!>(*kiss)) | p.hic) q.hic
~& [%time-call-flub (,@tas `*`-.q.hic)]
~& [%behn-call-flub (,@tas `*`-.q.hic)]
((hard kiss) q.hic)
==
=^ mof tym
@ -193,7 +193,7 @@
%wegh
:_ tym :_ ~
:^ hen %give %mass
:- %time
:- %behn
:- %|
:~ tym/`tym
==

215
arvo/clay.hoon
View File

@ -42,7 +42,7 @@
== ::
++ note :: out request $->
$% $: %a :: to %ames
$% [%want p=sock q=path r=*] ::
$% [%wont p=sock q=path r=*] ::
== == ::
$: %c :: to %clay
$% [%info p=@p q=@tas r=nori] :: internal edit
@ -53,7 +53,7 @@
$% [%flog p=[%crud p=@tas q=(list tank)]] :: to %dill
== == ::
$: %f ::
$% [%exec p=@p q=beak r=(unit silk)] ::
$% [%exec p=@p q=(unit ,[beak silk])] ::
== == ::
$: %t ::
$% [%wait p=@da] ::
@ -61,8 +61,7 @@
== == == ::
++ sign :: in result $<-
$? $: %a :: by %ames
$% [%waft p=sock q=*] ::
[%went p=ship q=cape] ::
$% [%woot p=ship q=coop] ::
== == ::
$: %c :: by %clay
$% [%note p=@tD q=tank] ::
@ -156,7 +155,7 @@
%+ turn (flop say)
|= [a=duct b=path c=ship d=[p=@ud q=riff]]
:- a
[%pass b %a %want [who c] [%q %re p.q.d (scot %ud p.d) ~] q.d]
[%pass b %a %wont [who c] [%c %question p.q.d (scot %ud p.d) ~] q.d]
::
tag
==
@ -248,7 +247,7 @@
+>.$(byn [[hen ~ [p.mun q.mun syd] r.mun p.dat] byn])
=- +>.$(tag [- tag])
:* hen %pass [%blab p.mun (scot q.mun) syd r.mun]
%f %exec who [who syd q.mun] ~ (lobe-to-silk:ze r.mun p.dat)
%f %exec who ~ [who syd q.mun] (lobe-to-silk:ze r.mun p.dat)
==
::
++ bleb :: ship sequence
@ -306,16 +305,16 @@
tag
:_ tag
:* hen %pass [%ergoing (scot %p who) syd ~] %f
%exec who [who syd %da now] ~ %tabl
%exec who ~ [who syd %da now] %tabl
^- (list (pair silk silk))
%+ turn `(list path)`mus
|= a=path
^- (pair silk silk)
:- [%done ~ %path !>(a)]
:- [%$ %path !>(a)]
:+ %cast %mime
=+ (need (need (read-x:ze let.dom a)))
?: ?=(%& -<)
[%done ~ p.-]
[%$ p.-]
(lobe-to-silk:ze a p.-)
==
==
@ -508,37 +507,37 @@
^- (list move)
:~ :* hen %pass
[%inserting (scot %p who) syd (scot %da wen) ~]
%f %exec who [who syd %da wen] ~ %tabl
%f %exec who ~ [who syd %da wen] %tabl
^- (list (pair silk silk))
%+ turn ins
|= [pax=path mis=miso]
?> ?=(%ins -.mis)
:- [%done ~ %path -:!>(*path) pax]
:- [%$ %path -:!>(*path) pax]
=+ =>((flop pax) ?~(. %$ i))
[%cast - [%done ~ p.mis]]
[%cast - [%$ p.mis]]
==
:* hen %pass
[%diffing (scot %p who) syd (scot %da wen) ~]
%f %exec who [who syd %da wen] ~ %tabl
%f %exec who ~ [who syd %da wen] %tabl
^- (list (pair silk silk))
%+ turn dif
|= [pax=path mis=miso]
?> ?=(%dif -.mis)
=+ (need (need (read-x:ze let.dom pax)))
?> ?=(%& -<)
:- [%done ~ %path -:!>(*path) pax]
[%pact [%done ~ p.-] [%done ~ p.mis]]
:- [%$ %path -:!>(*path) pax]
[%pact [%$ p.-] [%$ p.mis]]
==
:* hen %pass
[%castifying (scot %p who) syd (scot %da wen) ~]
%f %exec who [who syd %da wen] ~ %tabl
%f %exec who ~ [who syd %da wen] %tabl
^- (list (pair silk silk))
%+ turn mut
|= [pax=path mis=miso]
?> ?=(%mut -.mis)
:- [%done ~ %path -:!>(*path) pax]
:- [%$ %path -:!>(*path) pax]
=+ (lobe-to-mark:ze (~(got by q:(aeon-to-yaki:ze let.dom)) pax))
[%cast - [%done ~ p.mis]]
[%cast - [%$ p.mis]]
==
==
::
@ -550,21 +549,21 @@
?+ -.mis !!
%mut
:- [%diffing (scot %p who) syd (scot %da wen) pax]
:^ %f %exec who :+ [who syd %da wen] ~
:^ %f %exec who :+ ~ [who syd %da wen]
^- silk
:+ %diff
(lobe-to-silk:ze pax (~(got by q:(aeon-to-yaki:ze let.dom)) pax))
=+ (slag (dec (lent pax)) pax)
=+ ?~(- %$ i.-)
[%cast - [%done ~ p.mis]]
[%cast - [%$ p.mis]]
::
%ins
:- [%casting (scot %p who) syd (scot %da wen) pax]
:^ %f %exec who :+ [who syd %da wen] ~
:^ %f %exec who :+ ~ [who syd %da wen]
^- silk
=+ (slag (dec (lent pax)) pax)
=+ ?~(- %$ i.-)
[%cast - [%done ~ p.mis]]
[%cast - [%$ p.mis]]
==
::
++ apply-edit
@ -662,13 +661,13 @@
^- move
:* hen %pass
[%mutating (scot %p who) syd (scot %da wen) ~]
%f %exec who [who syd %da wen] ~ %tabl
%f %exec who ~ [who syd %da wen] %tabl
^- (list (pair silk silk))
%+ turn cat
|= [pax=path cay=cage]
:- [%done ~ %path -:!>(*path) pax]
:- [%$ %path -:!>(*path) pax]
=+ (lobe-to-silk:ze pax (~(got by q:(aeon-to-yaki:ze let.dom)) pax))
[%diff - [%done ~ cay]]
[%diff - [%$ cay]]
==
::
++ take-mutating
@ -765,21 +764,21 @@
tag
:_ tag
:* hen %pass [%ergoing (scot %p who) syd ~] %f
%exec who [who syd %da now] ~ %tabl
%exec who ~ [who syd %da now] %tabl
^- (list (pair silk silk))
%+ turn (~(tap in sum))
|= a=path
^- (pair silk silk)
:- [%done ~ %path !>(a)]
:- [%$ %path !>(a)]
=+ b=(~(got by can) a)
?: ?=(%del -.b)
[%done ~ %null !>(~)]
[%$ %null !>(~)]
=+ (~(get by mim.u.dok) a)
?^ - [%done ~ %mime !>(u.-)]
?^ - [%$ %mime !>(u.-)]
:+ %cast %mime
=+ (need (need (read-x:ze let.dom a)))
?: ?=(%& -<)
[%done ~ p.-]
[%$ p.-]
(lobe-to-silk:ze a p.-)
==
==
@ -823,12 +822,12 @@
tag
:_ tag
:* hen %pass [%patching (scot %p who) syd ~] %f
%exec who [who syd %da now] :+ ~ %tabl
%exec who :^ ~ [who syd %da now] %tabl
^- (list (pair silk silk))
%+ turn (~(tap by hat))
|= [a=path b=lobe]
^- (pair silk silk)
:- [%done ~ %path !>(a)]
:- [%$ %path !>(a)]
(lobe-to-silk:ze a b)
==
==
@ -1006,12 +1005,12 @@
:: |= a=plop
:: ?- -.a
:: %delta
:: :- [%done ~ %blob !>([%delta p.a q.a *cage])]
:: [%vale p.r.a him q.r.a]
:: :- [%$ %blob !>([%delta p.a q.a *cage])]
:: [%vale p.r.a q.r.a]
:: ::
:: %direct
:: :- [%done ~ %blob !>([%direct p.a *cage])]
:: [%vale p.q.a him q.q.a]
:: :- [%$ %blob !>([%direct p.a *cage])]
:: [%vale p.q.a q.q.a]
:: ::
:: %indirect ~| %foreign-indirect-not-implemented !!
:: ==
@ -1023,8 +1022,8 @@
=- %_(+>.$ tag [- tag])
:* hen %pass
[%foreign-x (scot %p who) (scot %p for) syd car (scot cas) pax]
%f %exec who [for syd cas] ~
%vale p.peg for q.peg
%f %exec who ~ [for syd cas]
[%vale peg]
==
::
++ take-foreign-x
@ -1046,18 +1045,18 @@
=+ lum=(scot %da (fall lem *@da))
:* hen %pass
[%foreign-plops (scot %p who) (scot %p for) syd lum ~]
%f %exec who [for syd cas] ~ %tabl
%f %exec who ~ [for syd cas] %tabl
^- (list (pair silk silk))
%+ turn (~(tap in pop))
|= a=plop
?- -.a
%delta
:- [%done ~ %blob !>([%delta p.a q.a *page])]
[%vale p.r.a for q.r.a]
:- [%$ %blob !>([%delta p.a q.a *page])]
[%vale p.r.a q.r.a]
::
%direct
:- [%done ~ %blob !>([%direct p.a *page])]
[%vale p.q.a for q.q.a]
:- [%$ %blob !>([%direct p.a *page])]
[%vale p.q.a q.q.a]
::
%indirect ~| %foreign-indirect-not-implemented !!
==
@ -1222,12 +1221,13 @@
?: =([~ lob] lol)
=+ (need (need (read-x let.dom pax)))
?> ?=(%& -<)
[%done ~ p.-]
[%$ p.-]
=+ bol=(~(got by lat.ran) lob)
?- -.bol
%direct [%volt ~ q.bol]
%indirect [%volt ~ q.bol]
%delta [%pact $(lob q.q.bol) [%volt ~ r.bol]]
%direct [%volt q.bol]
%indirect [%volt q.bol]
%delta ~| delta/q.q.bol
[%pact $(lob q.q.bol) [%volt r.bol]]
==
::
++ page-to-lobe |=(page (shax (jam +<)))
@ -1751,10 +1751,10 @@
%fine
?: =(r.ali.dat r.bob.dat)
:: ~& [%fine-trivial ali=<ali> bob=<bob> r.ali.dat r.bob.dat]
(done:he ~)
done:he
?: (~(has in (reachable-takos r.bob.dat)) r.ali.dat)
:: ~& [%fine-mostly-trivial ali=<ali> bob=<bob>]
(done:he ~)
done:he
?. (~(has in (reachable-takos r.ali.dat)) r.bob.dat)
:: ~& [%fine-not-so-trivial ali=<ali> bob=<bob>]
(error:he %bad-fine-merge ~)
@ -1773,18 +1773,15 @@
checkout
::
%this
?: =(r.ali.dat r.bob.dat)
(done:he ~)
?: (~(has in (reachable-takos r.bob.dat)) r.ali.dat)
(done:he ~)
?: =(r.ali.dat r.bob.dat) done:he
?: (~(has in (reachable-takos r.bob.dat)) r.ali.dat) done:he
=. new.dat (make-yaki [r.ali.dat r.bob.dat ~] q.bob.dat now)
=. hut.ran (~(put by hut.ran) r.new.dat new.dat)
=. erg.dat ~
checkout
::
%that
?: =(r.ali.dat r.bob.dat)
(done:he ~)
?: =(r.ali.dat r.bob.dat) done:he
=. new.dat (make-yaki [r.ali.dat r.bob.dat ~] q.ali.dat now)
=. hut.ran (~(put by hut.ran) r.new.dat new.dat)
=. erg.dat
@ -1801,9 +1798,9 @@
::
?(%meet %mate %meld)
?: =(r.ali.dat r.bob.dat)
(done:he ~)
done:he
?: (~(has in (reachable-takos r.bob.dat)) r.ali.dat)
(done:he ~)
done:he
?: (~(has in (reachable-takos r.ali.dat)) r.bob.dat)
$(gem.dat %fine)
=+ r=(find-merge-points:he ali.dat bob.dat)
@ -1899,7 +1896,7 @@
:* hen %pass
=+ (cat 3 %diff- nam)
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali - ~]
%f %exec p.bob [p.oth q.oth cas.dat] ~ %tabl
%f %exec p.bob ~ [p.oth q.oth cas.dat] %tabl
^- (list (pair silk silk))
%+ murn (~(tap by q.bas.dat))
|= [pax=path lob=lobe]
@ -1915,7 +1912,7 @@
?: =(u.a u.-)
~
:- ~
:- [%done ~ %path !>(pax)]
:- [%$ %path !>(pax)]
[%diff (lobe-to-silk pax lob) (lobe-to-silk pax u.a)]
==
::
@ -2007,7 +2004,7 @@
=- %_(+.$ tag [- tag])
:* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %merge ~]
%f %exec p.bob [p.bob q.bob cas.dat] ~ %tabl
%f %exec p.bob ~ [p.bob q.bob cas.dat] %tabl
^- (list (pair silk silk))
%+ turn (~(tap by (~(int by can.dal.dat) can.dob.dat)))
|= [pax=path *]
@ -2017,8 +2014,8 @@
=+ ^= for
=+ (slag (dec (lent pax)) pax)
?~(- %$ i.-)
:- [%done ~ %path !>(pax)]
[%join for [%done ~ cal] [%done ~ cob]]
:- [%$ %path !>(pax)]
[%join for [%$ cal] [%$ cob]]
==
==
::
@ -2041,7 +2038,7 @@
=- %_(+ tag [- tag])
:* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %build ~]
%f %exec p.bob [p.bob q.bob cas.dat] ~ %tabl
%f %exec p.bob ~ [p.bob q.bob cas.dat] %tabl
^- (list (pair silk silk))
%+ murn (~(tap by bof.dat))
|= [pax=path cay=(unit cage)]
@ -2049,12 +2046,12 @@
?~ cay
~
:- ~
:- [%done ~ %path !>(pax)]
:- [%$ %path !>(pax)]
=+ (~(get by q.bas.dat) pax)
?~ -
~| %mate-strange-diff-no-base
!!
[%pact (lobe-to-silk pax u.-) [%done ~ u.cay]]
[%pact (lobe-to-silk pax u.-) [%$ u.cay]]
==
::
++ built
@ -2143,7 +2140,7 @@
cas
=+ ^- del=(map path ,?)
(~(run by (~(uni by old.dal.dat) old.dob.dat)) |=(~ %|))
=. gon.dat [%& (sa (turn (~(tap by con)) |=([path *] +<-)))]
=. gon.dat [%& (sa (turn (~(tap by con)) head))]
=. new.dat
(make-yaki [r.ali.dat r.bob.dat ~] hat now)
=. hut.ran (~(put by hut.ran) r.new.dat new.dat)
@ -2163,14 +2160,14 @@
=+ val=?:(?=(%init gem.dat) ali bob)
:* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %checkout ~]
%f %exec p.bob [p.val q.val cas.dat] ~ %tabl
%f %exec p.bob ~ [p.val q.val cas.dat] %tabl
^- (list (pair silk silk))
%+ murn (~(tap by q.new.dat))
|= [pax=path lob=lobe]
^- (unit (pair silk silk))
?: (~(has by bop.dat) pax)
~
`[[%done ~ %path !>(pax)] (merge-lobe-to-silk:he pax lob)]
`[[%$ %path !>(pax)] (merge-lobe-to-silk:he pax lob)]
==
::
++ checked-out
@ -2188,11 +2185,9 @@
=. hit.dom (~(put by hit.dom) let.dom r.new.dat)
=. ank.dat (checkout-ankh:ze (~(uni by bop.dat) p.can))
=. ank.dom ank.dat
?~ hez
(done:he ~)
?~ hez done:he
=+ mus=(must-ergo (turn (~(tap by erg.dat)) head))
?: =(~ mus)
(done:he ~)
?: =(~ mus) done:he
ergo
::
++ ergo
@ -2208,15 +2203,15 @@
=+ val=?:(?=(%init gem.dat) ali bob)
:* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ergo ~]
%f %exec p.bob [p.val q.val cas.dat] ~ %tabl
%f %exec p.bob ~ [p.val q.val cas.dat] %tabl
^- (list (pair silk silk))
%+ turn (~(tap in sum))
|= a=path
^- (pair silk silk)
:- [%done ~ %path !>(a)]
:- [%$ %path !>(a)]
=+ b=(~(got by erg.dat) a)
?. b
[%done ~ %null !>(~)]
[%$ %null !>(~)]
:+ %cast %mime
(lobe-to-silk:zez a (~(got by q.new.dat) a))
==
@ -2242,8 +2237,7 @@
(error:he %ergo-no-hez ~)
?: ?=(%| -.gon.dat)
+>.$
%_ +>.$
don %|
%* done he
reg
=+ mus=(must-ergo (turn (~(tap by erg.dat)) head))
%- welp :_ reg
@ -2259,9 +2253,10 @@
++ he
|%
++ done
|= con=(set path)
^+ ..he
..he(don |, gon.dat [%& con])
?< ?=(%| -.gon.dat)
..he(don |)
::
++ error
|= [err=term tan=(list tank)]
^+ ..he
@ -2294,15 +2289,14 @@
?: =([~ lob] lol)
=+ (need (need (read-x let.dom pax)))
?> ?=(%& -<)
[%done ~ p.-]
[%$ p.-]
?: =([~ lob] lal)
:+ %done ~
(need (bind q.ank:(descend-path:(zu (need alh)) pax) tail))
[%$ +:(need q.ank:(descend-path:(zu (need alh)) pax))]
=+ bol=(~(got by lat.ran) lob)
?- -.bol
%direct [%volt ~ q.bol]
%indirect [%volt ~ q.bol]
%delta [%pact $(lob q.q.bol) [%volt ~ r.bol]]
%direct [%volt q.bol]
%indirect [%volt q.bol]
%delta [%pact $(lob q.q.bol) [%volt r.bol]]
==
::
++ reduce-merge-points
@ -2555,15 +2549,27 @@
[-.woo (posh q.p.q.hic p.q.q.hic +.woo ruf)]
[mos ..^$]
::
%wart
?> ?=(%re q.q.hic)
=+ ryf=((hard riff) s.q.hic)
:_ ..^$
:~ :- hen
:^ %pass [(scot %p p.p.q.hic) (scot %p q.p.q.hic) r.q.hic]
%c
[%warp [p.p.q.hic p.p.q.hic] ryf]
==
%west
?: ?=([%question *] q.q.hic)
=+ ryf=((hard riff) r.q.hic)
:_ ..^$
:~ [hen %give %mack ~]
:- hen
:^ %pass [(scot %p p.p.q.hic) (scot %p q.p.q.hic) t.q.q.hic]
%c
[%warp [p.p.q.hic p.p.q.hic] ryf]
==
?> ?=([%answer @ @ ~] q.q.hic)
=+ syd=(slav %tas i.t.q.q.hic)
=+ inx=(slav %ud i.t.t.q.q.hic)
=+ ^= zat
=< wake
%- take-foreign-update:(do now hen p.q.hic syd ruf)
[inx ((hard (unit rand)) r.q.hic)]
=^ mos ruf
=+ zot=abet.zat
[-.zot (posh q.p.q.hic syd +.zot ruf)]
[[[hen %give %mack ~] mos] ..^$(ran.ruf ran.zat)] :: merge in new obj
::
%wegh
:_ ..^$ :_ ~
@ -2779,19 +2785,6 @@
[~ ..^$]
::
%note [[hen %give +.q.hin]~ ..^$]
%waft
?> ?=([@ @ ~] tea)
=+ syd=(slav %tas i.tea)
=+ inx=(slav %ud i.t.tea)
=+ ^= zat
=< wake
%- take-foreign-update:(do now hen p.+.q.hin syd ruf)
[inx ((hard (unit rand)) q.+.q.hin)]
=^ mos ruf
=+ zot=abet.zat
[-.zot (posh q.p.+.q.hin syd +.zot ruf)]
[mos ..^$(ran.ruf ran.zat)] :: merge in new obj
::
%wake
=+ dal=(turn (~(tap by fat.ruf) ~) |=([a=@p b=room] a))
=| mos=(list move)
@ -2809,14 +2802,14 @@
=+ him=(slav %p i.t.tea)
:_ ..^$
:~ :* hen %pass ~ %a
%want [our him] [%r %re %c t.t.tea]
%wont [our him] [%c %answer t.t.tea]
(bind p.+.q.hin rant-to-rand)
==
==
::
%went
?: =(%good q.+.q.hin) [~ ..^$]
~& [%clay-lost p.+.q.hin tea]
%woot
?~ q.q.hin [~ ..^$]
~& [%clay-lost p.q.hin q.q.hin tea]
[~ ..^$]
==
::

28
arvo/dill.hoon
View File

@ -1,4 +1,4 @@
!:
::
:: dill (4d), terminal handling
::
|= pit=vase
@ -20,11 +20,11 @@
dug=(map duct axon) :: conversations
$= hef :: other weights
$: a=(unit mass) ::
b=(unit mass) ::
c=(unit mass) ::
e=(unit mass) ::
f=(unit mass) ::
g=(unit mass) ::
t=(unit mass) ::
== ::
== ::
++ axon :: dill per duct
@ -66,7 +66,7 @@
[%deal p=sock q=cush] ::
== ::
++ note :: out request $->
$? [?(%a %c %e %f %g %t) %wegh ~] ::
$? [?(%a %b %c %e %f %g) %wegh ~] ::
$% [%a note-ames] ::
[%c note-clay] ::
[%d note-dill] ::
@ -91,16 +91,12 @@
$% [%onto p=(each suss tang)] ::
[%unto p=cuft] ::
== ::
++ sign-time ::
$% [%wake ~] ::
== ::
++ sign :: in result $<-
$? [?(%a %c %e %f %g %t) %mass p=mass] ::
$? [?(%a %b %c %e %f %g) %mass p=mass] ::
$% [%a sign-ames] ::
[%c sign-clay] ::
[%d sign-dill] ::
[%g sign-gall] ::
[%t sign-time] ::
== == ::
:::::::: :: dill tiles
--
@ -199,11 +195,11 @@
%_ .
moz
:* [hen %pass /heft/ames %a %wegh ~]
[hen %pass /heft/behn %b %wegh ~]
[hen %pass /heft/clay %c %wegh ~]
[hen %pass /heft/eyre %e %wegh ~]
[hen %pass /heft/ford %f %wegh ~]
[hen %pass /heft/gall %g %wegh ~]
[hen %pass /heft/time %t %wegh ~]
moz
==
==
@ -272,7 +268,7 @@
|= sih=sign
^+ +>
?- sih
[?(%a %c %e %f %g %t) %mass *]
[?(%a %b %c %e %f %g) %mass *]
(wegt -.sih p.sih)
::
[%a %nice *]
@ -314,10 +310,6 @@
::
[%d %blit *]
(done +.sih)
::
[%t %wake *]
:: ~& %dill-wake
+>
==
::
++ wegh
@ -328,29 +320,29 @@
==
::
++ wegt
|= [lal=?(%a %c %e %f %g %t) mas=mass]
|= [lal=?(%a %b %c %e %f %g) mas=mass]
^+ +>
=. hef.all
?- lal
%a ~?(?=(^ a.hef.all) %double-mass-a hef.all(a `mas))
%b ~?(?=(^ b.hef.all) %double-mass-b hef.all(b `mas))
%c ~?(?=(^ c.hef.all) %double-mass-c hef.all(c `mas))
%e ~?(?=(^ e.hef.all) %double-mass-e hef.all(e `mas))
%f ~?(?=(^ f.hef.all) %double-mass-f hef.all(f `mas))
%g ~?(?=(^ g.hef.all) %double-mass-g hef.all(g `mas))
%t ~?(?=(^ t.hef.all) %double-mass-t hef.all(t `mas))
==
?. ?& ?=(^ a.hef.all)
?=(^ b.hef.all)
?=(^ c.hef.all)
?=(^ e.hef.all)
?=(^ f.hef.all)
?=(^ g.hef.all)
?=(^ t.hef.all)
==
+>.$
%+ done(hef.all [~ ~ ~ ~ ~ ~])
%mass
=> [hef.all d=wegh]
[%vanes %| ~[u.a u.c d u.e u.f u.g u.t]]
[%vanes %| ~[u.a u.c d u.e u.f u.g u.b]]
--
::
++ ax :: make ++as

60
arvo/eyre.hoon
View File

@ -9,7 +9,11 @@
++ move ,[p=duct q=(mold note gift)] :: local move
++ note :: out request $->
$% $: %a :: to %ames
$% [%want p=sock q=[path *]] ::
$% [%wont p=sock q=[path *]] ::
== == ::
$: %b :: to %behn
$% [%wait p=@da] ::
[%rest p=@da] ::
== == ::
$: %d :: to %dill
$% [%flog p=[%crud p=@tas q=(list tank)]] ::
@ -19,19 +23,18 @@
[%meta vase:,[%them (unit httr)]] :: type check
== == ::
$: %f :: to %ford
$% [%exec p=@p q=beak r=(unit silk)] ::
$% [%exec p=@p q=(unit ,[beak silk])] ::
[%wasp p=@p q=@uvH] ::
== == ::
$: %g :: to %gall
$% [%deal p=sock q=cush] :: full transmission
== == ::
$: %t :: to %temp
$% [%wait p=@da] ::
[%rest p=@da] ::
== == == ::
++ sign :: in result $<-
$? $: %a :: by %ames
$% [%went p=ship q=cape] ::
$% [%woot p=ship q=coop] ::
== == ::
$: %b :: by %behn
$% [%wake ~] :: timer activate
== == ::
$: %g :: by %gall
$% [%unto p=cuft] :: within agent
@ -42,9 +45,6 @@
$: %f :: by %ford
$% [%made p=@uvH q=gage] ::
[%news ~] ::
== == ::
$: %t :: by %time
$% [%wake ~] :: timer activate
== == ::
$: @tas :: by any
$% [%crud p=@tas q=(list tank)] ::
@ -615,11 +615,12 @@
:: ford-kill :: XX discriminate
+>.$(ded (~(put in ded) hen))
::
%wart :: remote request
=+ mez=((soft gram) r.kyz)
%west :: remote request
=. mow :_(mow [hen %give %mack ~])
=+ mez=((soft gram) q.kyz)
?~ mez
~& [%strange-wart p.kyz q.kyz]
+>.$
~& e/[%strange-west p.kyz]
~|(%strange-west !!)
?- -<.u.mez
%aut abet:(logon:(ses-ya p.u.mez) q.p.kyz)
%hat (foreign-hat:(ses-ya p.u.mez) q.p.kyz q.u.mez)
@ -641,7 +642,7 @@
(ames-gram q.p.kyz hat/~ p.u.mez our-host)
==
::
%wegh !!
%wegh !! :: handled elsewhere
==
::
++ axom :: old response
@ -661,7 +662,7 @@
:: =. +> ?+(tee +> [%of ^] pop-duct:(ire-ix p.tee))
:: (emule |.(~|(gall-dumb/tee !!)))
::
%went +>.$
%woot +>.$
%thou
?+ -.tee !!
%ay (ames-gram (slav %p p.tee) got/~ (slav %uv q.tee) |2.sih)
@ -755,12 +756,15 @@
?. ?=(%mime p.cay)
=+ bek=-:(need (tome p.tee))
=+ bik=?+(r.bek bek [%ud %0] bek(r da/now))
=- (pass-note tee (ford-req bik [%flag p.sih -]))
=- `silk`[%cast %mime %done ~ cay(q.q -)]
?. ?=([%ud 0] r.bek) q.q.cay
?+ p.cay q.q.cay :: inject dependency long-poll
%urb =| urb=[[%html ~] [[%head ~] marl] [[%body ~] manx marl] ~]
.*(.(urb q.q.cay) !=((inject p.sih urb)))
=- (pass-note tee (ford-req bik [%flag [p.sih `~] -]))
=- `silk`[%cast %mime `[p.cay -]]
?. ?=([%ud 0] r.bek) q.cay
?+ p.cay q.cay :: inject dependency long-poll
%urb =< (slam !>(.) q.cay)
|= urb=manx
~| %malformed-urb
?> ?=([[%html ~] [[%head ~] *] [[%body ~] ^] ~] urb)
(inject p.sih urb)
==
~| q.q.cay
=+ ((hard ,[mit=mite rez=octs]) q.q.cay)
@ -791,14 +795,14 @@
:: [| [~ 8.445] `/localhost] :: XX testing
::
++ ames-gram
|=([him=ship gam=gram] (pass-note ~ %a %want [our him] [%e -.gam] +.gam))
|=([him=ship gam=gram] (pass-note ~ %a %wont [our him] [%e -.gam] +.gam))
::
++ back :: %ford bounce
|= [tea=whir mar=mark cay=cage]
(pass-note tea (ford-req root-beak [%cast mar %done ~ cay]))
(pass-note tea (ford-req root-beak [%cast mar `cay]))
::
++ ford-kill (pass-note ~ %f [%exec our *beak ~]) :: XX unused
++ ford-req |=([bek=beak kas=silk] [%f [%exec our bek `kas]])
++ ford-kill (pass-note ~ %f [%exec our ~]) :: XX unused
++ ford-req |=([bek=beak kas=silk] [%f [%exec our `[bek kas]]])
::
++ fail
|= [sas=@ud dep=@uvH mez=tang]
@ -1398,7 +1402,7 @@
=< abet
?~ ude done
=. hen p.u.ude
=. ..ix (pass-note of//[ire] [%t %rest era])
=. ..ix (pass-note of//[ire] [%b %rest era])
(give-even(ude ~) q.u.ude num ven)
::
++ give-even
@ -1427,7 +1431,7 @@
?: =(a p.eve)
?^ ude ~&(e/ix/wait/replaced=p.u.ude abet(u.ude [hen &]))
=. era (add ~s30 now)
(pass-note:abet(ude [~ hen &]) of//[ire] [%t %wait era])
(pass-note:abet(ude [~ hen &]) of//[ire] [%b %wait era])
?: (gth a p.eve) ~|(seq-high/cur=p.eve !!)
=+ ven=~|(seq-low/cur=p.eve (~(got by q.eve) a))
abet:(give-even & a ven)

444
arvo/ford.hoon
View File

@ -18,6 +18,7 @@
$% $: %c :: by %clay
$% [%writ p=riot] ::
== == == ::
++ trap |*(a=_,* ,_|?(*a)) :: XX in h/h
-- ::
|% :: structures
++ axle :: all %ford state
@ -69,7 +70,7 @@
== ::
++ task :: problem in progress
$: nah=duct :: cause
kas=silk :: problem
[bek=beak kas=silk] :: problem
keg=(map (pair term beam) cage) :: block results
kig=[p=@ud q=(map ,@ud ,[p=care q=beam])] :: blocks
== ::
@ -156,6 +157,14 @@
=+ gib=(wox p.n.r.arc)
?~(gib rac [[u.gib p.n.r.arc] rac])
::
++ tack :: fold path to term
|= a=[i=term t=(list term)] ^- term
(rap 3 |-([i.a ?~(t.a ~ ['-' $(a t.a)])]))
::
++ tear :: split term
=- |=(a=term (rush a (most hep sym)))
sym=(cook crip ;~(plug low (star ;~(pose low nud))))
::
++ norm :: normalize beam rev
|= [ska=sled bem=beam]
%_ bem
@ -168,10 +177,9 @@
==
::
++ za :: per event
=| $: $: $: our=ship :: computation owner
bek=beak :: desk context
hen=duct :: event floor
== ::
:: =+ dyv=0
=| $: $: our=ship :: computation owner
hen=duct :: event floor
$: now=@da :: event date
eny=@ :: unique entropy
ska=sled :: system namespace
@ -185,22 +193,24 @@
^- [(list move) baby]
[(flop mow) bay]
::
++ apex :: call
|= kus=(unit silk)
++ apax :: call
^+ ..apax
=+ nym=(~(get by dym.bay) hen)
?~ nym :: XX should never
~& [%ford-mystery hen]
..apax
=+ tas=(need (~(get by q.tad.bay) u.nym))
amok:~(camo zo [u.nym tas])
::
++ apex
|= kub=bilk
^+ +>
?~ kus
=+ nym=(~(get by dym.bay) hen)
?~ nym :: XX should never
~& [%ford-mystery hen]
+>.$
=+ tas=(need (~(get by q.tad.bay) u.nym))
amok:~(camo zo [u.nym tas])
=+ num=p.tad.bay
?< (~(has by dym.bay) hen)
=: p.tad.bay +(p.tad.bay)
dym.bay (~(put by dym.bay) hen num)
==
~(exec zo [num `task`[hen u.kus ~ 0 ~]])
~(exec zo [num `task`[hen kub ~ 0 ~]])
::
++ axon :: take
|= [num=@ud tik=@ud sih=sign]
@ -215,13 +225,13 @@
==
::
++ axun :: take rev update
|= [tea=wire dep=@uvH sup=spur sih=sign]
|= [tea=wire dep=@uvH bem=beam sih=sign]
^+ +>
?- -.+.sih
%writ
?~ p.sih +>.$
:: ~& writ/tea
=+ [dap=(~(got by deh.bay) dep) bem=`beam`[bek sup]]
=+ dap=(~(got by deh.bay) dep)
=- ?~(dop con con(deh.bay (~(put by deh.bay) dep dop)))
^- [dop=$|(~ _dap) con=_+>.$]
?- -.dap
@ -300,7 +310,7 @@
:_ mow
:- hen
:^ %pass
[(scot %p our) (scot %ud num) (scot %ud p.i.kiz) (tope bek ~)]
[(scot %p our) (scot %ud num) (scot %ud p.i.kiz) ~]
%c
[%warp [our p.q.q.i.kiz] q.q.q.i.kiz ~]
==
@ -314,7 +324,7 @@
:_ mow
:- hen
:^ %pass
[(scot %p our) (scot %ud num) (scot %ud p.kig) (tope bek ~)]
[(scot %p our) (scot %ud num) (scot %ud p.kig) ~]
%c
~& >> [%camping bem]
[%warp [our p.bem] q.bem [~ %sing ren r.bem (flop s.bem)]]
@ -368,9 +378,9 @@
==
::
++ cool :: error caption
|* [cyt=trap hoc=(bolt)]
|* [cyt=$|(term (trap tank)) hoc=(bolt)]
?. ?=(%2 -.q.hoc) hoc
[p.hoc [%2 p.q.hoc *cyt q.q.hoc]]
[p=p.hoc q=[%2 p=p.q.hoc q=[?^(cyt *cyt [>`@tas`cyt<]~) q.q.hoc]]]
::
++ cope :: bolt along
|* [hoc=(bolt) fun=(burg)]
@ -386,6 +396,21 @@
%0 [%0 p=(grom `_p.q.nuf`p.q.hoc p.q.nuf) q=q.q.nuf]
== ==
::
++ coop :: bolt alter
|* [hoc=(bolt) fun=(burg)]
?- -.q.hoc
%1 hoc
%0 hoc
%2 =+ nuf=(fun(+<- p.hoc))
:- p=p.nuf
^= q
?- -.q.nuf
%1 q.nuf
%0 [%0 p=(grom `_p.q.nuf`p.q.hoc p.q.nuf) q=q.q.nuf]
%2 =. q.q.nuf (welp q.q.nuf q.q.hoc)
[%2 p=(grom `_p.q.nuf`p.q.hoc p.q.nuf) q=q.q.nuf]
== ==
::
++ coup :: toon to bolt
|= cof=cafe
|* [ton=toon fun=$+(* *)]
@ -440,15 +465,17 @@
^- (bolt gage)
?. ?=(%tabl -.gag)
(cope (furl cof gag) fun)
%+ cope
|- ^- (bolt (list (pair gage gage)))
?~ p.gag (fine cof ~)
%+ cope (fret ^$(gag q.i.p.gag, cof cof))
|= [cof=cafe val=gage]
%+ cope ^$(p.gag t.p.gag, cof cof)
|= [cof=cafe rex=(list (pair gage gage))]
(fine cof [[p.i.p.gag val] rex])
(flux |=(rex=(list (pair gage gage)) [%tabl rex]))
%- cope :_ (flux |=(rex=(list (pair gage gage)) [%tabl rex]))
|- ^- (bolt (list (pair gage gage)))
?~ p.gag (fine cof ~)
%. [cof p.gag]
;~ cope
;~ coax
|=([cof=cafe [^ q=gage] t=gagl] (fret ^^$(cof cof, gag q)))
|=([cof=cafe ^ t=gagl] ^$(cof cof, p.gag t))
==
(flux |=([v=gage t=gagl] [[p.i.p.gag v] t]))
==
::
++ dash :: process cache
|= cof=cafe
@ -464,26 +491,26 @@
|=([cof=cafe p=silk q=silk] (cope (make cof p) furl))
|=([cof=cafe p=silk q=silk] (cope (make cof q) furl))
==
|= [cof=cafe cay=cage coy=cage]
|= [cof=cafe cay=cage coy=cage] ^- (bolt gage)
?. =(p.cay p.coy)
%+ flaw cof :_ ~
leaf/"diff on data of different marks: {(trip p.cay)} {(trip p.coy)}"
?: =(q.q.cay q.q.coy)
(fine cof %& %null [%atom %n] ~)
::
%+ cope (fang cof p.cay)
|= [cof=cafe pro=vase]
?. (slab %grad p.pro)
(flaw cof leaf/"no ++grad" ~)
=+ gar=(slap pro [%cnzy %grad])
?. (slab %form p.gar)
?. (slab %sted p.gar)
(flaw cof leaf/"no ++form:grad nor ++sted:grad" ~)
=+ for=((soft ,@tas) q:(slap gar [%cnzy %sted]))
?~ for
(flaw cof leaf/"bad ++sted:grad" ~)
?@ q.gar
=+ for=((sand %tas) q.gar)
?~ for (flaw cof leaf/"bad mark ++grad" ~)
%^ make cof %diff
:- [%cast u.for [%done ~ cay]]
[%cast u.for [%done ~ coy]]
:- [%cast u.for `cay]
[%cast u.for `coy]
?. (slab %form p.gar)
(flaw cof leaf/"no ++form:grad" ~)
?. (slab %diff p.gar)
(flaw cof leaf/"no ++diff:grad" ~)
%+ cope (keel cof pro [[%& 6]~ q.cay]~)
@ -544,6 +571,7 @@
%+ (clef %hood) (fine cof bem(r [%ud 0]) cay)
^- (burg (pair beam cage) hood)
|= [cof=cafe bum=beam cay=cage]
~| fade/(tope bum)
:: ~& fade/clef-miss/bem
=+ rul=(fair bum)
?. ?=(@ q.q.cay)
@ -553,11 +581,27 @@
(flaw cof [%leaf "syntax error: {<p.p.vex>} {<q.p.vex>}"] ~)
(fine cof p.u.q.vex)
::
++ fame
|= [cof=cafe bem=beam] :: beam with - as /
^- (bolt beam)
%- cope :_ (flux |=(a=(unit beam) (fall a bem)))
?~ s.bem (flue cof)
=+ opt=`(list term)`(fall (tear i.s.bem) ~)
?~ opt (flue cof)
|- ^- (bolt (unit beam))
=. i.s.bem (tack opt)
%+ cope (lima cof %hoon bem ~)
|= [cof=cafe vax=(unit vase)] ^- (bolt (unit beam))
?^ vax (fine cof `bem)
?~ t.opt (flue cof)
%+ cope ^$(opt t.opt, t.s.bem :_(t.s.bem i.opt), cof cof)
|= [cof=cafe bem=(unit beam)] ^- (bolt (unit beam))
?^ bem (fine cof bem)
^$(opt :_(t.t.opt (tack i.opt i.t.opt ~)), cof cof)
::
++ fang :: protocol door
|= [cof=cafe for=mark]
^- (bolt vase)
%+ cope (make cof [%core (norm ska bek /[for]/mar)])
;~(cope furl feel)
|= [cof=cafe for=mark] ^- (bolt vase)
(lear cof (norm ska bek /[for]/mar))
::
++ fair :: hood parsing rule
|= bem=beam
@ -719,19 +763,19 @@
|=([cof=cafe p=silk q=silk] (cope (make cof p) furl))
|=([cof=cafe p=silk q=silk] (cope (make cof q) furl))
==
|= [cof=cafe cay=cage coy=cage]
|= [cof=cafe cay=cage coy=cage] ^- (bolt gage)
::
%+ cope (fang cof for)
|= [cof=cafe pro=vase]
?. (slab %grad p.pro)
(flaw cof leaf/"no ++grad" ~)
=+ gar=(slap pro [%cnzy %grad])
?@ q.gar
=+ too=((sand %tas) q.gar)
?~ too (flaw cof leaf/"bad mark ++grad" ~)
(make cof %join u.too `cay `coy)
?. (slab %form p.gar)
?. (slab %sted p.gar)
(flaw cof leaf/"no ++form:grad nor ++sted:grad" ~)
=+ too=((soft ,@tas) q:(slap gar [%cnzy %sted]))
?~ too
(flaw cof leaf/"bad ++sted:grad" ~)
(make cof %join u.too [%done ~ cay] [%done ~ coy])
(flaw cof leaf/"no ++form:grad" ~)
=+ fom=((soft ,@tas) q:(slap gar [%cnzy %form]))
?~ fom
(flaw cof leaf/"bad ++form:grad" ~)
@ -762,20 +806,20 @@
|=([cof=cafe p=silk q=silk] (cope (make cof p) furl))
|=([cof=cafe p=silk q=silk] (cope (make cof q) furl))
==
|= [cof=cafe cay=cage coy=cage]
|= [cof=cafe cay=cage coy=cage] ^- (bolt gage)
::
%+ cope (fang cof for)
|= [cof=cafe pro=vase]
?. (slab %grad p.pro)
(flaw cof leaf/"no ++grad" ~)
=+ gar=(slap pro [%cnzy %grad])
?. (slab %form p.gar)
?. (slab %sted p.gar)
(flaw cof leaf/"no ++form:grad nor ++sted:grad" ~)
=+ too=((soft ,@tas) q:(slap gar [%cnzy %sted]))
?~ too
(flaw cof leaf/"bad ++sted:grad" ~)
?@ q.gar
=+ too=((sand %tas) q.gar)
?~ too (flaw cof leaf/"bad mark ++grad" ~)
%+ make cof
[%mash u.too [p.mas q.mas [%done ~ cay]] [p.mos q.mos [%done ~ coy]]]
[%mash u.too [p.mas q.mas `cay] [p.mos q.mos `coy]]
?. (slab %form p.gar)
(flaw cof leaf/"no ++form:grad" ~)
=+ fom=((soft ,@tas) q:(slap gar [%cnzy %form]))
?~ fom
(flaw cof leaf/"bad ++form:grad" ~)
@ -790,12 +834,9 @@
%+ cope
%^ maul cof
(slap (slap pro [%cnzy %grad]) [%cnzy %mash])
;: slop
(slop [[%atom %p] p.mas] [[%atom %tas] q.mas])
(slop [[%atom %p] p.mos] [[%atom %tas] q.mos])
q.cay
q.coy
==
%+ slop
:(slop [[%atom %p] p.mas] [[%atom %tas] q.mas] q.cay)
:(slop [[%atom %p] p.mos] [[%atom %tas] q.mos] q.coy)
(flux |=(dif=vase [%& u.fom dif]))
==
::
@ -820,8 +861,11 @@
++ keel :: apply mutations
|= [cof=cafe suh=vase yom=(list (pair wing vase))]
^- (bolt vase)
%+ cool => |=([a=wing b=type *] [a b])
|.(leaf/"ford: keel {<p.suh>} {<(turn yom +)>}")
%+ cool =< |.(leaf/"ford: keel {<(murn yom +)>}")
|= [a=wing b=type *]
=+ c=p:(slap suh cnzz/a)
?: (~(nest ut c) | b) ~
(some [a c b])
%^ maim cof
%+ slop suh
|- ^- vase
@ -844,7 +888,11 @@
%+ (flux some) cof
|= [cof=cafe arg=heel] ^- (bolt vase)
%+ cool |.(leaf/"ford: load {<for>} {<(tope bem)>}")
(cope (liar cof bem) (lake for))
%+ cope (liar cof bem)
|= [cof=cafe cay=cage]
?. =(for p.cay)
(flaw cof leaf/"unexpected mark {<p.cay>}" ~)
((lake for) cof q.cay)
?. (~(has by r.arc) %hook)
(flue cof)
%+ cope (lend cof bem(s [%hook s.bem]))
@ -894,7 +942,7 @@
(fine cof bem(r [%ud ((hard ,@) +.+:(need u.von))]))
::
++ lave :: validate
|= [cof=cafe for=mark his=ship som=*]
|= [cof=cafe for=mark som=*]
^- (bolt vase)
((lake for) cof [%noun som])
::
@ -911,15 +959,11 @@
|= [cof=cafe arc=arch]
(fine cof (lark wox arc))
::
++ lear :: load vase
++ lear :: load core
|= [cof=cafe bem=beam] ^- (bolt vase)
%+ cope (fame cof bem)
|= [cof=cafe bem=beam]
^- (bolt gage)
=+ von=(save ~ %cx bem)
?~ von
[p=*cafe q=[%1 [[%x bem ~] ~ ~]]]
?~ u.von
(flaw cof leaf/"file unavailable" (smyt (tope bem)) ~)
(fine cof %& u.u.von)
(cope (fade cof %hoon bem) abut:(meow bem ~))
::
++ lend :: load arch
|= [cof=cafe bem=beam]
@ -929,15 +973,15 @@
%+ flag (norm ska bem)
(fine cof ?>(?=([~ %arch ^] u.von) ((hard arch) q.q.u.u.von)))
::
++ liar :: load vase
++ liar :: load cage
|= [cof=cafe bem=beam]
^- (bolt vase)
^- (bolt cage)
=+ von=(save ~ %cx bem)
?~ von
[p=*cafe q=[%1 [[%x bem ~] ~ ~]]]
?~ u.von
(flaw cof leaf/"file not found" (smyt (tope bem)) ~)
(fine cof q.u.u.von)
(fine cof u.u.von)
::
++ lily :: translation targets
|= [cof=cafe for=mark] ^- (bolt (set ,@tas))
@ -950,24 +994,14 @@
%+ (clef %lilt) (fine cof bek)
^- (burg beak (jug mark mark))
|= [cof=cafe bek=beak]
=. ^bek bek
%+ cope (lend cof [bek /mar])
|= [cof=cafe arc=arch]
:: =- =+((cope - |=([cafe lil=(jug mark mark)] ~&(lil=lil (flue cof)))) +<)
=+ all=(~(tap by r.arc))
|- ^- (bolt (jug mark mark))
?~ all (flue cof)
%+ cope $(cof cof, all t.all)
|= [cof=cafe lil=(jug mark mark)]
=* for p.i.all
=+ raf=(fang cof for)
?: ?=(%2 -.q.raf)
=. q.q.raf :_(q.q.raf leaf/"! {<`mark`for>} build failed, ignoring.")
((slog 0 (flop q.q.raf)) (fine cof lil))
%+ cope `(bolt vase)`raf
|= [cof=cafe vax=vase]
%+ fine cof
%- ~(gas ju lil)
%+ cope (lyle(bek bek) cof)
%- flux
|= mav=(map mark vase)
=+ all=(~(tap by mav))
|- ^- (jug mark mark)
?~ all ~
%- ~(gas ju $(all t.all))
=+ `[for=mark vax=vase]`i.all
~| weg=(jam 3 p.vax)
%+ weld
^- (list ,[mark mark])
@ -979,27 +1013,70 @@
=+ gow=(slap vax [%cnzy %grow])
(turn (sloe p.gow) |=(too=mark [for too]))
::
++ lyle :: all mark doors
|= cof=cafe ^- (bolt (map mark vase))
=| [sup=path res=(map mark vase)]
|^ `(bolt (map mark vase))`wide
++ here [bek (welp sup /mar)]
++ wide
%+ cope (lend cof here)
|= [cof=cafe arc=arch]
=+ all=(skim (turn (~(tap by r.arc)) head) (sane %tas))
=. all (sort all gth) :: short-deepest
|- ^- (bolt (map mark vase))
?~ all (fine cof res)
%+ cope $(all t.all)
|= [cof=cafe res=(map mark vase)]
=. ^res res
=- (cope - (tall i.all))
?. (~(has by r.arc) %hoon) (flue cof)
node(cof cof)
::
++ tall
|= for=term
|= [cof=cafe new=(unit ,[mark vase])]
wide(cof cof, sup [for sup], res (~(gas by res) (drop new)))
::
++ node
^- (bolt (unit ,[mark vase]))
=+ pax=(flop sup)
?~ pax (flue cof)
=+ for=(tack pax)
?: (~(has by res) for) (flue cof)
=+ raf=(lear cof here)
?. ?=(%2 -.q.raf)
(cope raf (flux |=(vax=vase (some [for vax]))))
=- ((slog 0 (flop `tang`-)) (flue cof))
?^ t.pax ~ :: error on top-level marks
:_(q.q.raf leaf/"! {<`mark`for>} build failed, ignoring.")
--
::
++ lima :: load at depth
|= [cof=cafe for=mark bem=beam arg=heel]
%+ (clef %bake) [p=cof q=[%0 p=[bem `~] q=[for bem arg]]]
|= [cof=cafe for=mark bem=beam arg=heel]
^- (bolt (unit vase))
=+ marv=(map mark (burg heel vase))
%+ cope
%+ cope (lend cof bem)
|= [cof=cafe arc=arch] ^- (bolt (map mark (burg heel vase)))
|= [cof=cafe arc=arch]
|- ^- (bolt marv)
?~ r.arc (flue cof)
%+ cope $(r.arc l.r.arc)
|= [cof=cafe lam=(map mark (burg heel vase))]
%+ cope ^$(r.arc r.r.arc, cof cof)
|= [cof=cafe ram=(map mark (burg heel vase))]
=. for p.n.r.arc
%+ cope
?. ((sane %tas) for) (flue cof)
(lace cof for bem(s [for s.bem]))
|= [cof=cafe nod=(unit (burg heel vase))]
%+ fine cof
?^(nod [[for u.nod] lam ram] (~(uni by lam) ram))
|= [cof=cafe mal=(map mark (burg heel vase))]
%. [cof r.arc]
;~ cope
;~ coax
|=([cof=cafe _r.arc] ^$(cof cof, r.arc l))
|=([cof=cafe _r.arc] ^$(cof cof, r.arc r))
|= [cof=cafe [for=@tas ~] ^]
?. ((sane %tas) for) (flue cof)
%+ cope (lace cof for bem(s [for s.bem]))
(flux (lift |*(* [for +<])))
==
%- flux
|= [lam=marv ram=marv nod=(unit ,[mark (burg heel vase)])]
?^(nod [u.nod lam ram] (~(uni by lam) ram))
==
|= [cof=cafe mal=marv]
=+ lit=(~(get by mal) for)
?^ lit
(cope (u.lit cof arg) (flux some))
@ -1010,6 +1087,7 @@
%+ cope ((~(got by mal) i.wuy) cof arg)
|= [cof=cafe hoc=vase]
(cope (lope cof i.wuy t.wuy hoc) (flux some))
::
++ lime :: load beam
|= [cof=cafe for=mark bem=beam arg=heel]
=+ [mob=bem mer=(flop arg)]
@ -1098,6 +1176,16 @@
::
++ make :: reduce silk
|= [cof=cafe kas=silk]
:: =+ ^= pre
:: ?+ -.kas -.kas
:: ^ %cell
:: %boil [-.kas p.kas (tope q.kas)]
:: %bake [-.kas p.kas (tope q.kas)]
:: %core [-.kas (tope p.kas)]
:: ==
:: ~& [dyv `term`(cat 3 %make (fil 3 dyv ' ')) pre]
:: =- ~& [dyv `term`(cat 3 %made (fil 3 dyv ' ')) pre] -
:: =. dyv +(dyv)
^- (bolt gage)
?- -.kas
^
@ -1105,13 +1193,14 @@
;~ cope
;~ coax
|=([cof=cafe p=silk q=silk] (cope ^$(cof cof, kas p.kas) furl))
|=([cof=cafe p=silk q=silk] (cope ^$(cof cof, kas q.kas) furl))
|=([cof=cafe p=silk q=silk] (cope ^$(cof cof, kas q.kas) furl))
== :: XX merge %tabl
::
|= [cof=cafe bor=cage heg=cage] ^- (bolt gage)
(faun cof (slop q.bor q.heg))
==
::
%$ (fine cof %& p.kas)
%bake
:: ~& > [p.kas (tope q.kas)]
:: %+ cool |.(leaf/"ford: bake {<p.kas>} {<(tope q.kas)>}")
@ -1171,32 +1260,33 @@
::
%core
%+ cool |.(leaf/"ford: core {<(tope p.kas)>}")
%+ cope (cope (fade cof %hoon p.kas) abut:(meow p.kas ~))
(flux |=(cor=vase [%& %core cor]))
(cope (lear cof p.kas) (flux |=(a=vase [%& %core a])))
::
%diff
%+ cool |.(leaf/"ford: diff {<`@p`(mug p.kas)>} {<`@p`(mug q.kas)>}")
(diff cof p.kas q.kas)
::
%done [cof %0 p.kas %& q.kas]
%dude (cool |.(p.kas) $(kas q.kas))
%dune
?~ q.kas [cof [%2 p.kas [%leaf "no data"]~]]
$(kas [%done p.kas u.q.kas])
::
%dude (cool p.kas $(kas q.kas))
%file
%+ cool |.(leaf/"ford: file {<p.kas>}")
(lear cof p.kas)
%+ cope (liar cof p.kas)
(flux |=(cay=cage [%& cay]))
::
%flag
?~ p.kas $(kas q.kas)
=+ dap=(~(get by deh.bay) p.kas)
?~ dap ~&(flag-missed/p.kas $(kas q.kas))
=+ dep=?-(-.u.dap %init p.u.dap, %sent q.u.dap, %done [[bek ~] ~ ~])
=+ rez=$(kas q.kas) :: XX revisit ^ during dependency review
=+ rez=$(kas q.kas)
?: ?=(%1 -.q.rez) rez
rez(p.q (~(uni in p.q.rez) `(set beam)`dep))
::
=- rez(p.q -)
|- ^- (set beam)
?~ p.kas p.q.rez
=. p.q.rez $(p.kas l.p.kas)
=. p.q.rez $(p.kas r.p.kas)
?^ n.p.kas
(~(put in p.q.rez) n.p.kas)
=+ dap=(~(get by deh.bay) n.p.kas)
?~ dap ~&(flag-missed/n.p.kas p.q.rez)
%- ~(uni in p.q.rez) ^- (set beam)
?-(-.u.dap %init p.u.dap, %sent q.u.dap, %done [[bek ~] ~ ~])
:: XX revisit ^ during dependency review
%join
%+ cool
|.
@ -1226,30 +1316,31 @@
(faun cof vax)
::
%tabl
%+ cope
|- ^- (bolt (list (pair gage gage)))
?~ p.kas (fine cof ~)
%+ cope (fret (make cof p.i.p.kas))
|= [cof=cafe key=gage]
%+ cope (fret (make cof q.i.p.kas))
|= [cof=cafe val=gage]
%+ cope ^^$(p.kas t.p.kas, cof cof)
|= [cof=cafe rex=(list (pair gage gage))]
(fine cof [[key val] rex])
(flux |=(rex=(list (pair gage gage)) [%tabl rex]))
%- cope :_ (flux |=(rex=(list (pair gage gage)) [%tabl rex]))
|- ^- (bolt (list (pair gage gage)))
?~ p.kas (fine cof ~)
%. [cof p.kas]
;~ cope
;~ coax
|=([cof=cafe _p.kas] (fret ^^$(cof cof, kas p.i)))
|=([cof=cafe _p.kas] (fret ^^$(cof cof, kas q.i)))
|=([cof=cafe _p.kas] ^$(cof cof, p.kas t))
==
(flux |=([k=gage v=gage t=(list ,[gage gage])] [[k v] t]))
==
::
%vale
%+ cool |.(leaf/"ford: vale {<p.kas>} {<q.kas>} {<`@p`(mug r.kas)>}")
%+ cope (lave cof p.kas q.kas r.kas)
%+ cool |.(leaf/"ford: vale {<p.kas>} {<`@p`(mug q.kas)>}")
%+ cope (lave cof p.kas q.kas)
(flux |=(vax=vase `gage`[%& p.kas vax]))
::
%volt
%+ cool |.(leaf/"ford: volt {<p.q.kas>}")
%+ cope $(kas [%bunt p.q.kas])
%+ cool |.(leaf/"ford: volt {<p.p.kas>}")
%+ cope $(kas [%bunt p.p.kas])
%- tabl-run
|= [cof=cafe cay=cage]
^- (bolt gage)
[cof %0 p.kas %& p.q.kas p.q.cay q.q.kas]
(fine cof [%& p.p.kas p.q.cay q.p.kas])
==
::
++ malt :: cached slit
@ -1257,6 +1348,8 @@
^- (bolt type)
%+ (clef %slit) (fine cof gat sam)
|= [cof=cafe gat=type sam=type]
%+ cool |.(>sam<)
%+ cool |.(>(~(peek ut gat) %free 6)<)
=+ top=(mule |.((slit gat sam)))
?- -.top
| (flaw cof p.top)
@ -1454,6 +1547,7 @@
%see
=. r.p.hon ?:(?=([%ud 0] r.p.hon) r.how r.p.hon)
$(hon q.hon, how p.hon)
::
%saw
%+ cope $(hon q.hon)
|= [cof=cafe sam=vase]
@ -1475,7 +1569,7 @@
::
++ head :: consume structures
|= [cof=cafe bir=(list hoot)]
|- ^- (bolt ,_..head)
^- (bolt ,_..head)
?~ bir
(fine cof ..head)
=+ byf=(~(get by rop) p.q.i.bir)
@ -1483,9 +1577,11 @@
?. =(`hoof`q.i.bir `hoof`p.u.byf)
(flaw cof [%leaf "structure mismatch: {<~[p.u.byf q.i.bir]>}"]~)
$(bir t.bir)
%+ cope (fade cof %hoon (hone %sur q.i.bir))
%+ cope (fame cof (hone %sur q.i.bir))
|= [cof=cafe bem=beam]
%+ cope (fade cof %hoon bem)
|= [cof=cafe hyd=hood]
%+ cope (apex(boy ~) cof hyd)
%+ cope (apex(how bem, boy ~) cof hyd)
|= [cof=cafe sel=_..head]
=. ..head
%= sel
@ -1493,11 +1589,12 @@
boy
(welp boy [[[%cnzy p.q.i.bir] [%$ 1]] ~])
zeg zeg
how how
rop %+ ~(put by (~(uni by rop) rop.sel))
p.q.i.bir
[q.i.bir [%tssg (flop boy.sel)]]
==
^^$(cof cof, bir t.bir)
^^^$(cof cof, bir t.bir)
::
++ hone :: plant hoof
|= [way=@tas huf=hoof]
@ -1518,17 +1615,20 @@
?. =(`hoof`i.bir `hoof`p.u.byf)
(flaw cof [%leaf "library mismatch: {<~[p.u.byf i.bir]>}"]~)
$(bir t.bir)
%+ cope (fade cof %hoon (hone %lib i.bir))
%+ cope (fame cof (hone %lib i.bir))
|= [cof=cafe bem=beam]
%+ cope (fade cof %hoon bem)
|= [cof=cafe hyd=hood]
%+ cope (apex(zeg goz, boy ~) cof hyd)
%+ cope (apex(zeg goz, how bem, boy ~) cof hyd)
|= [cof=cafe sel=_..neck]
=. ..neck
%= sel
zeg zeg
how how
lot [p.i.bir lot]
bil (~(put by bil) p.i.bir [i.bir [%tssg (flop boy.sel)]])
==
^^$(cof cof, bir t.bir)
^^^$(cof cof, bir t.bir)
::
++ wilt :: process body entry
|= [cof=cafe hop=hoop]
@ -1588,21 +1688,21 @@
=+ dif=((soft (urge cord)) q.q.coy)
?~ dif
=- (flaw cof leaf/"{<p.cay>} data with bad diff" -)
[>type=p.q.coy< >shouldbe=-:!>(*(urge cord))< ~]
[>type=p.q.coy< >want=p:!>(*(urge cord))< ~]
=+ pac=(role (lurk (lore (cat 3 u.txt '\0a')) u.dif))
(fine cof %& p.cay [%atom %t] (end 3 (dec (met 3 pac)) pac))
::
%+ cope (fang cof p.cay)
|= [cof=cafe pro=vase]
?. (slab %grad p.pro)
(flaw cof leaf/"no ++grad" ~)
=+ gar=(slap pro [%cnzy %grad])
?@ q.gar
=+ for=((sand %tas) q.gar)
?~ for (flaw cof leaf/"bad mark ++grad" ~)
(make cof %cast p.cay %pact [%cast u.for `cay] `coy)
?. (slab %form p.gar)
?. (slab %sted p.gar)
(flaw cof leaf/"no ++form:grad nor ++sted:grad" ~)
=+ for=((soft ,@tas) q:(slap gar [%cnzy %sted]))
?~ for
(flaw cof leaf/"bad ++sted:grad" ~)
(make cof %cast p.cay %pact [%cast u.for [%done ~ cay]] [%done ~ coy])
(flaw cof leaf/"no ++form:grad" ~)
=+ for=((soft ,@tas) q:(slap gar [%cnzy %form]))
?~ for
(flaw cof leaf/"bad ++form:grad" ~)
@ -1662,19 +1762,20 @@
:- %|
:~ lex/`lex
==
=+ ^= our ^- @p
?- -.q.hic
%exec p.q.hic
%wasp p.q.hic
==
=+ our=p.q.hic
=+ ^= bay ^- baby
=+ buy=(~(get by pol.lex) our)
?~(buy *baby u.buy)
=^ mos bay
?: ?=(%wasp -.q.hic)
abet:(~(awap za [[our *beak hen] [now eny ski] ~] bay) q.q.hic)
=+ bek=-:(norm ski q.q.hic ~)
abet:(~(apex za [[our bek hen] [now eny ski] ~] bay) r.q.hic)
?- -.q.hic
%wasp
abet:(~(awap za [our hen [now eny ski] ~] bay) q.q.hic)
%exec
?~ q.q.hic
abet:~(apax za [our hen [now eny ski] ~] bay)
=. p.u.q.q.hic -:(norm ski p.u.q.q.hic ~)
abet:(~(apex za [our hen [now eny ski] ~] bay) u.q.q.hic)
==
[mos ..^$(pol (~(put by pol) our bay))]
::
++ doze
@ -1684,7 +1785,7 @@
::
++ load :: highly forgiving
|= old=axle
=. pol.old (~(run by pol.old) |=(baby +<(jav ~)))
::=. pol.old (~(run by pol.old) |=(baby +<(jav ~)))
..^$(+>- old)
::=. old
:: ?. ?=([%0 *] old) old :: remove at 1
@ -1719,13 +1820,12 @@
=^ mos bay
=+ dep=(slaw %uv i.t.tea)
?^ dep
=+ [bek sup]=(need (tome t.t.tea))
abet:(~(axun za [[our bek hen] [now eny ski] ~] bay) tea u.dep sup q.hin)
?> ?=([@ @ @ @ ~] t.t.tea)
=+ bem=(need (tome t.t.tea))
abet:(~(axun za [our hen [now eny ski] ~] bay) tea u.dep bem q.hin)
?> ?=([@ ~] t.t.tea)
=+ :* num=(slav %ud i.t.tea)
tik=(slav %ud i.t.t.tea)
bek=-:(need (tome t.t.t.tea))
==
abet:(~(axon za [[our bek hen] [now eny ski] ~] bay) num tik q.hin)
abet:(~(axon za [our hen [now eny ski] ~] bay) num tik q.hin)
[mos ..^$(pol (~(put by pol) our bay))]
--

124
arvo/gall.hoon
View File

@ -29,8 +29,14 @@
-- ::
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: %gall state
::::::::::::::::::::::::::::::::::::::::::::::::::::::
++ axle-n ?(axle axle-0) :: upgrade path
++ axle-0 ,[%0 pol=(map ship mast-0)] ::
++ mast-0 ::
(cork mast |=(mast +<(bum (~(run by bum) seat-0)))) ::
++ seat-0 ::
(cork seat |=(seat +<(|7 zam=(scar |7.+<)))) ::
++ axle :: all state
$: %0 :: state version
$: %1 :: state version
pol=(map ship mast) :: apps by ship
== ::
++ gest :: subscriber data
@ -67,6 +73,7 @@
ged=gest :: subscribers
hav=vase :: running state
byk=beak :: update control
pyl=(map bone mark) :: req'd translations
zam=scar :: opaque ducts
== ::
++ sofa :: queue for blocked
@ -200,7 +207,7 @@
:: ~& [%mo-boot dap how byk]
%+ mo-pass [%sys how dap (scot %p p.byk) q.byk (scot r.byk) ~]
^- note-arvo
[%f %exec our byk `[%core [byk [dap %ape ~]]]]
[%f %exec our `[byk %core [byk [dap %ape ~]]]]
::
++ mo-away :: foreign request
|= [him=ship caz=cush] ::
@ -227,7 +234,7 @@
==
%+ mo-pass
[%sys %way -.q.caz ~]
`note-arvo`[%a %wont [our him] [%q %ge p.caz ~] [num roc]]
`note-arvo`[%a %wont [our him] [%g %ge p.caz ~] [num roc]]
::
++ mo-baal :: error convert a
|= art=(unit ares)
@ -313,24 +320,16 @@
(mo-boon i.t.pax (mo-chew t.t.pax) +>.sih)
::
%pel :: translated peer
?> ?=([@ @ ~] t.pax)
=+ :* mar=i.t.pax
dap=i.t.t.pax
==
?: ?=([%f %made *] sih)
?- -.q.+.sih
%tabl ~|(%made-tabl !!)
%& (mo-give %unto %diff p.q.+>.sih)
%| =. p.q.+>.sih (turn p.q.+>.sih |=(a=tank rose/[~ "! " ~]^[a]~))
~> %slog.`%*(. >[%wh %y]< +> [>%mo-cyst-fail< (flop p.q.+>.sih)])
(mo-give %unto %quit ~) :: XX better errors pls
==
?> ?=([%g %unto *] sih)
?. ?=(%diff -.+>.sih)
(mo-give %unto +>.sih)
%+ mo-pass
[%sys pax]
[%f %exec our (mo-beak dap) ~ %cast mar %done ~ `cage`+>+.sih]
?> ?=([@ ~] t.pax)
=+ mar=i.t.pax
?> ?=([%f %made *] sih)
?- -.q.+.sih
%tabl ~|(%made-tabl !!)
%& (mo-give %unto %diff p.q.+>.sih)
%| =. p.q.+>.sih (turn p.q.+>.sih |=(a=tank rose/[~ "! " ~]^[a]~))
~> %slog.`%*(. >[%wh %y]< +> [>%mo-cyst-fail< (flop p.q.+>.sih)])
(mo-give %unto %quit ~) :: XX better errors pls
==
::
%red :: diff ack
?> ?=([@ @ @ ~] t.pax)
@ -344,7 +343,7 @@
(mo-pass [%sys pax] %g %deal [him our] dap %pump ~)
~& [%diff-bad-ack q.+>.sih] :: should not happen
=. +>.$ (mo-pass [%sys pax] %g %deal [him our] dap %pull ~)
(mo-pass [%sys pax] %a %wont [our him] [%q %gh dap ~] [num %x ~])
(mo-pass [%sys pax] %a %wont [our him] [%g %gh dap ~] [num %x ~])
::
%rep :: reverse request
?> ?=([@ @ @ ~] t.pax)
@ -378,10 +377,10 @@
?- -.cuf
%coup (mo-give %mack p.cuf)
%diff %+ mo-pass [%sys %red t.pax]
[%a %wont [our him] [%q %gh dap ~] [num %d p.p.cuf q.q.p.cuf]]
[%a %wont [our him] [%g %gh dap ~] [num %d p.p.cuf q.q.p.cuf]]
%doff !!
%quit %+ mo-pass [%sys pax]
[%a %wont [our him] [%q %gh dap ~] [num %x ~]]
[%a %wont [our him] [%g %gh dap ~] [num %x ~]]
%reap (mo-give %mack p.cuf)
==
::
@ -437,7 +436,7 @@
%& ap-abet:(ap-pout:pap t.t.t.pax %diff +.q.+>.q.hin)
%| =+ why=p.q.+>.q.hin
=. why (turn why |=(a=tank rose/[~ "! " ~]^[a]~))
~> %slog.`%*(. >[%wh %y]< +> [>%mo-cook-fail< (flop why)])
~> %slog.`rose/[" " "[" "]"]^[>%mo-cook-fail< (flop why)]
~& [him=q.q.pry our=our pax=pax]
::
:: here we should crash because the right thing
@ -460,7 +459,7 @@
?: ?=(%doff +>-.q.hin)
%+ mo-pass
[%use pax]
[%f %exec our byk.pap ~ %vale p.+>+.q.hin our q.+>+.q.hin]
[%f %exec our ~ byk.pap %vale +.p.q.hin]
ap-abet:(ap-pout:pap t.t.t.pax +>.q.hin)
==
::
@ -488,15 +487,11 @@
?: ?=(%puff -.cub)
%+ mo-pass
[%sys %val (scot %p q.q.pry) dap ~]
[%f %exec our (mo-beak dap) ~ %vale p.cub our q.cub]
[%f %exec our ~ (mo-beak dap) %vale +.cub]
?: ?=(%punk -.cub)
%+ mo-pass
[%sys %val (scot %p q.q.pry) dap ~]
[%f %exec our (mo-beak dap) ~ %cast p.cub %done ~ q.cub]
?: ?=(%peel -.cub)
%+ mo-pass
[%sys %pel p.cub dap ~]
[%g %deal [q.q.pry our] dap %peer q.cub]
[%f %exec our ~ (mo-beak dap) %cast p.cub %$ q.cub]
ap-abet:(ap-club:(ap-abed:ap dap pry) cub)
::
++ mo-club :: local action
@ -515,7 +510,7 @@
[%sys %req (scot %p him) dap (scot %ud num) ~]
^- note-arvo
?- -.rok
:: %m [%f %exec our (mo-beak dap) ~ %vale p.rok our q.rok]
:: %m [%f %exec our ~ (mo-beak dap) %vale p.rok q.rok]
%m [%g %deal [him our] dap %puff p.rok q.rok]
%s [%g %deal [him our] dap %peer p.rok]
%u [%g %deal [him our] dap %pull ~]
@ -596,7 +591,17 @@
:- (~(got by r.zam) p.cov)
?- -.q.cov
?(%slip %sick) !!
%give ?<(=(0 p.cov) [%give %unto p.q.cov])
%give
?< =(0 p.cov)
?. ?=(%diff -.p.q.cov)
[%give %unto p.q.cov]
=+ cay=`cage`p.p.q.cov
=+ mar=(fall (~(get by pyl) p.cov) p.cay)
?: =(mar p.cay) [%give %unto p.q.cov]
:+ %pass
[%sys %pel dap ~]
[%f %exec our ~ (mo-beak dap) %cast mar %$ cay]
::
%pass
:+ %pass `path`[%use dap p.q.cov]
?- -.q.q.cov
@ -612,7 +617,7 @@
++ ap-call :: call into server
|= [cog=term arg=vase]
^- [(unit tang) _+>]
=. +> ap-bowl
=. +> ap-bowl
=+ arm=(ap-farm cog)
?: ?=(%| -.arm) [`p.arm +>.$]
=+ zem=(ap-slam cog p.arm arg)
@ -623,7 +628,7 @@
|= cub=club
^+ +>
?- -.cub
%peel !!
%peel (ap-peel +.cub)
%poke (ap-poke +.cub)
%peer (ap-peer +.cub)
%puff !!
@ -884,6 +889,11 @@
^+ +>
(ap-prep(hav vax) `hav)
::
++ ap-peel
|= [mar=mark pax=path]
=. pyl (~(put by pyl) ost mar)
(ap-peer pax)
::
++ ap-peer :: apply %peer
|= pax=path
^+ +>
@ -923,13 +933,15 @@
=+ cug=(ap-find /lame)
?~ cug
=. why [>%ap-lame dap wut< (turn why |=(a=tank rose/[~ "! " ~]^[a]~))]
~> %slog.`%*(. >[%wh %y]< +> (flop why))
~> %slog.`rose/[" " "[" "]"]^(flop why)
+>.$
=^ cam +>.$
%+ ap-call q.u.cug
!>([wut why])
?^ cam
~&([%ap-lame-lame u.cam] +>.$)
=. why [>%ap-lame-lame< (turn u.cam |=(a=tank rose/[~ "! " ~]^[a]~))]
~> %slog.`rose/[" " "[" "]"]^(welp (flop why) leaf/"." (flop u.cam))
+>.$
+>.$
::
++ ap-pour :: generic take
@ -1113,8 +1125,9 @@
%mont `%c
%ogre `%c
%them `%e
%wait `%t
%wait `%b
%want `%a
%wont `%a :: XX for begin; remove
%warp `%c
==
--
@ -1141,28 +1154,18 @@
:: ~& [%gall-init p.q.hic]
[~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))]
::
%rote
:: ~& [%gall-rote p.q.hic]
%west
?. (~(has by pol.all) p.p.q.hic)
~& [%gall-not-ours p.q.hic]
[~ ..^$]
?> ?=([@ ~] q.q.hic)
=+ dap=i.q.q.hic
=+ our=p.p.q.hic
=+ him=q.p.q.hic
=+ mes=((hard ,[@ud rook]) r.q.hic)
=< mo-abet
(mo-gawk:(mo-abed:mo our hen) him dap mes)
::
%roth
:: ~& [%gall-roth p.q.hic]
?. (~(has by pol.all) p.p.q.hic)
~& [%gall-not-ours p.q.hic]
[~ ..^$]
?> ?=([@ ~] q.q.hic)
=+ dap=i.q.q.hic
?> ?=([?(%ge %gh) @ ~] q.q.hic)
=+ dap=i.t.q.q.hic
=+ our=p.p.q.hic
=+ him=q.p.q.hic
?: ?=(%ge i.q.q.hic)
=+ mes=((hard ,[@ud rook]) r.q.hic)
=< mo-abet
(mo-gawk:(mo-abed:mo our hen) him dap mes)
=+ mes=((hard ,[@ud roon]) r.q.hic)
=< mo-abet
(mo-gawd:(mo-abed:mo our hen) him dap mes)
@ -1182,9 +1185,14 @@
~
::
++ load :: recreate vane
|= old=axle
|= old=axle-n
^+ ..^$
..^$(all old)
?: ?=(%1 -.old) ..^$(all old)
%= $
old => |=(seat-0 `seat`+<(zam [~ zam]))
=> |=(mast-0 +<(bum (~(run by bum) +>)))
old(- %1, pol (~(run by pol.old) .))
==
::
++ scry
|= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path]

131
arvo/hoon.hoon
View File

@ -135,22 +135,6 @@
++ qual |* [a=$+(* *) b=$+(* *) c=$+(* *) d=$+(* *)] :: just a quadruple
,[p=a q=b r=c s=d] ::
:: XX move to zuse
++ rege $| ?(%dote %ende %sart %empt %boun %bout) :: parsed regex
$% [%lite p=char] :: literal
[%pair p=rege q=rege] :: ordering
[%capt p=rege q=@u] :: capture group
[%brac p=@I] :: p is 256 bitmask
[%eith p=rege q=rege] :: either
[%mant p=rege] :: greedy 0 or more
[%plls p=rege] :: greedy 1 or more
[%betw p=rege q=@u r=@u] :: between q and r
[%bint p=rege q=@u] :: min q
[%bant p=rege q=@u] :: exactly q
[%manl p=rege] :: lazy 0 or more
[%plll p=rege] :: lazy 1 or more
[%betl p=rege q=@u r=@u] :: between q and r lazy
[%binl p=rege q=@u] :: min q lazy
== ::
++ ring ,@ :: private key
++ rule |=(tub=nail `edge`[p.tub ~ ~ tub]) :: parsing rule
++ span ,@ta :: text-atom (ASCII)
@ -194,7 +178,7 @@
[1 p=term q=toga] :: deep toga
[2 p=toga q=toga] :: cell toga
== ::
++ trap ,_|.(**) :: makes perfect sense
++ trap |*(a=_,* ,_|?(*a)) :: makes perfect sense
++ trel |* [a=$+(* *) b=$+(* *) c=$+(* *)] :: just a triple
,[p=a q=b r=c] ::
++ tuna :: tagflow
@ -609,7 +593,7 @@
[~ u=(b u.a)]
::
++ bond :: replace
|* a=trap
|* a=(trap)
|* b=(unit)
?~ b $:a
u.b
@ -1858,8 +1842,7 @@
^+ (+<+)
=> .(a `tang`a)
?~ a (+<+)
~> %mean.|.(i.a)
$(a t.a)
~_(i.a $(a t.a))
:::::::::::::::::::::::::::::::::::::::::::::::::::::: ::
:::: chapter 2d, containers ::::
:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -1869,8 +1852,8 @@
|= a=(tree)
?~ a
&
?& ?~(l.a & ?&((vor n.a n.l.a) (hor n.l.a n.a)))
?~(r.a & ?&((vor n.a n.r.a) (hor n.a n.r.a)))
?& ?~(l.a & ?&((vor n.a n.l.a) (hor n.l.a n.a) $(a l.a)))
?~(r.a & ?&((vor n.a n.r.a) (hor n.a n.r.a) $(a r.a)))
==
::
++ in :: set engine
@ -1892,6 +1875,24 @@
|
?|((b n.a) $(a l.a) $(a r.a))
::
+- bif :: splits a by b
~/ %bif
|* b=*
^+ [l=a r=a]
=< [+< +>]
|- ^+ a
?~ a
[b ~ ~]
?: =(b n.a)
a
?: (hor b n.a)
=+ c=$(a l.a)
?> ?=(^ c)
[n.c l.c [n.a r.c r.a]]
=+ c=$(a r.a)
?> ?=(^ c)
[n.c [n.a l.a l.c] r.c]
::
+- del :: b without any a
~/ %del
|* b=*
@ -1909,6 +1910,23 @@
[n.l.a l.l.a $(l.a r.l.a)]
[n.r.a $(r.a l.r.a) r.r.a]
::
+- dif :: difference
~/ %dif
|* b=_a
|- ^+ a
?~ b
a
=+ c=(bif(+< a) n.b)
?> ?=(^ c)
=+ d=$(a l.c, b l.b)
=+ e=$(a r.c, b r.b)
|- ^- ?(~ _a)
?~ d e
?~ e d
?: (vor n.d n.e)
[n.d l.d $(d r.d)]
[n.e $(e l.e) r.e]
::
+- dig :: axis of a in b
|= b=*
=+ c=1
@ -2021,8 +2039,8 @@
|= a=(tree ,[p=* q=*])
?~ a
&
?& ?~(l.a & ?&((vor p.n.a p.n.l.a) (gor p.n.l.a p.n.a)))
?~(r.a & ?&((vor p.n.a p.n.r.a) (gor p.n.a p.n.r.a)))
?& ?~(l.a & ?&((vor p.n.a p.n.l.a) (gor p.n.l.a p.n.a) $(a l.a)))
?~(r.a & ?&((vor p.n.a p.n.r.a) (gor p.n.a p.n.r.a) $(a l.a)))
==
::
++ ja :: jar engine
@ -2093,6 +2111,26 @@
|
?|((b q.n.a) $(a l.a) $(a r.a))
::
+- bif :: splits a by b
~/ %bif
|* [b=* c=*]
^+ [l=a r=a]
=< [+< +>]
|- ^+ a
?~ a
[[b c] ~ ~]
?: =(b p.n.a)
?: =(c q.n.a)
a
[[b c] l.a r.a]
?: (gor b p.n.a)
=+ d=$(a l.a)
?> ?=(^ d)
[n.d l.d [n.a r.d r.a]]
=+ d=$(a r.a)
?> ?=(^ d)
[n.d [n.a l.a l.d] r.d]
::
+- del :: delete at key b
~/ %del
|* b=*
@ -2110,6 +2148,23 @@
[n.l.a l.l.a $(l.a r.l.a)]
[n.r.a $(r.a l.r.a) r.r.a]
::
+- dif :: difference
~/ %dif
|* b=_a
|- ^+ a
?~ b
a
=+ c=(bif(+< a) n.b)
?> ?=(^ c)
=+ d=$(a l.c, b l.b)
=+ e=$(a r.c, b r.b)
|- ^- ?(~ _a)
?~ d e
?~ e d
?: (vor p.n.d p.n.e)
[n.d l.d $(d r.d)]
[n.e $(e l.e) r.e]
::
+- dig :: axis of b key
|= b=*
=+ c=1
@ -3344,6 +3399,18 @@
++ urt %+ cook
|=(a=tape (rap 3 ^-((list ,@) a)))
(star ;~(pose nud low hep dot sig))
++ urx %+ cook
|=(a=tape (rap 3 ^-((list ,@) a)))
%- star
;~ pose
nud
low
hep
cab
(cold ' ' dot)
(cook tuft (ifix [sig dot] hex))
(cold '~' ;~(plug sig sig))
==
++ voy ;~(pfix bas ;~(pose bas soq bix))
--
++ ag
@ -3595,6 +3662,7 @@
~% %so + ~
|%
++ bisk
~+
;~ pose
;~ pfix (just '0')
;~ pose
@ -3609,6 +3677,7 @@
(stag %ud dem:ag)
==
++ crub
~+
;~ pose
%+ cook
|=(det=date `dime`[%da (year det)])
@ -3658,8 +3727,8 @@
::
(stag %p fed:ag)
;~(pfix dot (stag %ta urs:ab))
;~(pfix sig (stag %t (cook woad urs:ab)))
;~(pfix hep (stag %c (cook turf (cook woad urs:ab))))
;~(pfix sig (stag %t urx:ab))
;~(pfix hep (stag %c (cook turf urx:ab)))
==
++ nuck
~/ %nuck |= a=nail %. a
@ -3673,13 +3742,16 @@
:- '~' ;~(pfix sig ;~(pose twid (easy [~ %n 0])))
==
++ nusk
~+
:(sear |=(a=@ta (rush a nuck)) wick urt:ab)
++ perd
~+
;~ pose
(stag ~ zust)
(stag %many (ifix [cab ;~(plug cab cab)] (more cab nusk)))
==
++ royl
~+
=+ ^= zer
(cook lent (star (just '0')))
=+ ^= voy
@ -3710,6 +3782,7 @@
[a c.b d.b e.b [~ (mul i.u.f 2)]]
[a c.b d.b e.b [~ (dec (mul i.u.f 2))]]
++ tash
~+
=+ ^= neg
|= [syn=? mol=dime] ^- dime
?> =('u' (end 3 1 p.mol))
@ -3721,12 +3794,14 @@
==
==
++ twid
~+
;~ pose
(cook |=(a=@ [%blob (cue a)]) ;~(pfix (just '0') vum:ag))
(stag ~ crub)
==
::
++ zust
~+
;~ pose
(stag %is bip:ag)
(stag %if lip:ag)
@ -9925,11 +10000,11 @@
:: ~& [%swim-wyt `@ud`~(wyt in p.sew)]
=+ ^= pru
?~ pux
~| [%swim-call-vane lal]
~| [%swim-call-vane lal (,[term ~] +.p.hil)]
=^ vax p.sew (~(slap wa p.sew) rig [%cnzy %call])
%^ slur-pro lal vax
(slid [%& duc.vil hen] (slix hil))
~| [%swim-take-vane lal]
~| [%swim-take-vane lal (,[term ~] +.p.hil)]
=^ vax p.sew (~(slap wa p.sew) rig [%cnzy %take])
%^ slur-pro lal vax
;: slid

2
arvo/jael.hoon
View File

@ -42,7 +42,7 @@
== ::
++ move ,[p=duct q=(mold note gift)] :: typed move
++ note :: out request $->
$% $: %t :: to %time
$% $: %b :: to %behn
$% [%wait p=@da] ::
[%rest p=@da] ::
== == == ::

71
arvo/zuse.hoon
View File

@ -666,6 +666,7 @@
?: unq
(weld tex rez)
=+ xet=`tape`(flop tex)
!.
|- ^- tape
?~ xet rez
%= $
@ -1161,12 +1162,13 @@
::
++ ofis :: XX broken
=- |=(a=cord (rash a fel))
=- fel=;~(sfix (boss 64 (plus siw)) (stun 0^2 tis))
=< fel=(cook |=(a=@ `@t`(swap 3 a)) (bass 64 .))
=- (cook welp ;~(plug (plus siw) (stun 0^2 (cold %0 tis))))
^= siw
;~ pose
dit
(cook |=(a=@ (sub a (sub 'A' 10))) (shim 'A' 'Z'))
(cook |=(a=@ (sub a (sub 'a' 36))) (shim 'a' 'z'))
(cook |=(a=@ (sub a 'A')) (shim 'A' 'Z'))
(cook |=(a=@ (sub a 'G')) (shim 'a' 'z'))
(cook |=(a=@ (add a 4)) (shim '0' '9'))
(cold 62 (just '+'))
(cold 63 (just '/'))
==
@ -2316,9 +2318,23 @@
[%wake ~] :: timer activate
[%want p=sock q=path r=*] :: send message
[%wegh ~] :: report memory
[%west p=sack q=path r=*] :: network request
[%wont p=sock q=path r=*] :: e2e send message
== ::
::
:::: %behn
::
++ gift-behn :: out result <-$
$% [%mass p=mass] :: memory usage
[%wake ~] :: wakey-wakey
== ::
++ kiss-behn :: in request ->$
$% [%rest p=@da] :: cancel alarm
[%wait p=@da] :: set alarm
[%wake ~] :: timer activate
[%wegh ~] :: report memory
== ::
::
:::: %clay
::
++ khan ::
@ -2331,6 +2347,7 @@
++ gift-clay :: out result <-$
$% [%ergo p=@tas q=mode] :: version update
[%hill p=(list ,@tas)] :: mount points
[%mack p=(unit tang)] :: ack
[%mass p=mass] :: memory usage
[%mere p=(each (set path) (pair term tang))] :: merge result
[%note p=@tD q=tank] :: debug message
@ -2345,9 +2362,9 @@
[%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks
[%mont p=@tas q=@p r=@tas s=path] :: mount to unix
[%ogre p=$|(@tas beam)] :: delete mount point
[%wart p=sock q=@tas r=path s=*] :: network request
[%warp p=sock q=riff] :: file request
[%wegh ~] :: report memory
[%west p=sack q=path r=*] :: network request
== ::
::
::::
@ -2438,6 +2455,7 @@
:::: %eyre
::
++ gram :: inter-ship message
=+ fuz=,[path *] :: ames format
$? [[%lon ~] p=hole] :: login request
[[%aut ~] p=hole] :: login reply
[[%hat ~] p=hole q=hart] :: login redirect
@ -2454,11 +2472,12 @@
[%they p=@ud q=httr] :: inbound response
[%this p=? q=clip r=httq] :: inbound request
[%thud ~] :: inbound cancel
[%wart p=sack q=@tas r=_`[path *]`*gram] :: urbit message
[%wegh ~] :: report memory
[%west p=sack q=fuz:gram] :: network request
== ::
++ gift-eyre :: out result <-$
$% [%mass p=mass] :: memory usage
[%mack p=(unit tang)] :: message ack
[%sigh p=cage] :: marked http response
[%thou p=httr] :: raw http response
[%thus p=@ud q=(unit hiss)] :: http request/cancel
@ -2501,18 +2520,17 @@
++ milk (trel ship desk silk) :: sourced silk
++ silk :: construction layer
$& [p=silk q=silk] :: cons
$% [%bake p=mark q=beam r=path] :: local synthesis
$% [%$ p=cage] :: literal
[%bake p=mark q=beam r=path] :: local synthesis
[%boil p=mark q=beam r=path] :: general synthesis
[%bunt p=mark] :: example of mark
[%call p=silk q=silk] :: slam
[%cast p=mark q=silk] :: translate
[%core p=beam] :: build program
[%diff p=silk q=silk] :: diff
[%done p=(set beam) q=cage] :: literal
[%dude p=tank q=silk] :: error wrap
[%dune p=(set beam) q=(unit cage)] :: unit literal
[%dude p=(trap tank) q=silk] :: error wrap
[%file p=beam] :: from clay
[%flag p=@uvH q=silk] :: re-apply user deps
[%flag p=(set $|(@uvH beam)) q=silk] :: add dependencies
[%join p=mark q=silk r=silk] :: merge
[%mash p=mark q=milk r=milk] :: annotate
[%mute p=silk q=(list (pair wing silk))] :: mutant
@ -2521,10 +2539,11 @@
[%reef ~] :: kernel reef
[%ride p=twig q=silk] :: silk thru twig
[%tabl p=(list (pair silk silk))] :: list
[%vale p=mark q=ship r=*] :: validate [our his]
[%volt p=(set beam) q=(cask ,*)] :: unsafe add type
[%vale p=mark q=*] :: validate
[%volt p=(cask ,*)] :: unsafe add type
== ::
::::
++ bilk (pair beak silk) :: sourced request
++ gage :: recursive cage/tang
$% [%& p=cage] :: success
[%| p=tang] :: error
@ -2536,7 +2555,7 @@
[%news ~] :: fresh depends
== ::
++ kiss-ford :: in request ->$
$% [%exec p=@p q=beak r=(unit silk)] :: make / kill
$% [%exec p=@p q=(unit bilk)] :: make / kill
[%wasp p=@p q=@uvH] :: depends query
[%wegh ~] :: report memory
== ::
@ -2575,8 +2594,7 @@
$% [%conf p=dock q=culm] :: configure app
[%init p=ship] :: set owner
[%deal p=sock q=cush] :: full transmission
[%rote p=sack q=path r=*] :: remote request
[%roth p=sack q=path r=*] :: remote response
[%west p=sack q=path r=*] :: network request
[%wegh ~] :: report memory
== ::
++ gift-gall :: outgoing result
@ -2586,19 +2604,6 @@
[%mack p=(unit tang)] :: message ack
== ::
::
:::: %time
::
++ gift-time :: out result <-$
$% [%mass p=mass] :: memory usage
[%wake ~] :: wakey-wakey
== ::
++ kiss-time :: in request ->$
$% [%rest p=@da] :: cancel alarm
[%wait p=@da] :: set alarm
[%wake ~] :: timer activate
[%wegh ~] :: report memory
== ::
::
:::: %arvo
::
++ gift-arvo :: out result <-$
@ -2608,7 +2613,7 @@
gift-eyre
gift-ford
gift-gall
gift-time
gift-behn
==
++ kiss-arvo :: in request ->$
$? kiss-ames
@ -2617,25 +2622,25 @@
kiss-eyre
kiss-ford
kiss-gall
kiss-time
kiss-behn
==
++ note-arvo :: out request $->
$? [@tas %meta vase]
$% [%a kiss-ames]
[%b kiss-behn]
[%c kiss-clay]
[%d kiss-dill]
[%e kiss-eyre]
[%f kiss-ford]
[%g kiss-gall]
[%t kiss-time]
== ==
++ sign-arvo :: in result $<-
$% [%a gift-ames]
[%b gift-behn]
[%c gift-clay]
[%d gift-dill]
[%e gift-eyre]
[%f gift-ford]
[%g gift-gall]
[%t gift-time]
==
--

2
cat/hood/breload.hoon
View File

@ -8,5 +8,5 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=(list term) ~]
==
:+ %hood-reload-desk %base
:+ %helm-reload-desk %base
arg

2
cat/hood/invite.hoon
View File

@ -8,4 +8,4 @@
|= $: [now=@da eny=@uvI bec=beak]
[[who=@p myl=@t ~] ~]
==
[%hood-invite who myl]
[%helm-invite who myl]

12
cat/hood/label.hoon Normal file
View File

@ -0,0 +1,12 @@
::
:::: /hoon/label/hood/cat
::
/? 314
::
::::
!:
|= $: [now=@da eny=@uvI bec=beak]
[arg=[syd=desk lab=@tas ~] ~]
==
:- %kiln-label
[syd lab]:arg

2
cat/hood/link.hoon
View File

@ -8,7 +8,7 @@
|= $: [now=@da eny=@uvI byk=beak]
[arg=$?([dap=term ~] [who=ship dap=term ~]) ~]
==
:- %hood-link
:- %drum-link
?~ +.arg
[p.byk dap.arg]
[who.arg dap.arg]

2
cat/hood/mass.hoon
View File

@ -8,4 +8,4 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=~ ~]
==
[%hood-mass ~]
[%helm-mass ~]

2
cat/hood/merge.hoon
View File

@ -8,5 +8,5 @@
|= $: [now=@da eny=@uvI bec=beak]
[[syd=@tas her=@p sud=@tas gem=?([?(%auto germ) ~] ~)] ~]
==
:- %hood-merge
:- %kiln-merge
[syd her sud ?~(gem %auto -.gem)]

2
cat/hood/mount.hoon
View File

@ -8,5 +8,5 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=[pax=path pot=@tas ~] ~]
==
:- %hood-mount
:- %kiln-mount
[pax pot]:arg

2
cat/hood/mv.hoon
View File

@ -1 +1 @@
|=([^ [input=path output=path ~] ~] kiln-cp/[input output])
|=([^ [input=path output=path ~] ~] kiln-mv/[input output])

11
cat/hood/rc.hoon Normal file
View File

@ -0,0 +1,11 @@
::
:::: /hoon/reload/hood/cat
::
/? 314
::
::::
!:
|= $: [now=@da eny=@uvI bec=beak]
[arg=~ ~]
==
[%helm-reload ~[%c]]

11
cat/hood/reboot.hoon Normal file
View File

@ -0,0 +1,11 @@
::
:::: /hoon/reload/hood/cat
::
/? 314
::
::::
!:
|= $: [now=@da eny=@uvI bec=beak]
[arg=~ ~]
==
[%helm-reload ~[%z %a %b %c %d %e %f %g]]

2
cat/hood/reload-desk.hoon
View File

@ -8,5 +8,5 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=[desk (list term)] ~]
==
:- %hood-reload-desk
:- %helm-reload-desk
arg

2
cat/hood/reload.hoon
View File

@ -8,5 +8,5 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=(list term) ~]
==
:- %hood-reload
:- %helm-reload
arg

2
cat/hood/reset.hoon
View File

@ -8,4 +8,4 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=~ ~]
==
[%hood-reset ~]
[%helm-reset ~]

11
cat/hood/rf.hoon Normal file
View File

@ -0,0 +1,11 @@
::
:::: /hoon/reload/hood/cat
::
/? 314
::
::::
!:
|= $: [now=@da eny=@uvI bec=beak]
[arg=~ ~]
==
[%helm-reload ~[%f]]

2
cat/hood/start.hoon
View File

@ -8,7 +8,7 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=[@ $|(~ [@ ~])] ~]
==
:- %hood-start
:- %drum-start
?> ((sane %tas) -.arg)
?@ +.arg [%home -.arg]
?> ((sane %tas) +<.arg)

2
cat/hood/sync.hoon
View File

@ -8,5 +8,5 @@
|= $: [now=@da eny=@uvI bec=beak]
[arg=[syd=@tas her=@p sud=@tas ~] ~]
==
:- %hood-sync
:- %kiln-sync
[syd her sud]:arg

2
cat/hood/unmount.hoon
View File

@ -8,5 +8,5 @@
|= $: [now=@da eny=@uvI bec=beak]
[[mon=$|(term [span path]) ~] ~]
==
:- %hood-unmount
:- %kiln-unmount
mon

2
cat/hood/verb.hoon
View File

@ -9,5 +9,5 @@
|= $: [now=@da eny=@ bec=beak]
[~ ~]
==
~& %hood-verb
~& %helm-verb
[%helm-verb ~]

2
cat/solid.hoon
View File

@ -23,10 +23,10 @@
[%g %gall]
[%f %ford]
[%a %ames]
[%b %behn]
[%c %clay]
[%d %dill]
[%e %eyre]
[%t %time]
==
|- ^+ all
?~ vay all

8
dog/hood/begin.hoon
View File

@ -14,20 +14,20 @@
==
^- (sole-result (cask begs))
%+ sole-lo
[%& %hood-begin "your ship: ~"]
[%& %helm-begin "your ship: ~"]
%+ sole-go fed:ag
|= his=@p
%+ sole-lo
[%& %hood-ticket "your ticket: ~"]
[%& %helm-ticket "your ticket: ~"]
%+ sole-go fed:ag
|= tic=@p
%+ sole-lo
[%& %hood-entropy "some entropy: "]
[%& %helm-entropy "some entropy: "]
%+ sole-go (boss 256 (more gon qit))
|= yen=@t
=+ ney=(shax yen)
%+ sole-yo `tank`[%leaf "entropy check: {(scow %p `@p`(mug ney))}"]
%+ sole-so %hood-begin
%+ sole-so %helm-begin
:* his
tic
ney

28
lib/base.css
View File

@ -1,84 +1,84 @@
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau.woff");
src: url("//storage.googleapis.com/urbit-extra/bau.woff");
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau-italic.woff");
src: url("//storage.googleapis.com/urbit-extra/bau-italic.woff");
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau-medium.woff");
src: url("//storage.googleapis.com/urbit-extra/bau-medium.woff");
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau-mediumitalic.woff");
src: url("//storage.googleapis.com/urbit-extra/bau-mediumitalic.woff");
font-weight: 500;
font-style: italic;
}
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau-bold.woff");
src: url("//storage.googleapis.com/urbit-extra/bau-bold.woff");
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau-bolditalic.woff");
src: url("//storage.googleapis.com/urbit-extra/bau-bolditalic.woff");
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau-super.woff");
src: url("//storage.googleapis.com/urbit-extra/bau-super.woff");
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: "bau";
src: url("http://storage.googleapis.com/urbit-extra/bau-superitalic.woff");
src: url("//storage.googleapis.com/urbit-extra/bau-superitalic.woff");
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: "scp";
src: url("http://storage.googleapis.com/urbit-extra/scp-extralight.woff");
src: url("//storage.googleapis.com/urbit-extra/scp-extralight.woff");
font-weight: 200;
font-style: normal;
}
@font-face {
font-family: "scp";
src: url("http://storage.googleapis.com/urbit-extra/scp-light.woff");
src: url("//storage.googleapis.com/urbit-extra/scp-light.woff");
font-weight: 300;
font-style: normal;
}
@font-face {
font-family: "scp";
src: url("http://storage.googleapis.com/urbit-extra/scp-regular.woff");
src: url("//storage.googleapis.com/urbit-extra/scp-regular.woff");
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: "scp";
src: url("http://storage.googleapis.com/urbit-extra/scp-medium.woff");
src: url("//storage.googleapis.com/urbit-extra/scp-medium.woff");
font-weight: 500;
font-style: normal;
}
@font-face {
font-family: "scp";
src: url("http://storage.googleapis.com/urbit-extra/scp-bold.woff");
src: url("//storage.googleapis.com/urbit-extra/scp-bold.woff");
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: "scp";
src: url("http://storage.googleapis.com/urbit-extra/scp-black.woff");
src: url("//storage.googleapis.com/urbit-extra/scp-black.woff");
font-weight: 700;
font-style: normal;
}

12
lib/helm.hoon
View File

@ -47,7 +47,7 @@
[%conf wire dock %load ship term] ::
[%flog wire flog] ::
[%poke wire dock pear] ::
[%want wire sock path *] :: send message
[%wont wire sock path *] :: send message
== ::
++ move (pair bone card) :: user-level move
++ pear :: poke fruit
@ -72,7 +72,7 @@
=+ buz=(shax :(mix (jam ges) eny))
=+ loy=(bruw 2.048 buz)
%- emit(bur `[his [0 sec:ex:loy]~])
[%want /helm/ticket [our (sein his)] /q/ta his tic ges pub:ex:loy]
[%wont /helm/ticket [our (sein his)] /a/ta his tic ges pub:ex:loy]
::
++ poke-init :: initialize
|= him=ship =< abet
@ -131,12 +131,12 @@
^- (list ,[p=@tas q=@tas])
:~ [%$ %zuse]
[%a %ames]
[%b %behn]
[%c %clay]
[%d %dill]
[%e %eyre]
[%f %ford]
[%g %gall]
[%t %time]
==
|= [p=@tas q=@tas]
=+ way=`path`(welp top /[q])
@ -169,8 +169,8 @@
|= [way=wire chr=@tD tan=tank] =< abet
(emit %flog ~ %text chr ' ' ~(ram re tan))
::
++ take-went :: result of %want
|= [way=path her=ship kay=cape] =< abet
(emit %flog ~ %text "went: {<[way kay]>}")
++ take-woot :: result of %wont
|= [way=wire her=ship cop=coop] =< abet
(emit %flog ~ %text "woot: {<[way cop]>}")
--
--

79
lib/kiln.hoon
View File

@ -9,7 +9,7 @@
++ kiln-part ,[%kiln %0 kiln-pith] :: kiln state
++ kiln-pith ::
$: rem=(map desk kiln-desk) ::
syn=(map hood-sync ,[let=@ud ust=bone]) ::
syn=(map kiln-sync ,[let=@ud ust=bone]) ::
== ::
++ kiln-desk :: per-desk state
$: auto=? :: escalate on failure
@ -21,30 +21,30 @@
:: :: ::
:::: :: ::
:: :: ::
++ hood-mount ::
++ kiln-mount ::
$: pax=path ::
pot=term ::
== ::
++ hood-unmount ::
++ kiln-unmount ::
$|(term [span path]) ::
++ hood-sync ::
++ kiln-sync ::
$: syd=desk ::
her=ship ::
sud=desk ::
== ::
++ hood-unsync ::
++ kiln-unsync ::
$: syd=desk ::
her=ship ::
sud=desk ::
== ::
++ hood-merge ::
++ kiln-merge ::
$: syd=desk ::
ali=ship ::
sud=desk ::
gim=?(%auto germ) ::
== ::
++ hood-cp [input=path output=path] ::
++ hood-mv [input=path output=path] ::
++ kiln-cp [input=path output=path] ::
++ kiln-mv [input=path output=path] ::
-- ::
:: :: ::
:::: :: ::
@ -55,7 +55,7 @@
?> =(src our)
=> |% :: arvo structures
++ card ::
$% [%exec wire @p beak (unit silk)] ::
$% [%exec wire @p ~ [beak silk]] ::
[%info wire @p @tas nori] ::
[%mont wire @tas @p @tas path] ::
[%ogre wire $|(@tas beam)] ::
@ -65,7 +65,7 @@
== ::
++ pear :: poke fruit
$% [%talk-command command:talk] ::
[%hood-merge hood-merge] ::
[%kiln-merge kiln-merge] ::
== ::
++ move (pair bone card) :: user-level move
--
@ -80,7 +80,7 @@
?~(+< +> $(+< t.+<, +> (emit i.+<)))
::
++ poke-mount
|= hood-mount
|= kiln-mount
=+ bem=(tome pax)
?~ bem
=+ "can't mount bad path: {<pax>}"
@ -88,7 +88,7 @@
abet:(emit %mont /mount pot p.u.bem q.u.bem (flop s.u.bem))
::
++ poke-unmount
|= mon=hood-unmount
|= mon=kiln-unmount
?^ mon
=+ bem=(tome mon)
?~ bem
@ -98,14 +98,14 @@
abet:(emit %ogre /unmount-point mon)
::
++ poke-sync ::
|= hos=hood-sync
|= hos=kiln-sync
?: (~(has by syn) hos)
=+ "already syncing from {<sud.hos>} on {<her.hos>} to {<syd.hos>}"
abet:(spam leaf/- ~)
abet:abet:start:(auto hos)
::
++ poke-unsync ::
|= hus=hood-unsync
|= hus=kiln-unsync
?. (~(has by syn) hus)
=+ "not syncing from {<sud.hus>} on {<her.hus>} to {<syd.hus>}"
abet:(spam leaf/- ~)
@ -114,7 +114,7 @@
==
::
++ poke-merge ::
|= hood-merge
|= kiln-merge
abet:abet:(merge:(work syd) ali sud gim)
::
++ do-info
@ -135,6 +135,11 @@
%+ furl (fray output)
(foal output -:(flop input) %noun .^(%cx input))
::
++ poke-label
|= [syd=desk lab=@tas]
=+ pax=/(scot %p our)/[syd]/[lab]
(do-info "labeled {(spud pax)}" [syd %| lab])
::
++ poke-schedule
|= [where=path tym=@da eve=@t]
=. where (welp where /sched)
@ -158,7 +163,7 @@
++ take-mere-sync ::
|= [way=wire mes=(each (set path) (pair term tang))]
?> ?=([@ @ @ ~] way)
=+ ^- hos=hood-sync
=+ ^- hos=kiln-sync
:* syd=(slav %tas i.way)
her=(slav %p i.t.way)
sud=(slav %tas i.t.t.way)
@ -168,7 +173,7 @@
++ take-writ ::
|= [way=wire rot=riot]
?> ?=([@ @ @ ~] way)
=+ ^- hos=hood-sync
=+ ^- hos=kiln-sync
:* syd=(slav %tas i.way)
her=(slav %p i.t.way)
sud=(slav %tas i.t.t.way)
@ -181,7 +186,7 @@
[%poke /kiln/spam [our %talk] (said our %kiln now eny mes)]
::
++ auto
|= hood-sync
|= kiln-sync
=+ (fall (~(get by syn) syd her sud) [let=*@ud ust=ost])
|%
++ abet
@ -205,11 +210,12 @@
:: XX remove feedback for demo
:: =. . %- spam
:: [leaf/"activated sync from {<sud>} on {<her>} to {<syd>}" ~]
%- blab :_ ~
:* ost %warp
/kiln/sync/[syd]/(scot %p her)/[sud]
[our her] sud ~ %sing %w [%da now] /
==
%- blab
:~ [ost %mont /mount syd our syd /]
:* ost %warp
/kiln/sync/[syd]/(scot %p her)/[sud]
[our her] sud ~ %sing %w [%da now] /
== ==
::
++ writ
|= rot=riot
@ -279,7 +285,6 @@
::
++ ford-fail
|=(tan=tang ~|(%ford-fail (mean tan)))
::
++ unwrap-tang
|* res=(each ,* tang)
@ -318,9 +323,10 @@
|= [syd=desk her=@p sud=desk gem=?(%auto germ)]
^+ +>
%- blab :_ ~
[ost %poke /kiln/fancy/[^syd] [our %hood] %hood-merge [syd her sud gem]]
[ost %poke /kiln/fancy/[^syd] [our %hood] %kiln-merge [syd her sud gem]]
::
++ spam |*(* +>(..work (^spam +<)))
++ spam ::|=(tang ((slog 0 +<) ..spam))
|*(* +>(..work (^spam +<)))
++ merge
|= [her=@p sud=@tas gim=?(%auto germ)]
^+ +>
@ -341,7 +347,7 @@
[ost %merg /kiln/[syd] our (cat 3 syd '-scratch') her sud gem]
=+ :- "failed to set up conflict resolution scratch space"
"I'm out of ideas"
lose:(spam leaf/-< leaf/-> ~)
lose:(spam leaf/-< leaf/-> u.saw)
::
++ mere
|= are=(each (set path) (pair term tang))
@ -351,17 +357,19 @@
?. auto
=+ "merged with strategy {<gem>}"
win:(spam leaf/- ?~(p.are ~ [>`(set path)`p.are< ~]))
:: ~? > =(~ p.are) [%mere-no-conflict syd]
=+ "mashing conflicts"
=> .(+>.$ (spam leaf/- ~))
=+ tic=(cat 3 syd '-scratch')
%- blab :_ ~
:* ost %exec /kiln/[syd]
our [our tic %da now] ~ %tabl
our ~ [our tic %da now] %tabl
^- (list (pair silk silk))
:: ~& > kiln-mashing/[p.are syd=syd +<.abet]
%+ turn (~(tap in p.are))
|= pax=path
^- (pair silk silk)
:- [%done ~ %path -:!>(*path) pax]
:- [%$ %path -:!>(*path) pax]
=+ base=[%file [our tic %da now] (flop pax)]
=+ alis=[%file [her sud cas] (flop pax)]
=+ bobs=[%file [our syd %da now] (flop pax)]
@ -372,14 +380,14 @@
?~(- %$ i.-)
[%mash for [her sud dali] [our syd dbob]]
==
=+ "failed to merge with strategy {<p.p.are>}"
lose:(spam leaf/- q.p.are)
=+ "failed to merge with strategy meld"
lose:(spam leaf/- >p.p.are< q.p.are)
?: ?=(%& -.are)
=+ "merged with strategy {<gem>}"
win:(spam leaf/- ?~(p.are ~ [>`(set path)`p.are< ~]))
?. auto
=+ "failed to merge with strategy {<p.p.are>}"
lose:(spam leaf/- q.p.are)
=+ "failed to merge with strategy {<gem>}"
lose:(spam leaf/- >p.p.are< q.p.are)
?+ gem
(spam leaf/"strange auto" >gem< ~)
::
@ -410,8 +418,8 @@
=+ tic=(cat 3 syd '-scratch')
=> =+ :- "%mate merge failed with conflicts,"
"setting up scratch space at %{(trip tic)}"
[tic=tic (spam leaf/-< leaf/-> ~)]
(fancy-merge tic our syd %auto)
[tic=tic (spam leaf/-< leaf/-> q.p.are)]
(fancy-merge tic our syd %that)
==
::
++ made
@ -428,6 +436,7 @@
~| "strange path mark: {<p.pax>}"
!!
[((hard path) q.q.pax) ?:(?=(%null p.dif) ~ `[%dif dif])]
:: ~& > kiln-made/[(turn can head) syd=syd +<.abet]
=+ notated=(skid can |=([path a=(unit miso)] ?=(^ a)))
=+ annotated=(turn `(list (pair path ,*))`-.notated head)
=+ unnotated=(turn `(list (pair path ,*))`+.notated head)

0
mar/bit-accounts.hoon → mar/bit/accounts.hoon
View File

0
mar/bit-addr-made.hoon → mar/bit/addr-made.hoon
View File

0
mar/bit-addr-request.hoon → mar/bit/addr-request.hoon
View File

0
mar/bit-api-call.hoon → mar/bit/api-call.hoon
View File

0
mar/bit-get-token.hoon → mar/bit/get-token.hoon
View File

0
mar/bit-transaction.hoon → mar/bit/transaction.hoon
View File

16
mar/cloud-auth/door.hook
View File

@ -1,16 +0,0 @@
:: this mark is used to receive incoming oauth2 tokens that we use to poke our %gall server
::
:::: /hook/door/do-auth/mar
::
/? 310
!:
|_ cod=cord
::
++ grab :: converter arm
|%
++ noun ,@t :: clam from noun
++ json (cork (ot authcode/so platform/so ~):jo need) :: (need (so:jo jon))
--
--

9
mar/cloud-secret/door.hook
View File

@ -1,9 +0,0 @@
!:
|_ cod=cord
::
++ grab :: converter am
|%
++ noun ,@t :: clam from noun
++ json (cork (ot secret/so platform/so ~):jo need) :: (need (so:jo jon))
--
--

0
mar/cloud-auth.hoon → mar/cloud/auth.hoon
View File

0
mar/cloud-secret.hoon → mar/cloud/secret.hoon
View File

5
mar/coffee.hoon
View File

@ -13,8 +13,5 @@
++ mime |=([p=mite q=octs] (,@t q.q))
++ noun ,@t
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

5
mar/css.hoon
View File

@ -14,8 +14,5 @@
++ mime |=([p=mite q=octs] (,@t q.q))
++ noun ,@t :: clam from %noun
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

0
mar/dill-belt.hoon → mar/dill/belt.hoon
View File

0
mar/dill-blit.hoon → mar/dill/blit.hoon
View File

2
mar/down/html5-entities.json → mar/down/html5-entities.json.txt
View File

File diff suppressed because one or more lines are too long

4
mar/down/parse.hoon
View File

@ -13,8 +13,8 @@
=- |= tub=nail ^- (like ,@t) %. tub :: export context
=+(poxa enty(ent mapping))
^- mapping=(map span ,@tF)
=+ pax=/==1%%/html5-entities/json :: XX %%/
=+ maf=%.(pax ;~(biff file (soft ,@) poja (om so):jo))
=+ pax=/==1%%/'html5-entities.json'/txt :: XX %%/
=+ maf=%.(pax ;~(biff file (soft ,@t) poja (om so):jo))
?^ maf u.maf
~& no-enty/pax
(mo amp/'&' quot/'"' apos/'\'' lt/'<' gt/'>' ~) :: fallback

5
mar/eot.hoon
View File

@ -17,8 +17,5 @@
++ mime |=([p=mite q=octs] q.q)
++ noun ,@
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

5
mar/hook.hoon
View File

@ -47,8 +47,5 @@
=+ (role wan)
(end 3 (dec (met 3 -)) -)
--
++ grad
|%
++ sted %txt
--
++ grad %txt
--

5
mar/hoon.hoon
View File

@ -49,8 +49,5 @@
=+ (role wan)
(end 3 (dec (met 3 -)) -)
--
++ grad
|%
++ sted %txt
--
++ grad %txt
--

1
mar/html.hoon
View File

@ -14,4 +14,5 @@
-- ::
++ grab |% :: convert from
++ noun ,@t :: clam from %noun
++ mime |=([p=mite q=octs] q.q) :: retrieve form %mime
-- --

5
mar/js.hoon
View File

@ -16,8 +16,5 @@
++ mime |=([p=mite q=octs] (,@t q.q))
++ noun cord :: clam from %noun
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

7
mar/json.hoon
View File

@ -15,13 +15,10 @@
--
++ grab
|% :: convert from
++ mime |=([p=mite q=octs] *json) ::(fall (rush (,@t q.q) apex:poja) *json))
++ mime |=([p=mite q=octs] (fall (rush (,@t q.q) apex:poja) *json))
++ noun json :: clam from %noun
++ numb jone
++ time jode
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

5
mar/markdown.hoon
View File

@ -22,8 +22,5 @@
=+ (role wan)
(end 3 (dec (met 3 -)) -)
--
++ grad
|%
++ sted %txt
--
++ grad %txt
--

5
mar/md.hoon
View File

@ -20,8 +20,5 @@
=+ (role wan)
(end 3 (dec (met 3 -)) -)
--
++ grad
|%
++ sted %txt
--
++ grad %txt
--

0
mar/oct3-move.hoon → mar/oct3/move.hoon
View File

0
mar/oct3-update.hoon → mar/oct3/update.hoon
View File

0
mar/oct4-move.hoon → mar/oct4/move.hoon
View File

0
mar/oct4-update.hoon → mar/oct4/update.hoon
View File

5
mar/otf.hoon
View File

@ -16,8 +16,5 @@
++ mime |=([mite p=octs] [/font/otf p])
++ noun ^mime
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

5
mar/sched.hoon
View File

@ -24,6 +24,5 @@
(cook crip (star prn))
==
--
++ grad |%
++ sted %mime
-- --
++ grad %mime
--

0
mar/sole-action.hoon → mar/sole/action.hoon
View File

0
mar/sole-effect.hoon → mar/sole/effect.hoon
View File

5
mar/styl.hoon
View File

@ -12,8 +12,5 @@
++ mime |=([p=mite q=octs] q.q)
++ noun ,@t
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

0
mar/talk-command.hoon → mar/talk/command.hoon
View File

0
mar/talk-report.hoon → mar/talk/report.hoon
View File

3
mar/tang.hoon
View File

@ -14,6 +14,7 @@
--
++ grab :: convert from
|%
++ noun (list tank) :: clam from %noun
++ noun (list ^tank) :: clam from %noun
++ tank |=(a=^tank [a]~)
--
--

12
mar/txt.hoon
View File

@ -90,7 +90,9 @@
--
::
++ mash
|= [als=[ship desk] bos=[ship desk] ali=(urge cord) bob=(urge cord)]
|= $: [als=ship ald=desk ali=(urge cord)]
[bos=ship bod=desk bob=(urge cord)]
==
^- (urge cord)
|^
=. ali (clean ali)
@ -150,9 +152,9 @@
:- :_ ~
%^ cat 3 '<<<<<<<<<<<<'
%^ cat 3 ' '
%^ cat 3 `@t`(scot %p -.bos)
%^ cat 3 `@t`(scot %p bos)
%^ cat 3 '/'
+.bos
bos
:- bob
:- ~['------------']
:- bas
@ -161,9 +163,9 @@
:- :_ ~
%^ cat 3 '>>>>>>>>>>>>'
%^ cat 3 ' '
%^ cat 3 `@t`(scot %p -.als)
%^ cat 3 `@t`(scot %p als)
%^ cat 3 '/'
+.als
ald
~
::
++ clean :: clean

5
mar/woff.hoon
View File

@ -16,8 +16,5 @@
++ mime |=([mite p=octs] [/application/font-woff p])
++ noun ^mime
--
++ grad
|%
++ sted %mime
--
++ grad %mime
--

18
mar/xml.hoon Normal file
View File

@ -0,0 +1,18 @@
::
:::: /hoon/core/html/mar
::
/? 314
::
:::: compute
::
|_ htm=@t
::
++ grow :: convert to
|% ::
++ mime [/application/xml (taco htm)] :: to %mime
++ hymn (need (poxa htm)) :: to %hymn
-- ::
++ grab |% :: convert from
++ noun ,@t :: clam from %noun
++ mime |=([p=mite q=octs] q.q) :: retrieve form %mime
-- --

7
pub/talk/src/css/main.css
View File

@ -365,6 +365,7 @@ body {
position: absolute;
overflow: hidden;
max-height: 1.6rem;
white-space: nowrap;
}
#writing-container {
padding-top: 0.3rem;
@ -392,6 +393,9 @@ body {
z-index: 3;
-webkit-transition: max-height 0.2s, color 0.1s linear;
}
#messages .message:hover .attr > div {
max-width: 48rem;
}
#messages .message .ship,
#messages .message .audi > div {
cursor: pointer;
@ -520,6 +524,9 @@ a {
.audi > div:hover {
max-width: 42rem;
}
.iden > div:hover {
padding-right: 3rem;
}
.mess,
#writing {
font-size: 1.2rem;

7
pub/talk/src/css/main.styl
View File

@ -310,6 +310,7 @@ body
position absolute
overflow hidden
max-height 1.6rem
white-space nowrap
// #writing-container
// #messages .message.first
@ -342,6 +343,9 @@ body
z-index 3
-webkit-transition max-height .2s, color .1s linear
#messages .message:hover .attr > div
max-width 48rem
#messages .message .ship
#messages .message .audi > div
cursor pointer
@ -470,6 +474,9 @@ a
.audi > div:hover
max-width 42rem
.iden > div:hover
padding-right 3rem
.mess
#writing
font-size 1.2rem

3
pub/talk/src/js/components/MessagesComponent.coffee
View File

@ -177,13 +177,14 @@ module.exports = recl
_messages = @sortedMessages @state.messages
@last = _messages[_messages.length-1]
if @last?.ship && @last.ship is window.urb.user then @lastSeen = @last
@length = _messages.length
setTimeout =>
@checkMore() if length < @pageSize
, 1
lastIndex = if @lastSeen then _messages.indexOf(@lastSeen) else null
lastIndex = if @lastSeen then _messages.indexOf(@lastSeen)+1 else null
lastSaid = null
messages = _messages.map (_message,k) =>

63
pub/talk/src/js/main.js
View File

@ -1,4 +1,4 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/MessageActions.coffee":[function(require,module,exports){
var MessageDispatcher;
MessageDispatcher = require('../dispatcher/Dispatcher.coffee');
@ -91,7 +91,7 @@ module.exports = {
},{"../dispatcher/Dispatcher.coffee":7}],2:[function(require,module,exports){
},{"../dispatcher/Dispatcher.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/dispatcher/Dispatcher.coffee"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/StationActions.coffee":[function(require,module,exports){
var StationDispatcher;
StationDispatcher = require('../dispatcher/Dispatcher.coffee');
@ -179,7 +179,7 @@ module.exports = {
},{"../dispatcher/Dispatcher.coffee":7}],3:[function(require,module,exports){
},{"../dispatcher/Dispatcher.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/dispatcher/Dispatcher.coffee"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/MemberComponent.coffee":[function(require,module,exports){
var div, input, recl, ref, textarea;
recl = React.createClass;
@ -208,7 +208,7 @@ module.exports = recl({
},{}],4:[function(require,module,exports){
},{}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/MessagesComponent.coffee":[function(require,module,exports){
var Member, Message, MessageActions, MessageStore, StationActions, StationStore, a, br, div, input, moment, pre, recl, ref, textarea;
moment = require('moment-timezone');
@ -451,13 +451,16 @@ module.exports = recl({
return StationActions.setAudience(audi);
},
render: function() {
var _messages, _station, lastIndex, lastSaid, messages, ref1, ref2, sources, station;
var _messages, _station, lastIndex, lastSaid, messages, ref1, ref2, ref3, sources, station;
station = this.state.station;
_station = "~" + window.urb.ship + "/" + station;
sources = _.clone((ref1 = (ref2 = this.state.configs[this.state.station]) != null ? ref2.sources : void 0) != null ? ref1 : []);
sources.push(_station);
_messages = this.sortedMessages(this.state.messages);
this.last = _messages[_messages.length - 1];
if (((ref3 = this.last) != null ? ref3.ship : void 0) && this.last.ship === window.urb.user) {
this.lastSeen = this.last;
}
this.length = _messages.length;
setTimeout((function(_this) {
return function() {
@ -466,15 +469,15 @@ module.exports = recl({
}
};
})(this), 1);
lastIndex = this.lastSeen ? _messages.indexOf(this.lastSeen) : null;
lastIndex = this.lastSeen ? _messages.indexOf(this.lastSeen) + 1 : null;
lastSaid = null;
messages = _messages.map((function(_this) {
return function(_message, k) {
var ref3;
var ref4;
if (lastIndex && lastIndex === k) {
_message.unseen = true;
}
if ((ref3 = _message.thought.statement.speech) != null ? ref3.app : void 0) {
if ((ref4 = _message.thought.statement.speech) != null ? ref4.app : void 0) {
_message.ship = "system";
}
_message.sameAs = lastSaid === _message.ship;
@ -493,7 +496,7 @@ module.exports = recl({
},{"../actions/MessageActions.coffee":1,"../actions/StationActions.coffee":2,"../stores/MessageStore.coffee":19,"../stores/StationStore.coffee":20,"./MemberComponent.coffee":3,"moment-timezone":14}],5:[function(require,module,exports){
},{"../actions/MessageActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/MessageActions.coffee","../actions/StationActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/StationActions.coffee","../stores/MessageStore.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/stores/MessageStore.coffee","../stores/StationStore.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/stores/StationStore.coffee","./MemberComponent.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/MemberComponent.coffee","moment-timezone":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/index.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/StationComponent.coffee":[function(require,module,exports){
var Member, StationActions, StationStore, a, div, h1, input, recl, ref, textarea;
recl = React.createClass;
@ -680,7 +683,7 @@ module.exports = recl({
},{"../actions/StationActions.coffee":2,"../stores/StationStore.coffee":20,"./MemberComponent.coffee":3}],6:[function(require,module,exports){
},{"../actions/StationActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/StationActions.coffee","../stores/StationStore.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/stores/StationStore.coffee","./MemberComponent.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/MemberComponent.coffee"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/WritingComponent.coffee":[function(require,module,exports){
var Member, MessageActions, MessageStore, StationActions, StationStore, br, div, input, recl, ref, textarea;
recl = React.createClass;
@ -957,7 +960,7 @@ module.exports = recl({
},{"../actions/MessageActions.coffee":1,"../actions/StationActions.coffee":2,"../stores/MessageStore.coffee":19,"../stores/StationStore.coffee":20,"./MemberComponent.coffee":3}],7:[function(require,module,exports){
},{"../actions/MessageActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/MessageActions.coffee","../actions/StationActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/StationActions.coffee","../stores/MessageStore.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/stores/MessageStore.coffee","../stores/StationStore.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/stores/StationStore.coffee","./MemberComponent.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/MemberComponent.coffee"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/dispatcher/Dispatcher.coffee":[function(require,module,exports){
var Dispatcher;
Dispatcher = require('flux').Dispatcher;
@ -979,7 +982,7 @@ module.exports = _.merge(new Dispatcher(), {
},{"flux":10}],8:[function(require,module,exports){
},{"flux":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/flux/index.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/main.coffee":[function(require,module,exports){
$(function() {
var $c, MessagesComponent, StationActions, StationComponent, WritingComponent, clean, rend;
StationActions = require('./actions/StationActions.coffee');
@ -1010,7 +1013,7 @@ $(function() {
},{"./actions/StationActions.coffee":2,"./components/MessagesComponent.coffee":4,"./components/StationComponent.coffee":5,"./components/WritingComponent.coffee":6,"./move.coffee":9,"./persistence/MessagePersistence.coffee":17,"./persistence/StationPersistence.coffee":18,"./util.coffee":21}],9:[function(require,module,exports){
},{"./actions/StationActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/StationActions.coffee","./components/MessagesComponent.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/MessagesComponent.coffee","./components/StationComponent.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/StationComponent.coffee","./components/WritingComponent.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/components/WritingComponent.coffee","./move.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/move.coffee","./persistence/MessagePersistence.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/persistence/MessagePersistence.coffee","./persistence/StationPersistence.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/persistence/StationPersistence.coffee","./util.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/util.coffee"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/move.coffee":[function(require,module,exports){
var ldy, setSo, so;
so = {};
@ -1111,7 +1114,7 @@ $(window).on('scroll', window.util.checkScroll);
},{}],10:[function(require,module,exports){
},{}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/flux/index.js":[function(require,module,exports){
/**
* Copyright (c) 2014-2015, Facebook, Inc.
* All rights reserved.
@ -1123,7 +1126,7 @@ $(window).on('scroll', window.util.checkScroll);
module.exports.Dispatcher = require('./lib/Dispatcher')
},{"./lib/Dispatcher":11}],11:[function(require,module,exports){
},{"./lib/Dispatcher":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/flux/lib/Dispatcher.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/flux/lib/Dispatcher.js":[function(require,module,exports){
/*
* Copyright (c) 2014, Facebook, Inc.
* All rights reserved.
@ -1375,7 +1378,7 @@ var _prefix = 'ID_';
module.exports = Dispatcher;
},{"./invariant":12}],12:[function(require,module,exports){
},{"./invariant":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/flux/lib/invariant.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/flux/lib/invariant.js":[function(require,module,exports){
/**
* Copyright (c) 2014, Facebook, Inc.
* All rights reserved.
@ -1430,8 +1433,8 @@ var invariant = function(condition, format, a, b, c, d, e, f) {
module.exports = invariant;
},{}],13:[function(require,module,exports){
module.exports={
},{}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/data/packed/latest.json":[function(require,module,exports){
module.exports=module.exports=module.exports=module.exports={
"version": "2014j",
"zones": [
"Africa/Abidjan|LMT GMT|g.8 0|01|-2ldXH.Q",
@ -2020,11 +2023,11 @@ module.exports={
"Pacific/Pohnpei|Pacific/Ponape"
]
}
},{}],14:[function(require,module,exports){
},{}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/index.js":[function(require,module,exports){
var moment = module.exports = require("./moment-timezone");
moment.tz.load(require('./data/packed/latest.json'));
},{"./data/packed/latest.json":13,"./moment-timezone":15}],15:[function(require,module,exports){
},{"./data/packed/latest.json":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/data/packed/latest.json","./moment-timezone":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/moment-timezone.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/moment-timezone.js":[function(require,module,exports){
//! moment-timezone.js
//! version : 0.2.5
//! author : Tim Wood
@ -2427,7 +2430,7 @@ moment.tz.load(require('./data/packed/latest.json'));
return moment;
}));
},{"moment":16}],16:[function(require,module,exports){
},{"moment":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/node_modules/moment/moment.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/node_modules/moment/moment.js":[function(require,module,exports){
//! moment.js
//! version : 2.10.3
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
@ -5539,7 +5542,7 @@ moment.tz.load(require('./data/packed/latest.json'));
return _moment;
}));
},{}],17:[function(require,module,exports){
},{}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/persistence/MessagePersistence.coffee":[function(require,module,exports){
var MessageActions;
MessageActions = require('../actions/MessageActions.coffee');
@ -5618,7 +5621,7 @@ module.exports = {
},{"../actions/MessageActions.coffee":1}],18:[function(require,module,exports){
},{"../actions/MessageActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/MessageActions.coffee"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/persistence/StationPersistence.coffee":[function(require,module,exports){
var StationActions;
StationActions = require('../actions/StationActions.coffee');
@ -5743,7 +5746,7 @@ module.exports = {
},{"../actions/StationActions.coffee":2}],19:[function(require,module,exports){
},{"../actions/StationActions.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/actions/StationActions.coffee"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/stores/MessageStore.coffee":[function(require,module,exports){
var EventEmitter, MessageDispatcher, MessageStore, _fetching, _last, _listening, _messages, _station, _typing, moment;
moment = require('moment-timezone');
@ -5889,7 +5892,7 @@ module.exports = MessageStore;
},{"../dispatcher/Dispatcher.coffee":7,"events":22,"moment-timezone":14}],20:[function(require,module,exports){
},{"../dispatcher/Dispatcher.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/dispatcher/Dispatcher.coffee","events":"/usr/local/lib/node_modules/watchify/node_modules/browserify/node_modules/events/events.js","moment-timezone":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/node_modules/moment-timezone/index.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/stores/StationStore.coffee":[function(require,module,exports){
var EventEmitter, StationDispatcher, StationStore, _audience, _config, _listening, _members, _station, _stations, _typing, _validAudience;
EventEmitter = require('events').EventEmitter;
@ -6089,7 +6092,7 @@ module.exports = StationStore;
},{"../dispatcher/Dispatcher.coffee":7,"events":22}],21:[function(require,module,exports){
},{"../dispatcher/Dispatcher.coffee":"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/dispatcher/Dispatcher.coffee","events":"/usr/local/lib/node_modules/watchify/node_modules/browserify/node_modules/events/events.js"}],"/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/util.coffee":[function(require,module,exports){
if (!window.util) {
window.util = {};
}
@ -6201,7 +6204,7 @@ _.merge(window.util, {
},{}],22:[function(require,module,exports){
},{}],"/usr/local/lib/node_modules/watchify/node_modules/browserify/node_modules/events/events.js":[function(require,module,exports){
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
@ -6261,8 +6264,10 @@ EventEmitter.prototype.emit = function(type) {
er = arguments[1];
if (er instanceof Error) {
throw er; // Unhandled 'error' event
} else {
throw TypeError('Uncaught, unspecified "error" event.');
}
throw TypeError('Uncaught, unspecified "error" event.');
return false;
}
}
@ -6504,4 +6509,4 @@ function isUndefined(arg) {
return arg === void 0;
}
},{}]},{},[8]);
},{}]},{},["/Users/galen/src/urbit-dev/urb/zod/base/pub/talk/src/js/main.coffee"]);

2
pub/test.sched
View File

@ -1,3 +1,3 @@
~1970.1.1 Hello world
~1970.2.1 Hallo world?
~1970.1.2 Reordered for goo reason
~1970.2.1 Hallo world?

23
pub/tree/src/css/main.css
View File

@ -127,24 +127,6 @@ h3 code {
font-size: inherit;
padding: 0.3rem;
}
#body > div > h1 {
height: 3rem;
}
#body > div > h1 span {
background-color: #000;
padding: 1rem;
margin-left: -1rem;
color: #fff;
}
#body > div > h2 {
height: 2.2rem;
}
#body > div > h2 span {
background-color: #c6c6c6;
padding: 0.6rem;
margin-left: -0.6rem;
color: #fff;
}
pre,
code {
font-size: 0.8rem;
@ -375,11 +357,6 @@ li:before {
.list h1 {
font-size: 0.7rem;
}
.list.default > li > a,
.list.default > li > a > h1,
.list.default li:before {
font-size: 1rem;
}
#body .CodeMirror {
font-size: 0.8rem;
line-height: 1rem;

23
pub/tree/src/css/main.styl
View File

@ -57,24 +57,6 @@ h3 code
font-size inherit
padding .3rem
#body > div > h1
height 3rem
#body > div > h1 span
background-color #000
padding 1rem
margin-left -1rem
color #fff
#body > div > h2
height 2.2rem
#body > div > h2 span
background-color rgba(198,198,198,1)
padding .6rem
margin-left -.6rem
color #fff
pre
code
font-size .8rem
@ -300,11 +282,6 @@ li:before
.list h1
font-size .7rem
.list.default > li > a
.list.default > li > a > h1
.list.default li:before
font-size 1rem
#body .CodeMirror
font-size .8rem
line-height 1rem