urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 21:03:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

added preliminary ++gage

Browse Source
This commit is contained in:
Philip C Monk 2015-02-09 18:38:03 -05:00
parent 43ffa183ce
commit 72ce8e7b52
4 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arvo/clay.hoon
View File

@ -3,7 +3,7 @@
:: ::
|= pit=vase |= pit=vase
=> |% => |%
++ bead ,[p=(set beam) q=cage] :: ford result ++ bead ,[p=(set beam) q=gage] :: ford result
++ cult (map duct rove) :: subscriptions ++ cult (map duct rove) :: subscriptions
++ dojo :: domestic desk state ++ dojo :: domestic desk state
$: qyx=cult :: subscribers $: qyx=cult :: subscribers
@ -484,6 +484,7 @@
yel yel
[[hen %note '!' %rose [" " "" ""] leaf/"clay diff failed" p.res] yel] [[hen %note '!' %rose [" " "" ""] leaf/"clay diff failed" p.res] yel]
== ==
?. ?=(@ p.q.p.res) ~| %bad-marc !!
=: lon.u.dok (skip lon.u.dok |=(path =(+< pax))) =: lon.u.dok (skip lon.u.dok |=(path =(+< pax)))
sot.u.dok [[pax %ins q.p.res] sot.u.dok] sot.u.dok [[pax %ins q.p.res] sot.u.dok]
== ==
@ -513,6 +514,7 @@
yel yel
[[hen %note '!' %rose [" " "" ""] leaf/"clay diff failed" p.res] yel] [[hen %note '!' %rose [" " "" ""] leaf/"clay diff failed" p.res] yel]
== ==
?. ?=(@ p.q.p.res) ~| %bad-marc !!
=: lon.u.dok (skip lon.u.dok |=(path =(+< pax))) =: lon.u.dok (skip lon.u.dok |=(path =(+< pax)))
sot.u.dok ?: =(%null p.q.p.res) sot.u.dok ?: =(%null p.q.p.res)
sot.u.dok sot.u.dok
@ -544,6 +546,7 @@
yel yel
[[hen %note '!' %rose [" " "" ""] leaf/"clay patch failed" p.res] yel] [[hen %note '!' %rose [" " "" ""] leaf/"clay patch failed" p.res] yel]
== ==
?. ?=(@ p.q.p.res) ~| %bad-marc !!
=: lon.u.pok (skip lon.u.pok |=(path =(+< pax))) =: lon.u.pok (skip lon.u.pok |=(path =(+< pax)))
sot.u.pok (~(put by sot.u.pok) pax %direct (mug q.p.res) q.p.res) sot.u.pok (~(put by sot.u.pok) pax %direct (mug q.p.res) q.p.res)
== ==
@ -573,6 +576,7 @@
yel yel
[[hen %note '!' %rose [" " "" ""] leaf/"clay patch failed" p.res] yel] [[hen %note '!' %rose [" " "" ""] leaf/"clay patch failed" p.res] yel]
== ==
?. ?=(@ p.q.p.res) ~| %bad-marc !!
=: lon.u.wok (skip lon.u.wok |=(path =(+< pax))) =: lon.u.wok (skip lon.u.wok |=(path =(+< pax)))
sot.u.wok [[pax `((hard mime) q.q.q.p.res)] sot.u.wok] sot.u.wok [[pax `((hard mime) q.q.q.p.res)] sot.u.wok]
== ==

68
arvo/ford.hoon
View File

@ -7,7 +7,7 @@
:: structures :: structures
|% |%
:: ::
++ bead ,[p=(set beam) q=cage] :: computed result ++ bead ,[p=(set beam) q=gage] :: computed result
++ gift :: out result <-$ ++ gift :: out result <-$
$% [%made p=(each bead (list tank))] :: computed result $% [%made p=(each bead (list tank))] :: computed result
== :: == ::
@ -71,14 +71,15 @@
[%call p=silk q=silk] :: slam [%call p=silk q=silk] :: slam
[%cast p=mark q=silk] :: translate [%cast p=mark q=silk] :: translate
[%diff p=silk q=silk] :: diff [%diff p=silk q=silk] :: diff
[%done p=(set beam) q=cage] :: literal [%done p=(set beam) q=gage] :: literal
[%dude p=tank q=silk] :: error wrap [%dude p=tank q=silk] :: error wrap
[%dune p=(set beam) q=(unit cage)] :: unit literal [%dune p=(set beam) q=(unit gage)] :: unit literal
[%mute p=silk q=(list (pair wing silk))] :: mutant [%mute p=silk q=(list (pair wing silk))] :: mutant
[%pact p=silk q=silk] :: patch [%pact p=silk q=silk] :: patch
[%plan p=beam q=spur r=hood] :: structured assembly [%plan p=beam q=spur r=hood] :: structured assembly
[%reef ~] :: kernel reef [%reef ~] :: kernel reef
[%ride p=twig q=silk] :: silk thru twig [%ride p=twig q=silk] :: silk thru twig
[%tabl p=(list (pair silk silk))] :: list
[%vale p=mark q=ship r=*] :: validate [our his] [%vale p=mark q=ship r=*] :: validate [our his]
== :: == ::
-- :: -- ::
@ -116,7 +117,7 @@
dep=(set beam) :: dependencies dep=(set beam) :: dependencies
== :: == ::
++ calx :: concrete cache line ++ calx :: concrete cache line
$% [%hood p=calm q=(pair beam cage) r=hood] :: compile $% [%hood p=calm q=(pair beam gage) r=hood] :: compile
[%slit p=calm q=[p=type q=type] r=type] :: slam type [%slit p=calm q=[p=type q=type] r=type] :: slam type
[%slim p=calm q=[p=type q=twig] r=(pair type nock)]:: mint [%slim p=calm q=[p=type q=twig] r=(pair type nock)]:: mint
[%slap p=calm q=[p=vase q=twig] r=vase] :: compute [%slap p=calm q=[p=vase q=twig] r=vase] :: compute
@ -158,8 +159,8 @@
^- cafe :: ^- cafe ::
[(grom p.a p.b) (grum q.a q.b)] :: [(grom p.a p.b) (grum q.a q.b)] ::
:: :: :: ::
++ faun |=([a=cafe b=vase] (fine a `cage`noun/b)) :: vase to cage ++ faun |=([a=cafe b=vase] (fine a `gage`noun/b)) :: vase to gage
++ feel |=([a=cafe b=cage] (fine a q.b)) :: cage to vase ++ feel |=([a=cafe b=gage] (fine a q.b)) :: gage to vase
++ fest |*([a=cafe b=*] (fine a [~ u=b])) :: bolt to unit ++ fest |*([a=cafe b=*] (fine a [~ u=b])) :: bolt to unit
++ fine |* [a=cafe b=*] :: bolt from data ++ fine |* [a=cafe b=*] :: bolt from data
[p=`cafe`a q=[%0 p=*(set beam) q=b]] :: [p=`cafe`a q=[%0 p=*(set beam) q=b]] ::
@ -387,14 +388,17 @@
:: ::
++ diff :: diff ++ diff :: diff
|= [cof=cafe kas=silk kos=silk] |= [cof=cafe kas=silk kos=silk]
^- (bolt cage) ^- (bolt gage)
%. [cof kas kos] %. [cof kas kos]
;~ cope ;~ cope
;~ coax ;~ coax
|=([cof=cafe p=silk q=silk] (make cof p)) |=([cof=cafe p=silk q=silk] (make cof p))
|=([cof=cafe p=silk q=silk] (make cof q)) |=([cof=cafe p=silk q=silk] (make cof q))
== ==
|= [cof=cafe cay=cage coy=cage] |= [cof=cafe cay=gage coy=gage]
?. &(?=(@ p.cay) ?=(@ p.coy))
~| %bad-diff-marc
!!
?. =(p.cay p.coy) ?. =(p.cay p.coy)
%+ flaw cof :_ ~ %+ flaw cof :_ ~
leaf/"diff on data of different marks: {(trip p.cay)} {(trip p.coy)}" leaf/"diff on data of different marks: {(trip p.cay)} {(trip p.coy)}"
@ -462,10 +466,10 @@
^- (bolt hood) ^- (bolt hood)
%+ cool |.(leaf/"ford: fade {<[(tope bem)]>}") %+ cool |.(leaf/"ford: fade {<[(tope bem)]>}")
%+ cope (make cof [%bake for bem ~]) %+ cope (make cof [%bake for bem ~])
|= [cof=cafe cay=cage] |= [cof=cafe cay=gage]
%+ (clef %hood) (fine cof bem cay) %+ (clef %hood) (fine cof bem cay)
^- (burg (pair beam cage) hood) ^- (burg (pair beam gage) hood)
|= [cof=cafe bum=beam cay=cage] |= [cof=cafe bum=beam cay=gage]
=+ rul=(fair bem) =+ rul=(fair bem)
?. ?=(@ q.q.cay) ?. ?=(@ q.q.cay)
(flaw cof ~) (flaw cof ~)
@ -636,18 +640,18 @@
:: ::
++ kale :: mutate ++ kale :: mutate
|= [cof=cafe kas=silk muy=(list (pair wing silk))] |= [cof=cafe kas=silk muy=(list (pair wing silk))]
^- (bolt cage) ^- (bolt gage)
%+ cope %+ cope
|- ^- (bolt (list (pair wing vase))) |- ^- (bolt (list (pair wing vase)))
?~ muy (fine cof ~) ?~ muy (fine cof ~)
%+ cope (make cof q.i.muy) %+ cope (make cof q.i.muy)
|= [cof=cafe cay=cage] |= [cof=cafe cay=gage]
%+ cope ^$(muy t.muy) %+ cope ^$(muy t.muy)
|= [cof=cafe rex=(list (pair wing vase))] |= [cof=cafe rex=(list (pair wing vase))]
(fine cof [[p.i.muy q.cay] rex]) (fine cof [[p.i.muy q.cay] rex])
|= [cof=cafe yom=(list (pair wing vase))] |= [cof=cafe yom=(list (pair wing vase))]
%+ cope (make cof kas) %+ cope (make cof kas)
|= [cof=cafe cay=cage] |= [cof=cafe cay=gage]
%+ cope (keel cof q.cay yom) %+ cope (keel cof q.cay yom)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof p.cay vax) (fine cof p.cay vax)
@ -782,7 +786,7 @@
?~ wuy (fine cof ~) ?~ wuy (fine cof ~)
?> ?=(^ u.wuy) ?> ?=(^ u.wuy)
%+ cope (make cof %bake i.u.wuy bem arg) %+ cope (make cof %bake i.u.wuy bem arg)
|= [cof=cafe hoc=cage] |= [cof=cafe hoc=gage]
%+ cope (lope cof i.u.wuy t.u.wuy -.bem q.hoc) %+ cope (lope cof i.u.wuy t.u.wuy -.bem q.hoc)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof ~ vax) (fine cof ~ vax)
@ -883,7 +887,7 @@
:: ::
++ make :: reduce silk ++ make :: reduce silk
|= [cof=cafe kas=silk] |= [cof=cafe kas=silk]
^- (bolt cage) ^- (bolt gage)
:: ~& [%make -.kas] :: ~& [%make -.kas]
?- -.kas ?- -.kas
^ ^
@ -894,7 +898,7 @@
|=([cof=cafe p=silk q=silk] ^$(cof cof, kas q.kas)) |=([cof=cafe p=silk q=silk] ^$(cof cof, kas q.kas))
== ==
:: ::
|= [cof=cafe bor=cage heg=cage] ^- (bolt cage) |= [cof=cafe bor=gage heg=gage] ^- (bolt gage)
[p=cof q=[%0 ~ [%$ (slop q.bor q.heg)]]] [p=cof q=[%0 ~ [%$ (slop q.bor q.heg)]]]
== ==
:: ::
@ -912,7 +916,7 @@
|= [cof=cafe bem=beam] |= [cof=cafe bem=beam]
%+ cope (lime cof p.kas bem r.kas) %+ cope (lime cof p.kas bem r.kas)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof `cage`[p.kas vax]) (fine cof `gage`[p.kas vax])
:: ::
%call %call
%+ cool |.(leaf/"ford: call {<`@p`(mug kas)>}") %+ cool |.(leaf/"ford: call {<`@p`(mug kas)>}")
@ -923,7 +927,7 @@
|=([cof=cafe p=silk q=silk] ^$(cof cof, kas q)) |=([cof=cafe p=silk q=silk] ^$(cof cof, kas q))
== ==
:: ::
|= [cof=cafe gat=cage sam=cage] |= [cof=cafe gat=gage sam=gage]
(maul cof q.gat q.sam) (maul cof q.gat q.sam)
:: ::
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
@ -933,9 +937,10 @@
%cast %cast
%+ cool |.(leaf/"ford: cast {<p.kas>}") %+ cool |.(leaf/"ford: cast {<p.kas>}")
%+ cope $(kas q.kas) %+ cope $(kas q.kas)
|= [cof=cafe cay=cage] |= [cof=cafe cay=gage]
^- (bolt cage) ^- (bolt gage)
%+ cool |.(leaf/"ford: casting {<p.cay>} to {<p.kas>}") %+ cool |.(leaf/"ford: casting {<p.cay>} to {<p.kas>}")
?. ?=(@ p.cay) ~| %bad-cast-marc !!
%+ cope (link cof p.kas p.cay [our %main %da now] q.cay) %+ cope (link cof p.kas p.cay [our %main %da now] q.cay)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof [p.kas vax]) (fine cof [p.kas vax])
@ -964,10 +969,24 @@
%ride %ride
%+ cool |.(leaf/"ford: ride {<`@p`(mug kas)>}") %+ cool |.(leaf/"ford: ride {<`@p`(mug kas)>}")
%+ cope $(kas q.kas) %+ cope $(kas q.kas)
|= [cof=cafe cay=cage] |= [cof=cafe cay=gage]
%+ cope (maim cof q.cay p.kas) %+ cope (maim cof q.cay p.kas)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof %noun vax) (fine cof %noun vax)
::
%tabl
%+ cope
|- ^- (bolt (pair (list (pair marc marc)) vase))
?~ p.kas (fine cof ~ *vase)
%+ cope (make cof p.i.p.kas)
|= [cof=cafe key=gage]
%+ cope (make cof q.i.p.kas)
|= [cof=cafe val=gage]
%+ cope ^^$(p.kas t.p.kas)
|= [cof=cafe rex=(list (pair marc marc)) rey=vase]
(fine cof [[p.key p.val] rex] (slop (slop q.key q.val) rey))
|= [cof=cafe rex=(list (pair marc marc)) rey=vase]
(fine cof [%tabl rex] !>(rex))
:: ::
%vale %vale
%+ cool |.(leaf/"ford: vale {<p.kas>} {<q.kas>} {<`@p`(mug r.kas)>}") %+ cool |.(leaf/"ford: vale {<p.kas>} {<q.kas>} {<`@p`(mug r.kas)>}")
@ -1276,14 +1295,15 @@
:: ::
++ pact :: patch ++ pact :: patch
|= [cof=cafe kas=silk kos=silk] |= [cof=cafe kas=silk kos=silk]
^- (bolt cage) ^- (bolt gage)
%. [cof kas kos] %. [cof kas kos]
;~ cope ;~ cope
;~ coax ;~ coax
|=([cof=cafe p=silk q=silk] (make cof p)) |=([cof=cafe p=silk q=silk] (make cof p))
|=([cof=cafe p=silk q=silk] (make cof q)) |=([cof=cafe p=silk q=silk] (make cof q))
== ==
|= [cof=cafe cay=cage coy=cage] |= [cof=cafe cay=gage coy=gage]
?. &(?=(@ p.cay) ?=(@ p.coy)) ~| %bad-pact-marc !!
%+ cope (fang cof p.cay [our %main %da now]) %+ cope (fang cof p.cay [our %main %da now])
|= [cof=cafe pro=vase] |= [cof=cafe pro=vase]
?. (slab %grad p.pro) ?. (slab %grad p.pro)

11
arvo/gall.hoon
View File

@ -8,7 +8,7 @@
$: %0 :: state version $: %0 :: state version
pol=(map ship mast) :: apps by ship pol=(map ship mast) :: apps by ship
== :: == ::
++ bead ,[p=(set beam) q=cage] :: computed result ++ bead ,[p=(set beam) q=gage] :: computed result
++ bone ,@ud :: opaque duct ++ bone ,@ud :: opaque duct
++ gift :: out result <-$ ++ gift :: out result <-$
$% [%back p=?] :: %mess ack good/bad $% [%back p=?] :: %mess ack good/bad
@ -392,7 +392,8 @@
[%give %crud %gasp-crud p.p.+.sih] [%give %crud %gasp-crud p.p.+.sih]
:: ::
%& %&
=+ cay=`cage`q.p.p.+.sih =+ cay=`gage`q.p.p.+.sih
?. ?=(@ p.cay) ~| %bad-marc !!
?+ -.pax !! ?+ -.pax !!
%d [%give (best %rush cay)] %d [%give (best %rush cay)]
%f [%give (best %rust cay)] %f [%give (best %rust cay)]
@ -417,7 +418,8 @@
:_ ~ :- hen :_ ~ :- hen
?- -.p.+.sih ?- -.p.+.sih
%| [%give %mean ~ %ford-fail p.p.+.sih] %| [%give %mean ~ %ford-fail p.p.+.sih]
%& [%pass [%r pax] %g %mess [our imp] you `cage`q.p.p.+.sih] %& ?. ?=(@ p.q.p.p.+.sih) ~| %bad-marc !!
[%pass [%r pax] %g %mess [our imp] you `cage`q.p.p.+.sih]
== ==
:: ::
%g %g
@ -822,7 +824,8 @@
^- [(unit cage) _+>] ^- [(unit cage) _+>]
?> ?=(%f -.sih) ?> ?=(%f -.sih)
?- -.p.+.sih ?- -.p.+.sih
& [`q.p.p.+.sih +>.$] & ?. ?=(@ p.q.p.p.+.sih) ~| %bad-marc !!
[`q.p.p.+.sih +>.$]
| [~ (give %crud %murk-made p.p.+.sih)] | [~ (give %crud %murk-made p.p.+.sih)]
== ==
:: ::

5
arvo/hoon.hoon
View File

@ -9745,6 +9745,7 @@
== :: == ::
++ curd ,[p=@tas q=*] :: typeless card ++ curd ,[p=@tas q=*] :: typeless card
++ duct (list wire) :: causal history ++ duct (list wire) :: causal history
++ gage (pair marc vase) :: structured cage
++ hide :: standard app state ++ hide :: standard app state
$: $: our=ship :: owner/operator $: $: our=ship :: owner/operator
app=term :: app identity app=term :: app identity
@ -9774,6 +9775,10 @@
++ y *(unit (unit arch)) :: directory ++ y *(unit (unit arch)) :: directory
++ z *(unit (unit cage)) :: current subtree ++ z *(unit (unit cage)) :: current subtree
-- :: -- ::
++ marc :: structured mark
$| mark :: plain mark
$% [%tabl p=(list (pair marc marc))] :: map
== ::
++ mark ,@tas :: content type ++ mark ,@tas :: content type
++ mill (each vase milt) :: vase/metavase ++ mill (each vase milt) :: vase/metavase
++ milt ,[p=* q=*] :: metavase ++ milt ,[p=* q=*] :: metavase