urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-07 05:26:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Hand-merged ford, zuse and hoon from newgall.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-05-06 18:41:20 -07:00
parent f7de17cf48
commit 3295f1797b
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/arvo/ford.hoon
View File

@ -210,10 +210,6 @@
=+ gib=(wox p.n.r.arc) =+ gib=(wox p.n.r.arc)
?~(gib rac [[u.gib p.n.r.arc] rac]) ?~(gib rac [[u.gib p.n.r.arc] rac])
:: ::
++ slob :: XX belongs in h/h
|= [cog=@tas typ=type]
(~(has in (sa (sloe typ))) cog)
::
++ norm :: normalize beam rev ++ norm :: normalize beam rev
|= [ska=sled bem=beam] |= [ska=sled bem=beam]
%_ bem %_ bem

20
base/arvo/hoon.hoon
View File

@ -61,6 +61,7 @@
[%many p=(list coin)] :: [%many p=(list coin)] ::
== :: == ::
++ cord ,@t :: text atom (UTF-8) ++ cord ,@t :: text atom (UTF-8)
++ dock (pair ,@p term) :: message target
++ date ,[[a=? y=@ud] m=@ud t=tarp] :: parsed date ++ date ,[[a=? y=@ud] m=@ud t=tarp] :: parsed date
++ dime ,[p=@ta q=@] :: ++ dime ,[p=@ta q=@] ::
++ each |*([a=$+(* *) b=$+(* *)] $%([& p=a] [| p=b])) :: either a or b ++ each |*([a=$+(* *) b=$+(* *)] $%([& p=a] [| p=b])) :: either a or b
@ -101,6 +102,8 @@
++ nail ,[p=hair q=tape] :: parsing input ++ nail ,[p=hair q=tape] :: parsing input
++ numb ,@ :: just a number ++ numb ,@ :: just a number
++ pair |*([a=$+(* *) b=$+(* *)] ,[p=a q=b]) :: just a pair ++ pair |*([a=$+(* *) b=$+(* *)] ,[p=a q=b]) :: just a pair
++ quid |*([a=$+(* *) b=*] ,[a _b]) :: for =^
++ quip |*([a=$+(* *) b=*] ,[(list a) _b]) :: for =^
++ wand |* a=(pole $+(* *)) :: hetero list ++ wand |* a=(pole $+(* *)) :: hetero list
|= b=* :: |= b=* ::
?~ a ~ :: ?~ a ~ ::
@ -5781,6 +5784,14 @@
|= [cog=@tas typ=type] |= [cog=@tas typ=type]
!=(~ q:(~(fino ut typ) 0 %free cog)) !=(~ q:(~(fino ut typ) 0 %free cog))
:: ::
++ slob :: superficial arm
|= [cog=@tas typ=type]
^- ?
?+ typ |
[%hold *] $(typ ~(repo ut typ))
[%core *] (~(has by q.r.q.typ) cog)
==
::
++ sloe :: get arms in core ++ sloe :: get arms in core
|= typ=type |= typ=type
^- (list term) ^- (list term)
@ -9016,7 +9027,7 @@
++ expv |.(;~(gunk lobe wisp)) :: tile, core tail ++ expv |.(;~(gunk lobe wisp)) :: tile, core tail
++ expw |.(;~(gunk lobe teak)) :: tile and tiki ++ expw |.(;~(gunk lobe teak)) :: tile and tiki
++ expx |.((butt ;~(gunk teak race))) :: tiki, [tile twig]s ++ expx |.((butt ;~(gunk teak race))) :: tiki, [tile twig]s
++ expy |.((butt ;~(gunk teak loaf race))) :: tiki twig [tile twig]s ++ expy |.((butt ;~(gunk teak loaf race))) :: tk twig [tile twig]s
++ expz |.(loaf(bug &)) :: twig with tracing ++ expz |.(loaf(bug &)) :: twig with tracing
:: Hint syntaces (nock 10) :: Hint syntaces (nock 10)
++ hinb |.(;~(gunk bont loaf)) :: hint and twig ++ hinb |.(;~(gunk bont loaf)) :: hint and twig
@ -9397,12 +9408,13 @@
++ cage (cask vase) :: global metadata ++ cage (cask vase) :: global metadata
++ cask |*(a=_,* (pair mark a)) :: global data ++ cask |*(a=_,* (pair mark a)) :: global data
++ cuff :: permissions ++ cuff :: permissions
$: p=kirk :: readers $: p=(unit (set monk)) :: can be read by
q=(set monk) :: authors q=(set monk) :: caused or created by
== :: == ::
++ 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 ++ gage (pair marc vase) :: structured cage
++ from ,[ost=bone src=ship] :: forward problem
++ hide :: standard app state ++ hide :: standard app state
$: $: our=ship :: owner/operator $: $: our=ship :: owner/operator
app=term :: app identity app=term :: app identity
@ -9458,6 +9470,7 @@
++ slad $+ [(unit (set monk)) term beam] :: undertyped ++ slad $+ [(unit (set monk)) term beam] :: undertyped
(unit (unit (cask))) :: (unit (unit (cask))) ::
++ slut $+(* (unit (unit))) :: old namespace ++ slut $+(* (unit (unit))) :: old namespace
++ then ,[ost=bone src=ship way=wire] :: backward problem
++ vile :: reflexive constants ++ vile :: reflexive constants
$: typ=type :: -:!>(*type) $: typ=type :: -:!>(*type)
duc=type :: -:!>(*duct) duc=type :: -:!>(*duct)
@ -9801,6 +9814,7 @@
|= [lac=? gum=muse] |= [lac=? gum=muse]
^- [[p=(list ovum) q=(list muse)] _niz] ^- [[p=(list ovum) q=(list muse)] _niz]
:: =. lac |(lac ?=(?(%g %f) p.gum)) :: =. lac |(lac ?=(?(%g %f) p.gum))
:: =. lac &(lac !?=(%b p.gum))
%+ fire %+ fire
p.gum p.gum
?- -.r.gum ?- -.r.gum

4
base/arvo/zuse.hoon
View File

@ -1894,10 +1894,6 @@
cip=(each ,@if ,@is) :: client IP cip=(each ,@if ,@is) :: client IP
cum=(map ,@tas ,*) :: custom dirt cum=(map ,@tas ,*) :: custom dirt
== :: == ::
++ cuff :: permissions
$: p=(unit (set monk)) :: readers
q=(set monk) :: authors
== ::
++ deed ,[p=@ q=step r=?] :: sig, stage, fake? ++ deed ,[p=@ q=step r=?] :: sig, stage, fake?
++ dome :: project state ++ dome :: project state
$: ank=ankh :: state $: ank=ankh :: state