mirror of
https://github.com/urbit/shrub.git
synced 2024-12-12 10:29:01 +03:00
Merge branch 'master' of github.com:urbit/urbit
Conflicts: urb/urbit.pill
This commit is contained in:
C. Guy Yarvin
commit
eb0962e1e2
@ -115,6 +115,7 @@
|
||||
++ calx :: concrete cache line
|
||||
$% [%hood p=calm q=(pair beam cage) r=hood] :: compile
|
||||
[%slap p=calm q=[p=vase q=twig] r=vase] :: compute
|
||||
[%slam p=calm q=[p=vase q=vase] r=vase] :: compute
|
||||
== ::
|
||||
++ task :: problem in progress
|
||||
$: nah=duct :: cause
|
||||
@ -129,6 +130,7 @@
|
||||
?+ sem !!
|
||||
%hood ?>(?=(%hood -.cax) r.cax)
|
||||
%slap ?>(?=(%slap -.cax) r.cax)
|
||||
%slam ?>(?=(%slam -.cax) r.cax)
|
||||
==
|
||||
::
|
||||
++ calk :: cache lookup
|
||||
@ -678,7 +680,9 @@
|
||||
++ lily :: translation targets
|
||||
|= [cof=cafe for=mark bek=beak]
|
||||
^- (bolt (list ,@tas))
|
||||
%+ cope (fang cof for bek)
|
||||
=+ raf=(fang cof for bek)
|
||||
?: =(%2 -.q.raf) (fine p.raf ~)
|
||||
%+ cope raf
|
||||
|= [cof=cafe vax=vase]
|
||||
%+ fine cof
|
||||
%+ weld
|
||||
@ -884,6 +888,8 @@
|
||||
++ maul :: slam
|
||||
|= [cof=cafe gat=vase sam=vase]
|
||||
^- (bolt vase)
|
||||
%+ (clef %slam) (fine cof gat sam)
|
||||
|= [cof=cafe gat=vase sam=vase]
|
||||
=+ top=(mule |.((slit p.gat p.sam)))
|
||||
?- -.top
|
||||
| (flaw cof p.top)
|
||||
|
||||
@ -969,18 +969,16 @@
|
||||
myz:(dist:(zu ank) %c bus)
|
||||
::
|
||||
++ loth
|
||||
|= [p=(map path ,*) s=(set path)]
|
||||
|= pat=(map path ,*)
|
||||
^- (set path)
|
||||
%+ roll (~(tap by p) ~)
|
||||
|= [[p=path *] q=_s]
|
||||
%+ roll (~(tap by pat) ~)
|
||||
|= [[p=path *] q=(set path)]
|
||||
%. p %~ put in q
|
||||
::
|
||||
++ luth
|
||||
|= [p=(map path ,*) q=(map path ,*)] :: merge keysets
|
||||
^- (set path)
|
||||
%+ loth p
|
||||
%+ loth q
|
||||
_(set path)
|
||||
(~(uni in (loth p)) (loth q))
|
||||
::
|
||||
++ zaax :: p.blob
|
||||
|= p=blob
|
||||
@ -1405,11 +1403,11 @@
|
||||
%^ cat 3 `@t`(scot %p -.us)
|
||||
%^ cat 3 '/'
|
||||
+.us
|
||||
:- q
|
||||
:- p
|
||||
:- ~['------------']
|
||||
:- r
|
||||
:- ~['++++++++++++']
|
||||
:- p
|
||||
:- q
|
||||
:- :_ ~
|
||||
%^ cat 3 '>>>>>>>>>>>>'
|
||||
%^ cat 3 ' '
|
||||
@ -1538,15 +1536,26 @@
|
||||
^- (unit miso)
|
||||
?~ p q :: trivial
|
||||
?~ q p :: trivial
|
||||
?. ?=(%mut -.u.p)
|
||||
~| %quil-conflict !!
|
||||
?. ?=(%mut -.u.q)
|
||||
~| %quil-conflict !!
|
||||
%- some
|
||||
%^ qeal us th
|
||||
:^ pat u.p u.q :: merge p,q
|
||||
:- %- need r
|
||||
con
|
||||
?- -.u.p
|
||||
%ins ?> ?=(%ins -.u.q)
|
||||
?. con !!
|
||||
%- some
|
||||
:- %ins
|
||||
%- roly
|
||||
%- quis
|
||||
:- us
|
||||
:- th
|
||||
:- (lore ((hard ,@) p.u.p))
|
||||
:- (lore ((hard ,@) p.u.q))
|
||||
~
|
||||
%del p
|
||||
%mut ?> ?=(%mut -.u.q)
|
||||
%- some
|
||||
%^ qeal us th
|
||||
:^ pat u.p u.q :: merge p,q
|
||||
:- %- need r
|
||||
con
|
||||
==
|
||||
::
|
||||
++ meld :: merge p,q from r
|
||||
|= [p=yaki q=yaki r=yaki con=? us=[ship desk] th=[ship desk]]
|
||||
|
||||
@ -145,7 +145,7 @@
|
||||
%show
|
||||
=+ rax=(scag (dec (lent t.pax)) t.pax)
|
||||
=+ ya=(grab rax)
|
||||
?~ sub.ya ~& [%chat-pour-unexpected -.sih +<.sih] [~ +>.$]
|
||||
?~ sub.ya [~ +>.$]
|
||||
:: ~& [%pour-show lat.hid tim.ya]
|
||||
=. ya
|
||||
?: ?=(?(%nice %mean) +<.sih) ya
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
::
|
||||
::
|
||||
::::
|
||||
::
|
||||
/= sid /^ manx /: /===/pub/src/site/res/sidebar /hymn/
|
||||
/= fot /^ manx /: /===/pub/src/site/res/footer /hymn/
|
||||
/= sty /^ @t /: /===/pub/src/site/res/styles /css/
|
||||
::
|
||||
:::: ~tomsyt-balsen
|
||||
::
|
||||
;html
|
||||
;head
|
||||
;title: Urbit: Personal Cloud Computing
|
||||
;style:"{(trip sty)}"
|
||||
==
|
||||
;body
|
||||
;+ sid
|
||||
;div(class "content container")
|
||||
;div(class "page documentation")
|
||||
;h1(class "page-title"): Documentation
|
||||
;p ; If you want to build a deep understanding of how Urbit works,
|
||||
; start with Nock. If you would prefer to just try stuff
|
||||
; out, start with Arvo.
|
||||
==
|
||||
;p ; This documentation is a work in progress. Feedback and corrections
|
||||
; are welcome. Pull requests are encouraged. The repo for this site
|
||||
; lives ;{a(href "https://github.com/urbit/urbit.github.io") "here"}.
|
||||
; We would love your help in making this reference more useful.
|
||||
==
|
||||
;p ; Arvo is still actively being changed and updated.
|
||||
; As Arvo development cools, more documentation will emerge.
|
||||
==
|
||||
;ul
|
||||
;li
|
||||
;p:(h2:"Tutorial")
|
||||
;strong: Nock
|
||||
;ol
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/nock1":"Intro to Nock"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/nock2":"Nock is Easy"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/nock3":"Using Nock"))
|
||||
==
|
||||
;strong: Hoon
|
||||
;ol
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/hoon1":"Intro to Hoon"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/hoon2":"Types"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/hoon3":"Hoon Computes"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/hoon4":"Gates"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/hoon5":"Tiles"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/hoon6":"Type Inference"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/hoon7":"Odds, Ends, Quirks"))
|
||||
==
|
||||
;strong: Arvo
|
||||
;ol
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/arvo1":"Basic Arvo"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/tut/arvo2":"More Basic Arvo"))
|
||||
==
|
||||
==
|
||||
;li
|
||||
;p:(h2:"Reference")
|
||||
;ul
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/foreword":";{strong "Foreword"}: Nock"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/preface":";{strong "Preface"}: Hoon Abstract"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/vol0":";{strong "Volume 0"}: Version Stub"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/vol1":";{strong "Volume 1"}: Hoon Structures"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/vol2":";{strong "Volume 2"}: Hoon Compiler"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/vol3":";{strong "Volume 3"}: Arvo Core"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/vol4":";{strong "Volume 4"}: Arvo Vanes"))
|
||||
;li:(p:(a/"/gen/main/pub/src/site/ref/postface":";{strong "Postface"}"))
|
||||
==
|
||||
==
|
||||
==
|
||||
==
|
||||
==
|
||||
==
|
||||
==
|
||||
@ -8,7 +8,7 @@
|
||||
</div>
|
||||
<ul class="sidebar-nav">
|
||||
<li class="sidebar-nav-item">
|
||||
<a href="/gen/main/pub/src/site/documentation/" class="">Documentation</a>
|
||||
<a href="/gen/main/pub/src/site/doc/" class="">Documentation</a>
|
||||
</li>
|
||||
<li class="sidebar-nav-item">
|
||||
<a href="/community/" class="">Community</a>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user