ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-08 08:08:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test' of https://github.com/urbit/urbit into karpi

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2015-10-12 17:10:56 -07:00
commit e7e9fdeaa0
7 changed files with 80 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ape/oct1.hoon
View File

@ -4,6 +4,7 @@
/? 310 :: arvo version /? 310 :: arvo version
/- sole, oct1 :: structures /- sole, oct1 :: structures
/+ sole, oct1 :: libraries /+ sole, oct1 :: libraries
[. sole oct1] :: ::
:: :: :: :: :: ::
:::: :::::: interfaces :::: :::::: interfaces
!: :: :: !: :: ::
@ -23,7 +24,6 @@
:: :: :: :: :: ::
:::: :::::: process core :::: :::::: process core
:: :: :: :: :: ::
[sole oct1 .]
|_ $: bowl :: system state |_ $: bowl :: system state
moz=(list move) :: pending actions moz=(list move) :: pending actions
axon :: server state, v0 axon :: server state, v0
@ -63,7 +63,7 @@
++ work :: console action ++ work :: console action
|= act=sole-action :: |= act=sole-action ::
=+ say=(~(got by eye) ost) :: =+ say=(~(got by eye) ost) ::
|^ ?:(?=(%det -.act) (delt +.act) dive) :: |^ ?+(-.act abet %det (delt +.act), %ret dive) ::
++ abet ..work(eye (~(put by eye) ost say)) :: resolve ++ abet ..work(eye (~(put by eye) ost say)) :: resolve
++ delt |= cal=sole-change :: edit command line ++ delt |= cal=sole-change :: edit command line
=^ cul say (~(remit sole say) cal good) :: =^ cul say (~(remit sole say) cal good) ::

4
ape/oct2.hoon
View File

@ -4,6 +4,7 @@
/? 310 :: arvo version /? 310 :: arvo version
/- sole, oct2 :: structures /- sole, oct2 :: structures
/+ sole, oct2 :: libraries /+ sole, oct2 :: libraries
[. sole oct2] :: ::
:: :: :: :: :: ::
:::: :::::: interfaces :::: :::::: interfaces
!: :: :: !: :: ::
@ -37,7 +38,6 @@
:: :: :: :: :: ::
:::: :::::: process core :::: :::::: process core
:: :: :: :: :: ::
[sole oct2 .]
|_ $: bowl :: |_ $: bowl ::
moz=(list move) :: pending actions moz=(list move) :: pending actions
[%1 axle] :: process state, v1 [%1 axle] :: process state, v1
@ -80,7 +80,7 @@
++ work :: console action ++ work :: console action
|= act=sole-action :: |= act=sole-action ::
=+ say=(~(got by eye) ost) :: =+ say=(~(got by eye) ost) ::
|^ ?:(?=(%det -.act) (delt +.act) dive) :: |^ ?+(-.act abet %det (delt +.act), %ret dive) ::
++ abet ..work(eye (~(put by eye) ost say)) :: resolve ++ abet ..work(eye (~(put by eye) ost say)) :: resolve
++ cusp (cope !ept:here) :: parsing rule ++ cusp (cope !ept:here) :: parsing rule
++ delt |= cal=sole-change :: edit command line ++ delt |= cal=sole-change :: edit command line

4
ape/oct3.hoon
View File

@ -4,6 +4,7 @@
/? 310 :: arvo version /? 310 :: arvo version
/- sole, oct3 :: structures /- sole, oct3 :: structures
/+ sole, oct3 :: libraries /+ sole, oct3 :: libraries
[. sole oct3] :: ::
:: :: :: :: :: ::
:::: :::::: interfaces :::: :::::: interfaces
!: :: :: !: :: ::
@ -39,7 +40,6 @@
:: :: :: :: :: ::
:::: :::::: process core :::: :::::: process core
:: :: :: :: :: ::
[sole oct3 .]
|_ $: bowl :: |_ $: bowl ::
moz=(list move) :: pending actions moz=(list move) :: pending actions
[%1 axle] :: process state, v1 [%1 axle] :: process state, v1
@ -90,7 +90,7 @@
++ work :: console action ++ work :: console action
|= act=sole-action :: |= act=sole-action ::
=+ say=(~(got by eye) ost) :: =+ say=(~(got by eye) ost) ::
|^ ?:(?=(%det -.act) (delt +.act) dive) :: |^ ?+(-.act abet %det (delt +.act), %ret dive) ::
++ abet ..work(eye (~(put by eye) ost say)) :: resolve ++ abet ..work(eye (~(put by eye) ost say)) :: resolve
++ cusp (cope !ept:here) :: parsing rule ++ cusp (cope !ept:here) :: parsing rule
++ delt |= cal=sole-change :: edit command line ++ delt |= cal=sole-change :: edit command line

6
ape/oct4.hoon
View File

@ -4,6 +4,7 @@
/? 310 :: arvo version /? 310 :: arvo version
/- sole, oct4 :: structures /- sole, oct4 :: structures
/+ sole, oct4 :: libraries /+ sole, oct4 :: libraries
[. sole oct4] :: ::
:: :: :: :: :: ::
:::: :::::: interfaces :::: :::::: interfaces
!: :: :: !: :: ::
@ -45,8 +46,7 @@
:: :: :: :: :: ::
:::: :::::: process core :::: :::::: process core
:: :: :: :: :: ::
[sole oct4 .] |_ $: bowl ::
|_ $: bowl
moz=(list move) :: pending actions moz=(list move) :: pending actions
[%1 axle] :: process state, v1 [%1 axle] :: process state, v1
== :: == ::
@ -110,7 +110,7 @@
++ work :: console action ++ work :: console action
|= act=sole-action :: |= act=sole-action ::
=+ say=(~(got by eye) ost) :: =+ say=(~(got by eye) ost) ::
|^ ?:(?=(%det -.act) (delt +.act) dive) :: |^ ?+(-.act abet %det (delt +.act), %ret dive) ::
++ abet ..work(eye (~(put by eye) ost say)) :: resolve ++ abet ..work(eye (~(put by eye) ost say)) :: resolve
++ cusp (cope !ept:here) :: parsing rule ++ cusp (cope !ept:here) :: parsing rule
++ delt |= cal=sole-change :: edit command line ++ delt |= cal=sole-change :: edit command line

54
ape/talk.hoon
View File

@ -107,6 +107,7 @@
[%banish p=span q=(list partner)] :: blacklist add [%banish p=span q=(list partner)] :: blacklist add
[%block p=span q=(list partner)] :: blacklist add [%block p=span q=(list partner)] :: blacklist add
[%author p=span q=(list partner)] :: whitelist add [%author p=span q=(list partner)] :: whitelist add
[%nick p=(unit ship) q=(unit cord)] ::
[%target p=where q=(unit work)] :: set active targets [%target p=where q=(unit work)] :: set active targets
:: [%destroy p=span] :: :: [%destroy p=span] ::
[%create p=posture q=span r=cord] :: [%create p=posture q=span r=cord] ::
@ -214,6 +215,7 @@
== ==
== ==
:: ::
++ nick (cook crip (stun [1 14] low)) :: nickname
++ text (cook crip (star (shim ' ' '~'))) :: bullets separating ++ text (cook crip (star (shim ' ' '~'))) :: bullets separating
++ glyph (mask "/\\\{(<!?{(zing glyphs)}") :: station postfix ++ glyph (mask "/\\\{(<!?{(zing glyphs)}") :: station postfix
++ work ++ work
@ -237,6 +239,17 @@
;~(plug (perk %bind ~) ;~(pfix ace glyph) (punt ;~(pfix ace parz))) ;~(plug (perk %bind ~) ;~(pfix ace glyph) (punt ;~(pfix ace parz)))
;~((glue ace) (perk %join ~) parz) ;~((glue ace) (perk %join ~) parz)
;~((glue ace) (perk %what ~) ;~(pose parz glyph)) ;~((glue ace) (perk %what ~) ;~(pose parz glyph))
::
;~ plug (perk %nick ~)
;~ pose
(cook some ;~(pfix ace ship))
(easy ~)
==
;~ pose
(cook some ;~(pfix ace nick))
(easy ~)
==
==
:: ::
;~(plug (perk %help ~) (easy ~)) ;~(plug (perk %help ~) (easy ~))
(stag %number nump) (stag %number nump)
@ -843,6 +856,7 @@
%author (author +.job) %author (author +.job)
%block (block +.job) %block (block +.job)
%create (create +.job) %create (create +.job)
%nick (nick +.job)
%target (target +.job) %target (target +.job)
%probe (probe +.job) %probe (probe +.job)
%help (help) %help (help)
@ -857,7 +871,7 @@
sh-prod(active.she `tr-pals:tay) sh-prod(active.she `tr-pals:tay)
:: ::
++ help |=(~ (sh-fact %mor talk-doc)) :: %help ++ help |=(~ (sh-fact %mor talk-doc)) :: %help
++ nick ++ glyph
|= idx=@ |= idx=@
=< cha.ole =< cha.ole
%+ reel glyphs %+ reel glyphs
@ -875,7 +889,7 @@
=. ..sh-work =. ..sh-work
=+ (~(get by nik) lix) =+ (~(get by nik) lix)
?^ - (sh-note "has glyph {<u>}") ?^ - (sh-note "has glyph {<u>}")
=+ cha=(nick (mug lix)) =+ cha=(glyph (mug lix))
=: nik (~(put by nik) lix cha) =: nik (~(put by nik) lix cha)
nak (~(put ju nak) cha lix) nak (~(put ju nak) cha lix)
== ==
@ -964,6 +978,42 @@
[por ~] [por ~]
(join [[%& our.hid nom] ~ ~]) (join [[%& our.hid nom] ~ ~])
:: ::
++ reverse-folks
|= nym=span
^- (list ship)
%+ murn (~(tap by folks))
|= [p=ship q=human]
?~ hand.q ~
?. =(u.hand.q nym) ~
[~ u=p]
::
++ nick :: %nick
|= [her=(unit ship) nym=(unit cord)]
^+ ..sh-work
?: ?=([~ ~] +<)
%+ sh-fact %mor
%+ turn (~(tap by folks))
|= [p=ship q=human]
:- %txt
?~ hand.q
"{<p>}:"
"{<p>}: {<u.hand.q>}"
?~ nym
?> ?=(^ her)
=+ asc=(~(get by folks) u.her)
%+ sh-fact %txt
?~ asc "{<u.her>} unbound"
?~ hand.u.asc "{<u.her>}:"
"{<u.her>}: {<u.hand.u.asc>}"
?~ her
%+ sh-fact %mor
%+ turn (reverse-folks u.nym)
|= p=ship
[%txt "{<p>}: {<u.nym>}"]
%= ..sh-work
folks (~(put by folks) u.her [true=~ hand=nym])
==
::
++ target :: %target ++ target :: %target
|= [lix=?((set partner) char) woe=(unit ^work)] |= [lix=?((set partner) char) woe=(unit ^work)]
=- ?~(woe end work(job u.woe, ..sh-pact end)) =- ?~(woe end work(job u.woe, ..sh-pact end))

2
arvo/hoon.hoon
View File

@ -2222,7 +2222,7 @@
(a b c) (a b c)
:: ::
++ gulf :: range list ++ gulf :: range list
|=([a=@ b=@] `(list ,@)`?:(=(a b) ~ [a $(a +(a))])) |=([a=@ b=@] `(list ,@)`?:(=(a +(b)) ~ [a $(a +(a))]))
:: ::
++ hard :: force coerce to type ++ hard :: force coerce to type
|* han=$+(* *) |* han=$+(* *)

6
pub/oct3/fab/hymn.hook
View File

@ -9,20 +9,24 @@
;script ;script
=type "text/javascript" =type "text/javascript"
=src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.js" =src "//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.js"
;
== ==
;script ;script
=type "text/javascript" =type "text/javascript"
=src "/~~/~/at/base/lib/urb.js" =src "/~~/~/at/base/lib/urb.js"
;
== ==
;link ;link
=type "text/css" =type "text/css"
=rel "stylesheet" =rel "stylesheet"
=href "/{dez}/lib/base.css" =href "/{dez}/lib/base.css"
;
== ==
;link ;link
=type "text/css" =type "text/css"
=rel "stylesheet" =rel "stylesheet"
=href "/{dez}/pub/oct3/src/main.css") =href "/{dez}/pub/oct3/src/main.css"
;
== ==
;title: :oct3 ;title: :oct3
== ==