mirror of
https://github.com/ilyakooo0/urbit.git
synced 2025-01-05 13:55:54 +03:00
Merge branch 'master' of github.com:urbit/urbit
Conflicts: urb/urbit.pill
This commit is contained in:
commit
69d4bec895
@ -1,4 +1,4 @@
|
||||
:: :: %gall, user-level applications
|
||||
!: :: %gall, user-level applications
|
||||
!? 164
|
||||
::::
|
||||
|= pit=vase
|
||||
@ -78,12 +78,9 @@
|
||||
zam=scar :: opaque ducts
|
||||
== ::
|
||||
++ sign :: in result $-<
|
||||
$% $: %c :: by %clay
|
||||
$% [%writ p=riot] ::
|
||||
== == ::
|
||||
$: %f :: by %ford
|
||||
$% [%made p=(each bead (list tank))] ::
|
||||
== == == ::
|
||||
$? [?(%a %b %c %d %e %g) @tas *]
|
||||
[%f %made p=(each bead (list tank))]
|
||||
==
|
||||
++ toil (pair duct knob) :: work in progress
|
||||
-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: functions
|
||||
@ -431,7 +428,7 @@
|
||||
::
|
||||
++ mack :: apply standard
|
||||
|= sih=sign
|
||||
?> ?=(%made -.+.sih)
|
||||
?> ?=(%f -.sih)
|
||||
^- [(unit (list tank)) _+>]
|
||||
?- -.p.+.sih
|
||||
& :- ~
|
||||
@ -443,7 +440,7 @@
|
||||
++ meek :: apply peek
|
||||
|= sih=sign
|
||||
^- [(unit cage) _+>]
|
||||
?> ?=(%made -.+.sih)
|
||||
?> ?=(%f -.sih)
|
||||
?- -.p.+.sih
|
||||
& =+ vax=`vase`q.q.p.p.+.sih
|
||||
?. &(?=(^ q.vax) ?=(@ -.q.vax))
|
||||
@ -456,7 +453,7 @@
|
||||
::
|
||||
++ mick :: apply w/depends
|
||||
|= sih=sign
|
||||
?> ?=(%made -.+.sih)
|
||||
?> ?=(%f -.sih)
|
||||
^- [(unit (set beam)) _+>]
|
||||
?- -.p.+.sih
|
||||
& :- `p.p.p.+.sih
|
||||
@ -468,7 +465,7 @@
|
||||
++ murk :: apply park
|
||||
|= sih=sign
|
||||
^- [(unit cage) _+>]
|
||||
?> ?=(%made -.+.sih)
|
||||
?> ?=(%f -.sih)
|
||||
?- -.p.+.sih
|
||||
& [`q.p.p.+.sih +>.$]
|
||||
| [~ (give %crud %made p.p.+.sih)]
|
||||
@ -492,7 +489,7 @@
|
||||
%muss
|
||||
?> ?=([@ ~] t.t.pax)
|
||||
=+ you=(need (slaw %p i.t.t.pax))
|
||||
?> ?=(%made -.+.q.hin)
|
||||
?> ?=(%f -.q.hin)
|
||||
?- -.p.+.q.hin
|
||||
| (give:(give %rasp ~) [%crud %vale p.p.+.q.hin])
|
||||
& (quen %mess you q.p.p.+.q.hin)
|
||||
@ -536,6 +533,11 @@
|
||||
=^ gud +>.$ (mack q.hin)
|
||||
?^ gud (give %rasp ~)
|
||||
+>.$
|
||||
::
|
||||
%pour
|
||||
=^ gud +>.$ (mack q.hin)
|
||||
?^ gud ~& -.gud +>.$
|
||||
+>.$
|
||||
::
|
||||
%prep
|
||||
=^ gad +>.$ (mick q.hin)
|
||||
@ -555,14 +557,13 @@
|
||||
==
|
||||
::
|
||||
%w :: autoboot
|
||||
?> ?& ?=([%drug @ @ ~] t.pax)
|
||||
?=(%writ -.+.q.hin)
|
||||
==
|
||||
=+ :* our=(need (slaw %p i.t.t.pax))
|
||||
?> ?=([%drug @ @ ~] t.pax)
|
||||
=+ :* sin=((hard ,[%c %writ p=riot]) q.hin)
|
||||
our=(need (slaw %p i.t.t.pax))
|
||||
syd=(need ((sand %tas) i.t.t.t.pax))
|
||||
==
|
||||
=. ped.sat (~(del by ped.sat) [our syd])
|
||||
?~ p.+.q.hin
|
||||
?~ p.+.sin
|
||||
+>.$
|
||||
+>.$(vey.sat (~(put to vey.sat) hen %boot ~))
|
||||
==
|
||||
@ -639,7 +640,7 @@
|
||||
?+ q.caq ~&(%sump-bad !!)
|
||||
::
|
||||
[%pass p=* q=@tas r=[p=@tas q=*]]
|
||||
:^ %pass [%u ((hard path) p.q.caq)]
|
||||
:^ %pass (away %u ((hard path) p.q.caq))
|
||||
(need ((sand %tas) ((hard ,@) q.q.caq)))
|
||||
[%meta (spec (slot 15 caq))]
|
||||
::
|
||||
@ -739,7 +740,7 @@
|
||||
+>.$(qic.sat ~)
|
||||
?> ?=(^ huv.sat)
|
||||
=+ sam=(slop !>(p.kon) q.kon)
|
||||
%+ ford /s/take
|
||||
%+ ford /s/pour
|
||||
[%call (harm %pour (conf (core u.huv.sat))) (cove %$ sam)]
|
||||
==
|
||||
--
|
||||
|
Loading…
Reference in New Issue
Block a user