flatten references to title,wired,differ,crypto,chrono

This commit is contained in:
Anton Dyudin 2016-11-30 17:22:43 -08:00
parent 03834e67f0
commit 5f357346d8
17 changed files with 51 additions and 65 deletions

View File

@ -818,7 +818,7 @@
=. egg +(egg)
=- ?~(msg ..he-diff (he-diff %tan leaf+u.msg ~))
^- msg/(unit tape)
?+ (clan:title:jael our.hid) ~
?+ (clan:title our.hid) ~
$pawn ?+ egg ~
$5 `":: To request a planet, run |ask 'your@email.co'"
== ==
@ -1123,7 +1123,7 @@
::
++ peer-sole
~? !=(our.hid src.hid) [%dojo-peer-stranger ost.hid src.hid]
?> (team:title:jael our.hid src.hid)
?> (team:title our.hid src.hid)
=^ moz .
?. (~(has by hoc) ost.hid) [~ .]
~& [%dojo-peer-replaced ost.hid]

View File

@ -220,7 +220,7 @@
;~ pose
(cold [our.hid man.she] col)
;~(pfix cen (stag our.hid sym))
;~(pfix fas (stag (sein:title:jael our.hid) sym))
;~(pfix fas (stag (sein:title our.hid) sym))
::
%+ cook
|= {a/@p b/(unit term)}
@ -1649,7 +1649,7 @@
?- p.cordon.shape
$black &
$green &
$brown (team:title:jael our.hid her)
$brown (team:title our.hid her)
$white (~(has in q.cordon.shape) her)
==
::
@ -1959,7 +1959,7 @@
++ sn-curt :: render name in 14
|= mup/?
^- tape
=+ raw=(cite:title:jael p.one)
=+ raw=(cite:title p.one)
(runt [(sub 14 (lent raw)) ' '] raw)
::
++ sn-nick
@ -1979,7 +1979,7 @@
?: =(q.one man)
":"
['%' (trip q.one)]
?: =(p.one (sein:title:jael our.hid))
?: =(p.one (sein:title our.hid))
['/' (trip q.one)]
=+ wun=(scow %p p.one)
?: =(q.one (main p.one))
@ -2223,7 +2223,7 @@
~? !=(src.hid our.hid) [%peer-talk-stranger src.hid]
:: ~& [%talk-peer src.hid ost.hid pax]
?: ?=({$sole *} pax)
?> (team:title:jael our.hid src.hid)
?> (team:title our.hid src.hid)
~? (~(has by shells) ost.hid) [%talk-peer-replaced ost.hid pax]
ra-abet:(ra-console:ra src.hid t.pax)
:: ~& [%talk-peer-data ost.hid src.hid pax]

View File

@ -7,7 +7,7 @@
:::: :::::: ames structures
:: :: ::
=, ^ames
=, crypto:ames
=, crypto
|% ::
++ bait {p/skin q/@ud r/dove} :: fmt nrecvd spec
++ bath :: per friend
@ -576,7 +576,7 @@
?>((pier i.wet) [i.wet ~])
?~ q.p.q.i.wet
?>((meld i.wet i.law) [i.wet law])
=+ rul=(sein:title:jael r.p.q.i.wet)
=+ rul=(sein:title r.p.q.i.wet)
|- ^- wyll
?: ?& =(rul r.p.q.i.law)
=(p.p.q.i.law u.q.p.q.i.wet)
@ -595,7 +595,7 @@
++ melt :: proper connect
|= {new/deyd old/deyd}
^- ?
=+ rac=(clan:title:jael r.p.q.new)
=+ rac=(clan:title r.p.q.new)
?& =(r.new r.old) :: match fake
?~ q.p.q.new
?& =(r.p.q.old r.p.q.new)
@ -603,7 +603,7 @@
==
?& &(!=(%pawn rac) !=(%czar rac))
|(=(0 p.p.q.new) =(%earl rac))
=(r.p.q.old (sein:title:jael r.p.q.new))
=(r.p.q.old (sein:title r.p.q.new))
=(p.p.q.old u.q.p.q.new)
==
==
@ -624,7 +624,7 @@
++ pier !: :: initial deyd
|= wed/deyd
^- $&
?> =+ rac=(clan:title:jael r.p.q.wed)
?> =+ rac=(clan:title r.p.q.wed)
=+ loy=(haul:suite r.q.wed)
?: &(r.wed =(rac %czar)) %&
?> =(0 p.p.q.wed)
@ -978,7 +978,7 @@
++ born :: born:as:go
|= {now/@da her/@p tic/@pG ges/gens pub/pass} :: register user
^- {(unit wyll) _+>}
?. =(our (sein:title:jael her)) [~ +>.$]
?. =(our (sein:title her)) [~ +>.$]
=+ nes=sen
=+ ryt=(end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes))))
?. =(tic ryt)
@ -1106,7 +1106,7 @@
::
++ xeno :: xeno:lax:as:go
^- (list ship) :: foreign canon
(saxo:title:jael her)
(saxo:title her)
::
++ xong :: xong:lax:as:go
^- (list ship) :: route unto
@ -1230,7 +1230,7 @@
::
++ xen :: canon
|- ^- (list ship)
(saxo:title:jael our)
(saxo:title our)
::
++ yew :: best wyll for
|= her/ship
@ -1238,7 +1238,7 @@
=+ gel=(~(get by hoc.saf) her)
?^ gel
lew.wod.u.gel
?:((lth her 256) ~ $(her (sein:title:jael her)))
?:((lth her 256) ~ $(her (sein:title her)))
-- :: --as:go
::
++ ha !: :: adopt new license
@ -1256,7 +1256,7 @@
our
:* %- flop
|- ^- (list ship)
?:((lth our 256) ~ =+(seg=(sein:title:jael our) [seg $(our seg)]))
?:((lth our 256) ~ =+(seg=(sein:title our) [seg $(our seg)]))
::
(turn mac |=({p/life q/ring} [p q (weur:suite q)]))
wil
@ -1376,7 +1376,7 @@
:: install it as a symmetric key.
::
=+ key=(shax ger)
=+ dad=(sein:title:jael her)
=+ dad=(sein:title her)
~& [%user-auth her `@p`ger `@p`(mug key)]
=+ gus=(need (~(us go ton.fox) her))
=+ diz=(wasc:(myx:gus dad) key)
@ -2167,7 +2167,7 @@
!>
?~ wul
(scot %p his)
(gnow:title:jael his q.q.q:((hard deyd) -.u.wul))
(gnow:title his q.q.q:((hard deyd) -.u.wul))
?: ?=({$gcos $~} tyl)
=+ wul=$(tyl [%wyll ~])
?~(wul ~ ``[%noun !>(`gcos`q.q.q:((hard deyd) -.u.wul))])
@ -2180,7 +2180,7 @@
%+ bind (rick mar his lew.wod.u.fod)
|=(a/wyll `[%noun !>(a)])
?: ?=({$tick $~} tyl)
?. =(our (sein:title:jael his)) ~
?. =(our (sein:title his)) ~
``[%noun !>((end 6 1 (shaf %tick (mix his (shax sec:ex:q:sen:u.gys)))))]
~
?: ?=({$buck $~} tyl)

View File

@ -2188,7 +2188,6 @@
=+ mar=(lobe-to-mark u.lob)
?. ?=($hoon mar)
[~ ~ %| u.lob]
=* differ differ:clay
=* lines lines:clay
:^ ~ ~ %&
:+ mar [%atom %t ~]
@ -3287,7 +3286,7 @@
?< (~(has by fat.ruf) p.q.hic)
(~(put by fat.ruf) p.q.hic [-(hun hen)]:[*room .])
==
=+ [bos=(sein:title:jael p.q.hic) can=(clan:title:jael p.q.hic)]
=+ [bos=(sein:title p.q.hic) can=(clan:title p.q.hic)]
%- zing ^- (list (list move))
:~ ?: =(bos p.q.hic) ~
[hen %pass /init-merge %c %merg p.q.hic %base bos %kids da+now %init]~

View File

@ -120,7 +120,7 @@
$heft heft
$tick =+ ^= ges ^- gens:^ames
:- %en
=+ can=(clan:title:jael p.kyz)
=+ can=(clan:title p.kyz)
?- can
$czar [%czar ~]
$duke [%duke %anon ~]
@ -267,12 +267,12 @@
++ init :: initialize
~& [%dill-init our ram]
=+ myt=(flop (need tem))
=+ can=(clan:title:jael our)
=+ can=(clan:title our)
=. tem ~
=. moz :_(moz [hen %pass / %c %merg our %home our %base da+now %init])
=. moz :_(moz [hen %pass ~ %g %conf [[our ram] %load our %home]])
=. +> ?: ?=(?($czar $pawn) can) +>
(sync %base (sein:title:jael our) %kids)
(sync %base (sein:title our) %kids)
=. +> ?: ?=(?($czar $pawn) can)
(sync %home our %base)
(init-sync %home our %base)

View File

@ -3,12 +3,12 @@
::::
|= pit/vase
=, ^eyre
=, crypto:ames
=, crypto
=, space:clay
=, bytes:eyre
=, js:eyre
=, url:eyre
=, wired:eyre
=, wired
=, xml:eyre
=> =~
|% :: interfaces
@ -1689,7 +1689,7 @@
%- jobe :~
oryx+s+orx
ixor+s+(oryx-to-ixor orx)
sein+(jape +:<(sein:title:jael our)>)
sein+(jape +:<(sein:title our)>)
ship+(jape +:<our>)
user+(jape +:<(fall get-user anon)>) :: XX crash on unsaved session?
==

View File

@ -1760,7 +1760,7 @@
++ pact-hoon :: .hoon special case
|= {a/@t b/(urge:^clay cord)} ^- @t
~| %lurk-hoon
(role:lines:clay (lurk:differ:clay (lore:lines:clay a) b))
(role:lines:clay (lurk:differ (lore:lines:clay a) b))
::
++ pact :: patch
|= {cof/cafe kas/silk kos/silk}

View File

@ -19,8 +19,8 @@
=, pki:^jael
=, rights:^jael
=, able:^jael
=, title:jael
=, crypto:ames
=, title
=, crypto
=* womb womb:^jael
=, jael
:: ::::
@ -913,7 +913,7 @@
~(able ~(ex ur urb) who)
::
++ read-womb
=, wired:eyre :: XX ":eyre"
=, wired :: XX ":eyre"
=, womb
|= pax/path ^- (unit scry:womb)
?~ pax ~

View File

@ -4396,18 +4396,10 @@
::
::
:: XX transitional alias layer
++ ames ^?
|%
++ crypto crypto:+
++ number number:+
--
++ behn ^?
|%
++ chrono chrono:userlib
--
++ ames !!
++ behn !!
++ clay ^?
|%
++ differ differ:+
++ lines [[lore=to-wain role=of-wain]:format unix:userlib]
++ space [[tome=of-path tope=to-path]:format space:userlib]
--
@ -4440,13 +4432,8 @@
++ urlp de-purl
++ fuel fuel:+
--
++ wired wired:+
--
++ ford !!
++ gall !!
++ jael ^?
|%
++ title title:+
--
++ jael !!
-- ::

View File

@ -77,7 +77,7 @@
|= our/ship
%- ~(gas in *(set well:^gall))
^- (list well:^gall)
=+ myr=(clan:title:jael our)
=+ myr=(clan:title our)
?: ?=($pawn myr)
[[%base %talk] [%base %dojo] ~]
?: ?=($earl myr)
@ -88,8 +88,8 @@
|= our/ship
%- ~(gas in *(set gill:^gall))
^- (list gill:^gall)
?: ?=($earl (clan:title:jael our))
[[(sein:title:jael our) %talk] [our %dojo] ~]
?: ?=($earl (clan:title our))
[[(sein:title our) %talk] [our %dojo] ~]
[[our %talk] [our %dojo] ~]
::
++ drum-make :: initial part
@ -147,7 +147,7 @@
++ peer ::
|= pax/path
~| [%drum-unauthorized our+our.hid src+src.hid] :: ourself
?> (team:title:jael our.hid src.hid) :: or our own moon
?> (team:title our.hid src.hid) :: or our own moon
=< se-abet =< se-view
(se-text "[{<src.hid>}, driving {<our.hid>}]")
::
@ -787,8 +787,8 @@
%_ pom
cad
;: welp
?. ?=($earl (clan:title:jael p.gyl))
(cite:title:jael p.gyl)
?. ?=($earl (clan:title p.gyl))
(cite:title p.gyl)
(scow %p p.gyl)
::
":"

View File

@ -80,9 +80,9 @@
|= hood-begin =< abet
?> ?=($~ bur)
=+ buz=(shaz :(mix (jam ges) eny))
=+ loy=(pit:nu:crub:crypto:ames 512 buz)
=+ loy=(pit:nu:crub:crypto 512 buz)
%- emit(bur `[his [0 sec:ex:loy]~])
[%wont /helm/ticket [our (sein:title:jael his)] /a/ta his tic ges pub:ex:loy]
[%wont /helm/ticket [our (sein:title his)] /a/ta his tic ges pub:ex:loy]
::
++ poke-spawn
|= {him/ship key/@pG} =< abet
@ -204,7 +204,7 @@
=< abet
%- emil(bur ~)
:~ [%cash /helm p.u.bur q.u.bur u.wil]
[%poke /helm [our %hood] %hood-unsync %base (sein:title:jael our) %kids]
[%poke /helm [our %hood] %hood-unsync %base (sein:title our) %kids]
==
::
++ poke-verb :: toggle verbose

View File

@ -12,7 +12,7 @@
|_ bol/bowl:^gall
++ main :: main story
|= our/ship ^- cord
=+ can=(clan:title:jael our)
=+ can=(clan:title our)
?+ can %porch
$czar %court
$king %floor

View File

@ -11,7 +11,7 @@
=, js:eyre
=, url:eyre
=, xml:eyre
=, chrono:behn
=, chrono:userlib
::
:::: functions
::

View File

@ -3,8 +3,8 @@
:: :: ::
/? 310 :: version
/+ talk, old-phon
=, wired:eyre
=, title:jael
=, wired
=, title
=, womb:^jael
:: :: ::
:::: :: ::
@ -390,7 +390,7 @@
=; dif (emit %info /backup [our dif])
%+ foal:space:clay
(welp pax /jam-crub)
[%jam-crub !>((en:crub:crypto:ames pas (jam `part`+:abet)))]
[%jam-crub !>((en:crub:crypto pas (jam `part`+:abet)))]
::
++ poke-rekey :: extend wyll
|= $~

View File

@ -116,7 +116,7 @@
|= {hot/host:^eyre dat/@}
?> ?=($& -.hot)
=. p.hot (scag 2 p.hot) :: ignore subdomain
=. dat (scot %uw (en:crua:crypto:ames ames-secret dat))
=. dat (scot %uw (en:crua:crypto ames-secret dat))
(poke--data [`%atom [%sec p.hot]] %mime / (taco:bytes:eyre dat))
::
++ poke--data

View File

@ -4,7 +4,7 @@
/? 310
::
=, ^clay
=, differ:clay
=, differ
=, lines:clay
=, bytes:eyre
|_ txt/wain

View File

@ -6,7 +6,7 @@
/= tub /$ |=({bem/beam *} (flop s.bem))
/= aut
/$ %+ cork fuel:url:eyre :: after parsing params,
=, title:jael
=, title
|= gas/epic:^eyre ^- ? :: check that the fcgi
%+ lien (~(tap in (~(get ju aut.ced.gas) %$))) :: has an identity
|=(a/knot !=(%pawn (clan (slav %p a)))) :: which isn't a comet