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

move ++freeze to ++shut:ap, produce marl

Browse Source
This commit is contained in:
Fang 2017-08-02 15:40:13 -07:00
parent 974d789662
commit 9c6ed180d3
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arvo/hoon.hoon
View File

@ -7344,9 +7344,9 @@
{$xmn *} {$xmn *}
:: ::
::REVIEW separate ap arms? ::REVIEW separate ap arms?
=* open-mane =/ open-mane
|=(a/mane ?@(a [%rock %tas a] [[%rock %tas -.a] [%rock %tas +.a]])) |=(a/mane ?@(a [%rock %tas a] [[%rock %tas -.a] [%rock %tas +.a]]))
=* open-mart |=({n/mane v/(list beer)} [(open-mane n) %knit v]) =/ open-mart |=({n/mane v/(list beer)} [(open-mane n) %knit v])
[[(open-mane n.g.p.gen) %conl (turn a.g.p.gen open-mart)] %xml c.p.gen] [[(open-mane n.g.p.gen) %conl (turn a.g.p.gen open-mart)] %xml c.p.gen]
:: ::
{$xml *} {$xml *}
@ -7503,6 +7503,22 @@
* gen * gen
== ==
:: ::
++ shut :: as xml constant
^- marl
?+ -.gen ~|([%bad-xml -.gen] !!)
$xmn
=/ shut-mart
|=({n/mane v/(list beer)} [n (turn v |=(a/beer ?^(a !! a)))])
::
[[n.g.p.gen (turn a.g.p.gen shut-mart)] shut(gen [%xml c.p.gen])]~
::
$xml
?~ p.gen ~
=- (weld - shut(p.gen t.p.gen))
?@ -.i.p.gen ~|([%shut-tuna -.i.p.gen] !!)
shut(gen [%xmn i.p.gen])
==
::
++ rake ~|(%rake-twig (need reek)) ++ rake ~|(%rake-twig (need reek))
++ reek ++ reek
^- (unit wing) ^- (unit wing)

25
gen/cram.hoon
View File

@ -33,23 +33,6 @@
:: with normal hoon rules. multipass parsing is the tax :: with normal hoon rules. multipass parsing is the tax
:: humans have to pay for simple but human-friendly syntax.) :: humans have to pay for simple but human-friendly syntax.)
:: ::
=>
|%
::
++ freeze
|= manx:twig ^- manx
:- [n.g (turn a.g freeze-mart)]
%+ turn c
|=(a/tuna:twig ?@(-.a !! (freeze a)))
::
++ freeze-mart
|= {n/mane v/(list beer)} ^- {mane tape}
[n (turn v |=(a/beer ?^(a !! a)))]
::
::
::+|
::
--
::|= inp/cord ::|= inp/cord
::=< (steam-marl (rash inp apex:(sail &))) ::=< (steam-marl (rash inp apex:(sail &)))
=< |=(pax/path (test pax)) =< |=(pax/path (test pax))
@ -110,8 +93,8 @@
:: print result as error or xml text :: print result as error or xml text
?~ q.vex ?~ q.vex
"syntax error: line {(scow %ud p.p.vex)}, column {(scow %ud q.p.vex)}" "syntax error: line {(scow %ud p.p.vex)}, column {(scow %ud q.p.vex)}"
?: [freeze=|] (poxo (freeze p.u.q.vex)) ?: [freeze=|] (poxo /div ~(shut ap %xml p.u.q.vex))
(poxo ;;(manx q:(slap !>(..zuse) (steam p.u.q.vex)))) (poxo /div ;;(marl q:(slap !>(..zuse) [%xml p.u.q.vex])))
:: ::
++ join :: glue tapes together ++ join :: glue tapes together
|= {a/char b/(list tape)} |= {a/char b/(list tape)}
@ -121,7 +104,6 @@
(welp i.b a $(b t.b)) (welp i.b a $(b t.b))
:: ::
++ cram :: parse unmark ++ cram :: parse unmark
%+ stag [%div ~] ::REVIEW
|= {naz/hair los/tape} |= {naz/hair los/tape}
%+ pfix (hrul:cram-parsers +<) %+ pfix (hrul:cram-parsers +<)
|= nail ^- (like marl:twig) |= nail ^- (like marl:twig)
@ -665,7 +647,7 @@
;~(pfix gay down) ::REVIEW does this mean comments work? ;~(pfix gay down) ::REVIEW does this mean comments work?
:: ::
++ expr :: expression ++ expr :: expression
;~(pfix gay a-marl:(sail:vast &)) ;~(pfix gay (cook drop-top toplevel):(sail:vast &))
:: ::
++ whit :: whitespace ++ whit :: whitespace
(cold ' ' (plus ;~(pose (just ' ') line))) (cold ' ' (plus ;~(pose (just ' ') line)))
@ -716,7 +698,6 @@
%- star %- star
;~ pfix gay ;~ pfix gay
;~ pose ;~ pose
:(cook poxo freeze cram)
;~(sfix ;~(less hrul:cram-parsers (star prn)) (just '\0a')) ;~(sfix ;~(less hrul:cram-parsers (star prn)) (just '\0a'))
== ==
== ==