ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 17:41:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/next-sys' into ted/gall-q

Browse Source
This commit is contained in:
Ted Blackman 2021-02-19 13:42:58 -05:00
commit 674b5edb1f
3 changed files with 52 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/arvo/app/contact-store.hoon
View File

@ -101,7 +101,7 @@
== ==
:: ::
++ handle-initial ++ handle-initial
|= [rolo=rolodex:store is-public=?] |= [rolo=rolodex:store *]
^- (quip card _state) ^- (quip card _state)
=/ our-contact (~(got by rolodex) our.bowl) =/ our-contact (~(got by rolodex) our.bowl)
=/ diff-rolo=rolodex:store =/ diff-rolo=rolodex:store
@ -143,7 +143,7 @@
|= [=ship =edit-field:store timestamp=@da] |= [=ship =edit-field:store timestamp=@da]
|^ |^
^- (quip card _state) ^- (quip card _state)
=/ old (~(got by rolodex) ship) =/ old (fall (~(get by rolodex) ship) *contact:store)
?: (lte timestamp last-updated.old) ?: (lte timestamp last-updated.old)
[~ state] [~ state]
=/ contact (edit-contact old edit-field) =/ contact (edit-contact old edit-field)

12
pkg/arvo/app/settings-store.hoon
View File

@ -93,6 +93,18 @@
=/ entry=(unit val) (~(get by bucket) key) =/ entry=(unit val) (~(get by bucket) key)
?~ entry [~ ~] ?~ entry [~ ~]
``settings-data+!>(entry+u.entry) ``settings-data+!>(entry+u.entry)
::
[%x %has-bucket @ ~]
=* buc i.t.t.pax
=/ has-bucket=? (~(has by settings) buc)
``noun+!>(has-bucket)
::
[%x %has-entry @ @ ~]
=* buc i.t.t.pax
=* key i.t.t.t.pax
=/ =bucket (fall (~(get by settings) buc) ~)
=/ has-entry=? (~(has by bucket) key)
``noun+!>(has-entry)
== ==
:: ::
++ on-agent on-agent:def ++ on-agent on-agent:def

102
pkg/arvo/sys/vane/clay.hoon
View File

@ -807,75 +807,49 @@
++ pile-rule ++ pile-rule
|= pax=path |= pax=path
%- full %- full
%+ ifix [gay gay] %+ ifix
%+ cook |=(pile +<) :_ gay
;~ pfix
:: parse optional /? and ignore :: parse optional /? and ignore
:: ::
;~ pose ;~(plug gay (punt ;~(plug fas wut gap dem gap)))
(cold ~ ;~(plug fas wut gap dem gap)) |^
(easy ~) ;~ plug
%+ cook (bake zing (list (list taut)))
%+ rune hep
(most ;~(plug com gaw) taut-rule)
::
%+ cook (bake zing (list (list taut)))
%+ rune lus
(most ;~(plug com gaw) taut-rule)
::
%+ rune tis
;~(plug sym ;~(pfix gap fas (more fas urs:ab)))
::
%+ rune tar
;~ (glue gap)
sym
;~(pfix cen sym)
;~(pfix fas (more fas urs:ab))
== ==
:: ::
;~ plug %+ stag %tssg
;~ pose (most gap tall:(vang & pax))
;~ sfix
%+ cook |=((list (list taut)) (zing +<))
%+ more gap
;~ pfix ;~(plug fas hep gap)
(most ;~(plug com gaw) taut-rule)
==
gap
==
(easy ~)
==
::
;~ pose
;~ sfix
%+ cook |=((list (list taut)) (zing +<))
%+ more gap
;~ pfix ;~(plug fas lus gap)
(most ;~(plug com gaw) taut-rule)
==
gap
==
(easy ~)
==
::
;~ pose
;~ sfix
%+ cook |=((list [face=term =path]) +<)
%+ more gap
;~ pfix ;~(plug fas tis gap)
%+ cook |=([term path] +<)
;~(plug sym ;~(pfix ;~(plug gap fas) (more fas urs:ab)))
==
gap
==
(easy ~)
==
::
;~ pose
;~ sfix
%+ cook |=((list [face=term =mark =path]) +<)
%+ more gap
;~ pfix ;~(plug fas tar gap)
%+ cook |=([term mark path] +<)
;~ plug
sym
;~(pfix ;~(plug gap cen) sym)
;~(pfix ;~(plug gap fas) (more fas urs:ab))
==
==
gap
==
(easy ~)
==
::
%+ cook |=(huz=(list hoon) `hoon`tssg+huz)
(most gap tall:(vang & pax))
==
== ==
::
++ pant
|* fel=^rule
;~(pose fel (easy ~))
::
++ mast
|* [bus=^rule fel=^rule]
;~(sfix (more bus fel) bus)
::
++ rune
|* [bus=^rule fel=^rule]
%- pant
%+ mast gap
;~(pfix fas bus gap fel)
--
:: ::
++ taut-rule ++ taut-rule
%+ cook |=(taut +<) %+ cook |=(taut +<)