Revert "Tile %smsm, replaced instance in ames with ++hard call"

Kept the %ames part.
This reverts commit 3dcf69e125a12518e6d0d30a50e3ef79d8819048.

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/bang/core.hook
	urb/zod/main/app/cat/core.hook
This commit is contained in:
Anton Dyudin 2015-01-17 13:55:39 -08:00
parent be75a6c5d2
commit 5f1fcad714
3 changed files with 6 additions and 7 deletions

View File

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

View File

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

View File

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