mirror of
https://github.com/urbit/shrub.git
synced 2024-12-04 14:58:10 +03:00
%atom now fully converted to %moat.
This commit is contained in:
C. Guy Yarvin
parent
8e05cb7ce1
commit
c1a3d64a28
@ -331,7 +331,7 @@
|
||||
%^ blab hen [%w [%ud ins] ~]
|
||||
:- %&
|
||||
?~ hip
|
||||
[%null [%atom %n] ~]
|
||||
[%null [%moat %n ~] ~]
|
||||
[%nako !>((make-nako:ze u.hip))]
|
||||
::
|
||||
++ blub :: ship stop
|
||||
@ -452,7 +452,7 @@
|
||||
~& [%oh-no rave=rav aeon=yon letdom=let.dom]
|
||||
+>.^$
|
||||
?~ u.var
|
||||
(blab hen p.rav %& %null [%atom %n] ~) :: only her %x
|
||||
(blab hen p.rav %& %null [%moat %n ~] ~) :: only her %x
|
||||
?: (equivalent-data:ze u.u.ver u.u.var)
|
||||
$(yon +(yon))
|
||||
(blab hen p.rav u.u.var)
|
||||
@ -623,7 +623,7 @@
|
||||
^- (pair path cage)
|
||||
?> ?=($ins -.mis)
|
||||
=+ =>((flop pax) ?~(. %$ i))
|
||||
[pax - [%atom %t] ((hard @t) +>.q.q.p.mis)]
|
||||
[pax - [%moat %t ~] ((hard @t) +>.q.q.p.mis)]
|
||||
::
|
||||
~
|
||||
::
|
||||
@ -1029,7 +1029,7 @@
|
||||
p.r.u.rut
|
||||
?+ p.r.u.rut ~| %strange-w-over-nextwork !!
|
||||
$aeon !>(((hard aeon) q.r.u.rut))
|
||||
$null [[%atom %n] ~]
|
||||
$null [[%moat %n ~] ~]
|
||||
$nako !>(~|([%harding [&1 &2 &3]:q.r.u.rut] ((hard nako) q.r.u.rut)))
|
||||
==
|
||||
?. ?=($nako p.r.u.rut) [?>(?=(^ ref) .)]:wake
|
||||
@ -1210,7 +1210,7 @@
|
||||
~& [%oh-noes mood=mun letdom=let.dom]
|
||||
$(xiq t.xiq)
|
||||
?~ u.var
|
||||
$(xiq t.xiq, ..wake (blab p.i.xiq mun %& %null [%atom %n] ~))
|
||||
$(xiq t.xiq, ..wake (blab p.i.xiq mun %& %null [%moat %n ~] ~))
|
||||
?: (equivalent-data:ze u.q.q.i.xiq u.u.var)
|
||||
$(xiq t.xiq, xaq [i.xiq xaq])
|
||||
$(xiq t.xiq, ..wake (blab p.i.xiq mun u.u.var))
|
||||
@ -1517,7 +1517,7 @@
|
||||
|= ren/$?($u $v $x $y $z) :: endpoint query
|
||||
^- (unit cage)
|
||||
?- ren
|
||||
$u !! :: [~ %null [%atom %n] ~]
|
||||
$u !! :: [~ %null [%moat %n ~] ~]
|
||||
$v [~ %dome !>(dom)]
|
||||
$x !! :: ?~(q.ank.dom ~ [~ q.u.q.ank.dom])
|
||||
$y !! :: [~ %arch !>(as-arch)]
|
||||
@ -1586,7 +1586,7 @@
|
||||
=+ tak=(~(get by hit.dom) yon)
|
||||
?~ tak
|
||||
~
|
||||
```[%null [%atom %n] ~]
|
||||
```[%null [%moat %n ~] ~]
|
||||
::
|
||||
++ read-v
|
||||
|= {yon/aeon pax/path}
|
||||
@ -1618,7 +1618,7 @@
|
||||
?. ?=(?($hoon $hook) mar)
|
||||
[~ ~ %| u.lob]
|
||||
:^ ~ ~ %&
|
||||
:+ mar [%atom %t]
|
||||
:+ mar [%moat %t ~]
|
||||
|- ^- @t :: (urge cord) would be faster
|
||||
=+ bol=(lobe-to-blob u.lob)
|
||||
?: ?=($direct -.bol)
|
||||
|
||||
@ -266,7 +266,7 @@
|
||||
moz
|
||||
:_ moz
|
||||
:* hen %pass /autoload %g %deal [our our]
|
||||
ram %poke %kiln-start-autoload [%cube ~ [%atom %n]] ~
|
||||
ram %poke %kiln-start-autoload [%cube ~ [%moat %n ~]] ~
|
||||
==
|
||||
==
|
||||
::
|
||||
|
||||
@ -537,7 +537,7 @@
|
||||
%+ 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] ~)
|
||||
(fine cof %& %null [%moat %n ~] ~)
|
||||
::
|
||||
%+ cope (fang cof p.cay)
|
||||
|= {cof/cafe pro/vase}
|
||||
@ -863,13 +863,13 @@
|
||||
?: =(q.q.cay q.q.coy)
|
||||
(fine cof %& cay)
|
||||
?. (slab %mash p.gar)
|
||||
(fine cof %& %null [%atom %n] ~)
|
||||
(fine cof %& %null [%moat %n ~] ~)
|
||||
%+ cope
|
||||
%^ maul cof
|
||||
(slap (slap pro [%limb %grad]) [%limb %mash])
|
||||
%+ slop
|
||||
:(slop [[%atom %p] p.mas] [[%atom %tas] q.mas] q.cay)
|
||||
:(slop [[%atom %p] p.mos] [[%atom %tas] q.mos] q.coy)
|
||||
:(slop [[%moat %p ~] p.mas] [[%moat %tas ~] q.mas] q.cay)
|
||||
:(slop [[%moat %p ~] p.mos] [[%moat %tas ~] q.mos] q.coy)
|
||||
(flux |=(dif/vase [%& u.fom dif]))
|
||||
==
|
||||
::
|
||||
@ -902,7 +902,7 @@
|
||||
%^ maim cof
|
||||
%+ slop suh
|
||||
|- ^- vase
|
||||
?~ yom [[%atom %n] ~]
|
||||
?~ yom [[%moat %n ~] ~]
|
||||
(slop q.i.yom $(yom t.yom))
|
||||
^- twig
|
||||
:+ %cncb [%& 2]~
|
||||
@ -1010,7 +1010,7 @@
|
||||
=+ mas=((soft @t) q.sam)
|
||||
?~ mas
|
||||
(flaw cof [leaf+"ford: bad hoon or hook: {<[for bek]>}"]~)
|
||||
(fine cof [%atom %t] u.mas)
|
||||
(fine cof [%moat %t ~] u.mas)
|
||||
%+ cope (fang cof for)
|
||||
|= {cof/cafe tux/vase}
|
||||
=+ typ=p:(slot 6 tux)
|
||||
@ -1309,7 +1309,7 @@
|
||||
$bunt
|
||||
%+ cool |.(leaf+"ford: bunt {<p.kas>}")
|
||||
?: ?=(?($hoon $hook) p.kas)
|
||||
(fine cof %& p.kas [%atom %t] '')
|
||||
(fine cof %& p.kas [%moat %t ~] '')
|
||||
%+ cope (fang cof p.kas)
|
||||
|= {cof/cafe tux/vase}
|
||||
=+ [typ=p val=q]:(slot 6 tux)
|
||||
@ -1534,8 +1534,8 @@
|
||||
(flux |=(elt/vase [[q.i.poy elt] nex]))
|
||||
%- flux
|
||||
|= yal/(list (pair @ vase)) ^- vase
|
||||
?~ yal [[%cube 0 [%atom %n]] 0]
|
||||
(slop (slop [[%atom doe] p.i.yal] q.i.yal) $(yal t.yal))
|
||||
?~ yal [[%cube 0 [%moat %n ~]] 0]
|
||||
(slop (slop [[%moat doe ~] p.i.yal] q.i.yal) $(yal t.yal))
|
||||
::
|
||||
++ chai :: atomic map
|
||||
|= {cof/cafe bax/vase hon/horn}
|
||||
@ -1550,9 +1550,9 @@
|
||||
(cope nod (flux some))
|
||||
%- flux
|
||||
|= doy/(map @ vase) ^- vase
|
||||
?~ doy [[%cube 0 [%atom %n]] 0]
|
||||
?~ doy [[%cube 0 [%moat %n ~]] 0]
|
||||
%+ slop
|
||||
(slop [[%atom %ta] p.n.doy] q.n.doy)
|
||||
(slop [[%moat %ta ~] p.n.doy] q.n.doy)
|
||||
(slop $(doy l.doy) $(doy r.doy))
|
||||
::
|
||||
++ chap :: produce resources
|
||||
@ -1581,7 +1581,7 @@
|
||||
|= {cof/cafe tev/(list vase)}
|
||||
%+ fine cof
|
||||
|- ^- vase
|
||||
?~ tev [[%cube 0 [%atom %n]] 0]
|
||||
?~ tev [[%cube 0 [%moat %n ~]] 0]
|
||||
(slop i.tev $(tev t.tev))
|
||||
::
|
||||
$for $(hon q.hon, s.how (weld (flop p.hon) s.how))
|
||||
@ -1595,7 +1595,7 @@
|
||||
$hub (chad cof bax %ud p.hon)
|
||||
$man
|
||||
|- ^- (bolt vase)
|
||||
?~ p.hon (fine cof [[%cube 0 [%atom %n]] 0])
|
||||
?~ p.hon (fine cof [[%cube 0 [%moat %n ~]] 0])
|
||||
%+ cope $(p.hon l.p.hon)
|
||||
|= {cof/cafe lef/vase}
|
||||
%+ cope ^$(cof cof, p.hon r.p.hon)
|
||||
@ -1604,7 +1604,7 @@
|
||||
|= {cof/cafe vax/vase}
|
||||
%+ fine cof
|
||||
%+ slop
|
||||
(slop [[%atom %tas] p.n.p.hon] vax)
|
||||
(slop [[%moat %tas ~] p.n.p.hon] vax)
|
||||
(slop lef rig)
|
||||
::
|
||||
$now (chad cof bax %da p.hon)
|
||||
@ -1777,7 +1777,7 @@
|
||||
=- (flaw cof leaf+"{<p.cay>} data with bad diff" -)
|
||||
[>span=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))
|
||||
(fine cof %& p.cay [%moat %t ~] (end 3 (dec (met 3 pac)) pac))
|
||||
::
|
||||
%+ cope (fang cof p.cay)
|
||||
|= {cof/cafe pro/vase}
|
||||
|
||||
@ -1150,7 +1150,7 @@
|
||||
++ ap-term :: atomic vase
|
||||
|= {a/@tas b/@}
|
||||
^- vase
|
||||
[[%cube b %atom a] b]
|
||||
[[%cube b %moat a ~] b]
|
||||
::
|
||||
++ ap-vain :: card to vane
|
||||
|= sep/@tas
|
||||
|
||||
@ -352,8 +352,7 @@
|
||||
++ span $@ $? $noun :: any nouns
|
||||
$void :: no noun
|
||||
== ::
|
||||
$% {$atom p/term} :: number and format
|
||||
{$moat p/term q/(unit @)} :: atom
|
||||
$% {$moat p/term q/(unit @)} :: atom / constant
|
||||
{$cell p/span q/span} :: ordered pair
|
||||
{$core p/span q/coil} :: object
|
||||
{$cube p/* q/span} :: constant
|
||||
@ -7678,7 +7677,6 @@
|
||||
?- sut
|
||||
$noun [dex sut]
|
||||
$void [dex sut]
|
||||
{$atom *} [dex [%mato p.sut]]
|
||||
{$moat *} [dex [%mato p.sut]]
|
||||
{$cell *}
|
||||
=+ hin=$(sut p.sut)
|
||||
@ -7809,7 +7807,6 @@
|
||||
=+ gil=*(set span)
|
||||
|- ^- *
|
||||
?- sut
|
||||
{$atom *} 0
|
||||
{$moat *} 0
|
||||
{$cell *} [$(sut p.sut) $(sut q.sut)]
|
||||
{$core *} [p.r.q.sut $(sut p.sut)]
|
||||
@ -7859,16 +7856,8 @@
|
||||
?: =(%void ref)
|
||||
sut
|
||||
?- sut
|
||||
{$atom *}
|
||||
?- ref
|
||||
{$atom *} %void
|
||||
{$moat *} %void
|
||||
{$cell *} sut
|
||||
* sint
|
||||
==
|
||||
{$moat *}
|
||||
?- ref
|
||||
{$atom *} %void
|
||||
{$moat *} %void
|
||||
{$cell *} sut
|
||||
* sint
|
||||
@ -7876,7 +7865,6 @@
|
||||
::
|
||||
{$cell *}
|
||||
?- ref
|
||||
{$atom *} sut
|
||||
{$moat *} sut
|
||||
{$cell *} ?: (nest(sut p.ref) | p.sut)
|
||||
(cell p.sut dext(sut q.sut, ref q.ref))
|
||||
@ -7885,14 +7873,14 @@
|
||||
==
|
||||
::
|
||||
{$core *}
|
||||
?: ?=(?({$atom *} {$moat *} {$cell *}) ref)
|
||||
?: ?=(?({$moat *} {$cell *}) ref)
|
||||
sut
|
||||
sint
|
||||
::
|
||||
{$cube *}
|
||||
?: &(?=({$cube *} ref) =(p.sut p.ref))
|
||||
%void
|
||||
?: ?=(?({$atom *} {$moat *} {$cell *}) ref)
|
||||
?: ?=(?({$moat *} {$cell *}) ref)
|
||||
=+ foz=dext(sut q.sut)
|
||||
?: (firm(sut foz) p.sut)
|
||||
(cube p.sut foz)
|
||||
@ -7975,7 +7963,6 @@
|
||||
?- ref
|
||||
$void lose
|
||||
$noun stop
|
||||
{$atom *} stop
|
||||
{$moat *} stop
|
||||
{$cell *}
|
||||
?~ q.heg here
|
||||
@ -8088,7 +8075,6 @@
|
||||
=+ bix=*(set {span *})
|
||||
|- ^- ?
|
||||
?- sut
|
||||
{$atom *} !.?(dib)
|
||||
{$moat *} !.?(dib)
|
||||
{$cell *} &(.?(dib) $(sut p.sut, dib -.dib) $(sut q.sut, dib +.dib))
|
||||
{$core *}
|
||||
@ -8117,7 +8103,6 @@
|
||||
?- sut
|
||||
$void [%1 1]
|
||||
$noun [%1 0]
|
||||
{$atom *} (flip [%3 %0 axe])
|
||||
{$moat *} (flip [%3 %0 axe])
|
||||
{$cell *}
|
||||
%+ flan
|
||||
@ -8143,17 +8128,9 @@
|
||||
?: ?|(=(sut ref) =(%noun ref))
|
||||
sut
|
||||
?- sut
|
||||
{$atom *}
|
||||
?- ref
|
||||
{$moat *} ?:((fitz p.ref p.sut) sut ref)
|
||||
{$atom *} ?:((fitz p.ref p.sut) sut ref)
|
||||
{$cell *} %void
|
||||
* $(sut ref, ref sut)
|
||||
==
|
||||
{$moat *}
|
||||
?- ref
|
||||
{$moat *} ?:((fitz p.ref p.sut) sut ref)
|
||||
{$atom *} ?:((fitz p.ref p.sut) sut ref)
|
||||
{$cell *} %void
|
||||
* $(sut ref, ref sut)
|
||||
==
|
||||
@ -8359,7 +8336,6 @@
|
||||
=+ gil=*(set span)
|
||||
|- ^- ?
|
||||
?- sut
|
||||
{$atom *} |
|
||||
{$moat *} |
|
||||
{$cell *} |($(sut p.sut) $(sut q.sut))
|
||||
{$core *} $(sut p.sut)
|
||||
@ -8622,15 +8598,6 @@
|
||||
$noun &
|
||||
::
|
||||
{$moat *}
|
||||
?: ?=({$atom *} ref)
|
||||
(fitz p.sut p.ref)
|
||||
?: ?=({$moat *} ref)
|
||||
(fitz p.sut p.ref)
|
||||
sint
|
||||
::
|
||||
{$atom *}
|
||||
?: ?=({$atom *} ref)
|
||||
(fitz p.sut p.ref)
|
||||
?: ?=({$moat *} ref)
|
||||
(fitz p.sut p.ref)
|
||||
sint
|
||||
@ -8655,7 +8622,7 @@
|
||||
::
|
||||
{$face *} dext(sut q.sut)
|
||||
{$fork *}
|
||||
?. ?=(?({$atom *} {$moat *} $noun {$cell *} {$cube *} {$core *}) ref)
|
||||
?. ?=(?({$moat *} $noun {$cell *} {$cube *} {$core *}) ref)
|
||||
sint
|
||||
|(dare(sut p.sut) dare(sut q.sut))
|
||||
::
|
||||
@ -8683,7 +8650,6 @@
|
||||
++ sint
|
||||
^- ?
|
||||
?- ref
|
||||
{$atom *} |
|
||||
{$moat *} |
|
||||
{$cell *} |
|
||||
{$fork *} &(sext(ref p.ref) sext(ref q.ref))
|
||||
@ -8715,7 +8681,6 @@
|
||||
=+ gil=*(set span)
|
||||
|- ^- span
|
||||
?- sut
|
||||
{$atom *} %void
|
||||
{$moat *} %void
|
||||
{$cell *} ?:(=(2 now) ^$(sut p.sut, axe lat) ^$(sut q.sut, axe lat))
|
||||
{$core *}
|
||||
@ -8866,7 +8831,6 @@
|
||||
?- sut
|
||||
$noun $(sut [%cell %noun %noun])
|
||||
$void %void
|
||||
{$atom *} %void
|
||||
{$moat *} %void
|
||||
{$cell *} ?: =(2 now)
|
||||
(cell $(sut p.sut, u.i.vit lat) q.sut)
|
||||
|
||||
@ -135,7 +135,7 @@
|
||||
|= {input/path output/path}
|
||||
%+ do-info "copied"
|
||||
?> =(-:(flop input) -:(flop output))
|
||||
(foal output -:(flop input) atom+%t .^(%cx input)) :: XX type
|
||||
(foal output -:(flop input) [%moat %t ~] .^(%cx input)) :: XX type
|
||||
::
|
||||
++ poke-mv
|
||||
|= {input/path output/path}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user