Merge remote-tracking branch 'origin/master' into typedclay

Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2015-01-23 14:39:41 -05:00
commit 6421719732
7 changed files with 47 additions and 9 deletions

View File

@ -1889,6 +1889,7 @@
=+ rul=(earn pul.p.som.pip) =+ rul=(earn pul.p.som.pip)
=+ ruf=(earn (erle our pul.p.som.pip(q.q /pul, r ~))) =+ ruf=(earn (erle our pul.p.som.pip(q.q /pul, r ~)))
=+ sus=?~(foy.p.som.pip ses q.u.foy.p.som.pip) =+ sus=?~(foy.p.som.pip ses q.u.foy.p.som.pip)
~& auth-request/secret=`cord`lass
=+ ham=(noon our sus whu.p.som.pip rul ruf) =+ ham=(noon our sus whu.p.som.pip rul ruf)
[~ pip(pez [%fin %ham ham])] [~ pip(pez [%fin %ham ham])]
?. =(lass u.pus.p.som.pip) ?. =(lass u.pus.p.som.pip)

View File

@ -272,7 +272,7 @@
[%smdt p=twig q=tusk] :: [%smdt p=twig q=tusk] ::
[%smdq p=(list beer)] :: assemble string [%smdq p=(list beer)] :: assemble string
[%smsg p=twig q=tusk] :: gonads [%smsg p=twig q=tusk] :: gonads
[%smsm p=tile q=twig] :: make sure q is a p [%smsm p=twig q=twig] :: make sure q is a p
:: :::::: compositions :: :::::: compositions
[%tsbr p=tile q=twig] :: push bunt: =+(_p q) [%tsbr p=tile q=twig] :: push bunt: =+(_p q)
[%tscl p=tram q=twig] :: p changes, then q [%tscl p=tram q=twig] :: p changes, then q
@ -6662,8 +6662,7 @@
:: ::
[%smsm *] :: ;; [%smsm *] :: ;;
:+ %tsgr [%ktts %v ~ 1] :: => v=. :+ %tsgr [%ktts %v ~ 1] :: => v=.
:+ %tsls :+ %ktts %a :: =+ ^= a :+ %tsls [%ktts %a [%tsgr [%cnzy %v] p.gen]] :: =+ a==>(v {p.gen})
[%tsgr [%cnzy %v] [%bccm p.gen]] :: =>(v ,{p.gen})
:+ %tsls [%ktts %b [%tsgr [%cnzy %v] q.gen]] :: =+ b==>(v {q.gen}) :+ %tsls [%ktts %b [%tsgr [%cnzy %v] q.gen]] :: =+ b==>(v {q.gen})
:+ %tsls :: =+ c=(a b) :+ %tsls :: =+ c=(a b)
[%ktts %c [%cnhp [%cnzy %a] [%cnzy %b] ~]] :: [%ktts %c [%cnhp [%cnzy %a] [%cnzy %b] ~]] ::
@ -8947,7 +8946,7 @@
=+ rev=(plex b) =+ rev=(plex b)
?~ rev ~ ?~ rev ~
%- some %- some
:+ %smsm a :+ %smsm ~(clam al a)
[%dtkt %dtzz %$ %cx u.rev] [%dtkt %dtzz %$ %cx u.rev]
;~(plug hill rood) ;~(plug hill rood)
== ==
@ -9195,7 +9194,7 @@
:~ [':' (rune col %smcl expi)] :~ [':' (rune col %smcl expi)]
['.' (rune dot %smdt expi)] ['.' (rune dot %smdt expi)]
['~' (rune sig %smsg expi)] ['~' (rune sig %smsg expi)]
[';' (rune sem %smsm expo)] [';' (rune sem %smsm expb)]
== ==
== ==
:- '=' :- '='

View File

@ -19,7 +19,7 @@
=+ ark=;;(arch .^(%cy pax)) =+ ark=;;(arch .^(%cy pax))
?^ q.ark ?^ q.ark
:- leaf/(spud pax) :- leaf/(spud pax)
%+ turn (lore ;;(@t .^(%cx pax))) %+ turn (lore ;;(,@t .^(%cx pax)))
|=(a=cord leaf/(trip a)) |=(a=cord leaf/(trip a))
?- r.ark :: handle ambiguity ?- r.ark :: handle ambiguity
~ ~

9
main/app/code/core.hook Normal file
View File

@ -0,0 +1,9 @@
:: Show passcode
/+ sh-utils
|_ [hide ~]
++ peer ,_`.
++ poke--args
%+ args-into-gate .
=+ pax=/(crip <our>)/code/(crip <lat>)/(crip <our>)
,_tang/~[leaf/"{<(,@p .^(%a pax))>}"]
--

View File

@ -12,6 +12,6 @@
:: ::
++ pour ++ pour
|= [ost=bone * sih=*] |= [ost=bone * sih=*]
~& poke-resp/;;([term term] [&1 &2]:sih) ~& poke-resp/(,[term term] [&1 &2]:sih)
:_(+> [ost %pass / %g %cide %$]~) :_(+> [ost %pass / %g %cide %$]~)
-- --

View File

@ -10,8 +10,7 @@
:: ::
|% :: |% ::
++ axle :: ++ axle ::
$: %0 :: version $: tiv=? :: typing?
tiv=? :: typing?
pid=@u :: next process id pid=@u :: next process id
pax=_`path`/=try= :: working directory pax=_`path`/=try= :: working directory
act=(unit span) :: active child act=(unit span) :: active child

View File

@ -58,6 +58,36 @@
[%vega p=path] :: [%vega p=path] ::
== == == == == ==
-- --
::
:::: from future import wick, pack, pick XX remove on breach or kelvin bump
::
|%
++ wick :: span format
|= a=@
^- (unit ,@ta)
=+ b=(rip 3 a)
=- ?^(b ~ (some (rap 3 (flop c))))
=| c=tape
|- ^- [b=tape c=tape]
?~ b [~ c]
?. =('~' i.b)
$(b t.b, c [i.b c])
?~ t.b [b ~]
?- i.t.b
%'~' $(b t.t.b, c ['~' c])
%'-' $(b t.t.b, c ['_' c])
@ [b ~]
==
::
++ pack :: light path encoding
|= [a=term b=path] ^- span
%+ rap 3 :- (wack a)
(turn b |=(c=span (cat 3 '_' (wack c))))
::
++ pick :: light path decoding
|= a=span ^- (unit ,[p=term q=path])
(rush a (most cab (sear wick urt:ab)))
--
!: !:
:::: helpers :::: helpers
:: ::