Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-12-03 09:46:54 -08:00
commit c9495e139b
8 changed files with 20 additions and 9 deletions

View File

@ -367,7 +367,8 @@
?(%rush %rust) :: XX reset prompt ?(%rush %rust) :: XX reset prompt
?> ?=(%term-line +>-.sih) ?> ?=(%term-line +>-.sih)
=. +>.$ =. +>.$
=- (furl (zing (turn (flop r.q.sih) -))) =+ lis=?-(-.+.sih %rust (scag 1.000 r.q.sih), %rush r.q.sih)
=- (furl (zing (turn (flop lis) -)))
|= a=tark |= a=tark
^- wall ^- wall
?+ -.a (~(win re a) 0 p.q.yar) ?+ -.a (~(win re a) 0 p.q.yar)

View File

@ -381,7 +381,7 @@
(welp mow (send /out %give %rush %tang (zong-to-tank | zog) ~)) (welp mow (send /out %give %rush %tang (zong-to-tank | zog) ~))
== ==
?: =(%zongs -.p.sih) ?: =(%zongs -.p.sih)
=+ zos=((hard (list zong)) p.p.sih) =+ zos=(scag 200 ((hard (list zong)) p.p.sih))
=< +(mow (flop mow)) =< +(mow (flop mow))
|- ^+ +.$ |- ^+ +.$
?: =(~ zos) +.$ :: XX tm freakin i ?: =(~ zos) +.$ :: XX tm freakin i

View File

@ -3,7 +3,7 @@
++ poke-into-args ++ poke-into-args
|= [ost=bone you=ship pax=path dat=@ ~] |= [ost=bone you=ship pax=path dat=@ ~]
:_ +>.$ :_ +>.$
:* [ost %pass /cp %c %info our.hid (foal pax dat)] :* [ost %pass /into %c %info our.hid (foal pax dat)]
[ost %give %nice ~] [ost %give %nice ~]
%+ turn (~(tap by sup.hid)) %+ turn (~(tap by sup.hid))
|= [ost=bone *] |= [ost=bone *]

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

@ -0,0 +1,9 @@
!:
|_ [hid=hide ~]
++ poke-label-args
|= [ost=bone you=ship syd=@tas lab=@tas ~]
:_ +>.$
:~ [ost %pass /label %c %info our.hid syd %| lab]
==
++ peer |=(* `+>)
--

View File

@ -4,8 +4,7 @@
|= [ost=bone you=ship arg=path ~] |= [ost=bone you=ship arg=path ~]
=+ lon=((hard arch) .^(%cy arg)) =+ lon=((hard arch) .^(%cy arg))
:_ +>.$ :_ +>.$
:* ::[ost %pass / %g %cide %$] :* [ost %give %nice ~]
[ost %give %nice ~]
%+ turn (~(tap by sup.hid)) %+ turn (~(tap by sup.hid))
|= [ost=bone *] |= [ost=bone *]
:^ ost %give %rush :^ ost %give %rush

View File

@ -3,7 +3,7 @@
++ poke-mv-args ++ poke-mv-args
|= [ost=bone you=ship input=path output=path ~] |= [ost=bone you=ship input=path output=path ~]
:_ +>.$ :_ +>.$
:* :^ ost %pass /cp :* :^ ost %pass /mv
:^ %c %info our.hid :^ %c %info our.hid
(furl (foal output .^(%cx input)) (fray input)) (furl (foal output .^(%cx input)) (fray input))
[ost %give %nice ~] [ost %give %nice ~]

View File

@ -3,7 +3,7 @@
++ poke-rm-args ++ poke-rm-args
|= [ost=bone you=ship pax=path ~] |= [ost=bone you=ship pax=path ~]
:_ +>.$ :_ +>.$
:* [ost %pass /cp %c %info our.hid (fray pax)] :* [ost %pass /rm %c %info our.hid (fray pax)]
[ost %give %nice ~] [ost %give %nice ~]
%+ turn (~(tap by sup.hid)) %+ turn (~(tap by sup.hid))
|= [ost=bone *] |= [ost=bone *]

View File

@ -299,8 +299,10 @@
++ exec ++ exec
|= gen=twig |= gen=twig
%- slap :_ gen %- slap :_ gen
=+ tym=!>(lat.hid) %+ slop
%+ slop [[%face %tym p.tym] q.tym] %+ slop [[%face %our p] q]:!>(our.hid)
%+ slop [[%face %tym p] q]:!>(lat.hid)
[[%face %eny p] q]:!>(eny.hid)
%+ roll (~(tap by var)) %+ roll (~(tap by var))
=< .(q pit) =< .(q pit)
|= [[n=term v=vase] q=vase] |= [[n=term v=vase] q=vase]