Merge branch 'master' into eyre-new

Conflicts:
	urb/zod/main/mar/psal/door.hook
This commit is contained in:
Anton Dyudin 2015-02-05 21:04:40 -08:00
commit c96c630ab4
6 changed files with 205 additions and 5 deletions

View File

@ -37,7 +37,7 @@
[%dub p=term q=horn] :: /= apply face
[%fan p=(list horn)] :: /. list
[%for p=path q=horn] :: /, descend
[%hel p=horn] :: /% propogate heel
[%hel p=@ud q=horn] :: /% propogate heel
[%hub p=horn] :: /@ list by @ud
[%man p=(map span horn)] :: /* hetero map
[%nap p=horn] :: /_ homo map
@ -519,7 +519,7 @@
(stag %dub ;~(pfix tis dub:read))
(stag %fan ;~(pfix dot fan:read))
(stag %for ;~(pfix com for:read))
(stag %hel ;~(pfix cen day:read))
(stag %hel ;~(pfix cen hel:read))
(stag %hub ;~(pfix pat day:read))
(stag %man ;~(pfix tar man:read))
(stag %nap ;~(pfix cab day:read))
@ -559,6 +559,11 @@
%+ rail
;~(plug (ifix [sel ser] hath) apex(tol |))
;~(pfix gap ;~(plug hath ;~(pfix gap apex)))
::
++ hel
%+ rail
;~(plug ;~(pose ;~(sfix dem:ag cen) (easy 0)) apex(tol |))
;~(pfix gap ;~(plug ;~(pose ;~(sfix dem:ag gap) (easy 0)) apex))
::
++ man
%+ rail fail
@ -1049,7 +1054,7 @@
|- ^- vase
?~ doy [[%cube 0 [%atom %n]] 0]
%+ slop
(slop [[%atom %a] p.n.doy] q.n.doy)
(slop [[%atom %ta] p.n.doy] q.n.doy)
(slop $(doy l.doy) $(doy r.doy))
::
++ chap :: produce resources
@ -1084,7 +1089,12 @@
(slop i.tev $(tev t.tev))
::
%for $(hon q.hon, s.how (weld (flop p.hon) s.how))
%hel $(hon p.hon, arg /, s.how (weld arg s.how))
%hel
%= $
hon q.hon
arg (scag p.hon arg)
s.how (weld (slag p.hon arg) s.how)
==
%hub (chad cof bax %ud p.hon)
%man
|- ^- (bolt vase)

View File

@ -38,5 +38,6 @@
;div
;* (sing don)
==
:: ++ react psal
--
--

View File

@ -10,7 +10,7 @@
++ html (crip (poxo hymn)) :: convert to %html
++ mime [/text/html (taco html)] :: convert to %mime
--
++ garb [%react ~]
++ garb [%react %snip ~]
++ grab |% :: convert from
++ noun manx :: clam from %noun
-- --

View File

@ -0,0 +1,62 @@
::
:::: /hoon/core/react-snip/mar
::
/? 314
/= react-elems
/; sa /~
:~ %a %abbr %address %area %article %aside %audio %b %base
%bdi %bdo %big %blockquote %body %br %button %canvas %caption
%cite %code %col %colgroup %data %datalist %dd %del %details
%dfn %dialog %div %dl %dt %em %embed %fieldset %figcaption
%figure %footer %form %h1 %h2 %h3 %h4 %h5 %h6 %head %header
%hr %html %i %iframe %img %input %ins %kbd %keygen %label
%legend %li %link %main %map %mark %menu %menuitem %meta
%meter %nav %noscript %object %ol %optgroup %option %output %p
%param %picture %pre %progress %q %rp %rt %ruby %s %samp
%script %section %select %small %source %span %strong %style
%sub %summary %sup %table %tbody %td %textarea %tfoot %th
%thead %time %title %tr %track %u %ul %var %video %wbr
%circle %defs %ellipse %g %line %linear-gradient %mask %path
%pattern %polygon %polyline %radial-gradient %rect %stop %svg
%text %tspan
==
!:
::::
::
|_ own=manx
::
++ vale ~(has in react-elems)
++ grow :: convert to
|%
++ tape
;: weld
"React.createElement("
=* tan n.g.own
?^ tan !! :: namespaces unsupported
?: (vale tan)
"'{(trip tan)}'"
(trip tan)
::
", "
=- (pojo (jobe (turn a.g.own -)))
|= [a=mane b=^tape]
=. a ?+(a a %class 'className')
?^(a !! [a (jape b)])
", "
::
=- ~(ram re %rose [", " "[" "]"] (turn c.own -))
|= a=manx
?: ?=(_:/(**) a)
leaf/(pojo (jape v.i.a.g.a))
leaf/tape(own a)
::
")"
==
++ react-snip-js (crip tape)
++ js react-snip-js :: convert to %js
++ mime [/text/javascript (taco js)] :: convert to %mime
--
++ grab |% :: convert from
++ noun manx :: clam from %noun
++ snip |= a=manx a
-- --

62
main/mar/react/door.hook Normal file
View File

@ -0,0 +1,62 @@
::
:::: /hoon/core/react/mar
::
/? 314
/= react-elems
/; sa /~
:~ %a %abbr %address %area %article %aside %audio %b %base
%bdi %bdo %big %blockquote %body %br %button %canvas %caption
%cite %code %col %colgroup %data %datalist %dd %del %details
%dfn %dialog %div %dl %dt %em %embed %fieldset %figcaption
%figure %footer %form %h1 %h2 %h3 %h4 %h5 %h6 %head %header
%hr %html %i %iframe %img %input %ins %kbd %keygen %label
%legend %li %link %main %map %mark %menu %menuitem %meta
%meter %nav %noscript %object %ol %optgroup %option %output %p
%param %picture %pre %progress %q %rp %rt %ruby %s %samp
%script %section %select %small %source %span %strong %style
%sub %summary %sup %table %tbody %td %textarea %tfoot %th
%thead %time %title %tr %track %u %ul %var %video %wbr
%circle %defs %ellipse %g %line %linear-gradient %mask %path
%pattern %polygon %polyline %radial-gradient %rect %stop %svg
%text %tspan
==
!:
::::
::
|_ own=manx
::
++ vale ~(has in react-elems)
++ grow :: convert to
|%
++ tape
;: weld
"React.createElement("
=* tan n.g.own
?^ tan !! :: namespaces unsupported
?: (vale tan)
"'{(trip tan)}'"
(trip tan)
::
", "
=- (pojo (jobe (turn a.g.own -)))
|= [a=mane b=^tape]
=. a ?+(a a %class 'className')
?^(a !! [a (jape b)])
", "
::
=- ~(ram re %rose [", " "[" "]"] (turn c.own -))
|= a=manx
?: ?=(_:/(**) a)
leaf/(pojo (jape v.i.a.g.a))
leaf/tape(own a)
::
")"
==
++ react-js (crip tape)
++ js react-js :: convert to %js
++ mime [/text/javascript (taco js)] :: convert to %mime
--
++ grab |% :: convert from
++ noun manx :: clam from %noun
++ psal |= a=manx a
-- --

65
main/mar/snip/door.hook Normal file
View File

@ -0,0 +1,65 @@
::
:::: /hoon/core/psal/mar
::
/? 314
!:
|%
++ words 10
++ hedtal
|= a=marl ^- [hed=tape tal=marl]
?~ a [~ ~]
?. ?=(%h1 n.g.i.a)
=+ had=$(a c.i.a)
?^ -.had had
$(a t.a)
[(extract c.i.a) (limit words t.a)]
::
++ extract
|= a=marl ^- tape
?~ a ~
%- weld :_ $(a t.a)
?. ?=(_:/(**) i.a)
$(a c.i.a)
v.i.a.g.i.a
::
++ limit
|= [lim=@u mal=marl]
=< res
|- ^- [rem=@u res=marl]
?~ mal [lim ~]
?~ lim [0 ~]
=+ ^- [lam=@u hed=manx]
?: ?=(_:/(**) i.mal)
[lim :/(tay)]:(deword lim v.i.a.g.i.mal)
[rem ele(c res)]:[ele=i.mal $(mal c.i.mal)]
[rem - res]:[hed $(lim lam, mal t.mal)]
::
++ deword
|= [lim=@u tay=tape] ^- [lim=@u tay=tape]
?~ tay [lim tay]
?~ lim [0 ~]
=+ wer=((plus alp) 1^1 tay)
?~ q.wer
[lim - tay]:[i.tay $(tay t.tay)]
=+ nex=$(lim (dec lim), tay q.q.u.q.wer)
[-.nex (welp (wonk wer) +.nex)]
--
::
!:
|_ own=manx
::
++ grow :: convert to
|%
++ psal own
++ hymn ;html:(head:title:"snip" body:"+{psal}") :: convert to %hymn
++ html (crip (poxo hymn)) :: convert to %html
++ mime [/text/html (taco html)] :: convert to %mime
--
++ garb [%react-snip ~]
++ grab |% :: convert from
++ noun manx :: clam from %noun
++ psal
|= a=manx
=+ (hedtal +.a)
;div:(h1:"{hed}" div:"*{tal}")
-- --