More tweaking round the bleeding edges.

This commit is contained in:
C. Guy Yarvin 2014-07-27 05:04:30 -07:00
parent c8399fdacf
commit 3c4696fefd

View File

@ -292,10 +292,7 @@
:- p=(came p.nuf `calx`[sem `calm`[now p.q.nuf] q.q.hoc q.q.nuf]) :- p=(came p.nuf `calx`[sem `calm`[now p.q.nuf] q.q.hoc q.q.nuf])
q=q.nuf q=q.nuf
== ==
:- p=p.hoc [p=p.hoc q=[%0 p=p.q.hoc q=((calf sem) u.cux)]]
^= q
:+ %0 p.q.hoc
((calf sem) u.cux)
== ==
:: ::
++ coax :: bolt across ++ coax :: bolt across
@ -402,10 +399,12 @@
|= gef=gift |= gef=gift
%_(+> mow :_(mow [hen %give gef])) %_(+> mow :_(mow [hen %give gef]))
:: ::
++ fact :: %hoon to vase ++ fade :: compile to hood
|= [cof=cafe hoc=(bolt (pair beam cage))] |= [cof=cafe bem=beam]
^- (bolt hood) ^- (bolt hood)
%+ (clef %hood) hoc %+ cope (make cof [%bake %hoon bem ~])
|= [cof=cafe cay=cage]
%+ (clef %hood) (fine cof bem cay)
^- (burg (pair beam cage) hood) ^- (burg (pair beam cage) hood)
|= [cof=cafe bem=beam cay=cage] |= [cof=cafe bem=beam cay=cage]
=+ rul=(fair bem) =+ rul=(fair bem)
@ -416,13 +415,6 @@
(flaw cof [%leaf "syntax error: {<p.p.vex>} {<q.p.vex>}"] ~) (flaw cof [%leaf "syntax error: {<p.p.vex>} {<q.p.vex>}"] ~)
(fine cof p.u.q.vex) (fine cof p.u.q.vex)
:: ::
++ fade :: compile to hood
|= [cof=cafe bem=beam]
^- (bolt hood)
%+ cope (make cof [%bake %hoon bem ~])
|= [cof=cafe cay=cage]
(fact cof (fine cof bem cay))
::
++ fane :: compile %hoon ++ fane :: compile %hoon
|= [cof=cafe kas=silk] |= [cof=cafe kas=silk]
^- (bolt twig) ^- (bolt twig)
@ -641,23 +633,26 @@
|= [cof=cafe yom=(list (pair wing vase))] |= [cof=cafe yom=(list (pair wing vase))]
%+ cope (make cof kas) %+ cope (make cof kas)
|= [cof=cafe cay=cage] |= [cof=cafe cay=cage]
=+ ^= vow %+ cope (keel cof q.cay yom)
%+ slop q.cay
|- ^- vase
?~ yom [[%atom %n] ~]
(slop q.i.yom $(yom t.yom))
%+ cope
%^ maim cof vow
^- twig
:+ %cncb [%& 2]~
=+ axe=3
|- ^- (list (pair wing twig))
?~ yom ~
:- [p.i.yom [%$ (peg axe 2)]]
$(yom t.yom, axe (peg axe 3))
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof p.cay vax) (fine cof p.cay vax)
:: ::
++ keel :: apply mutations
|= [cof=cafe suh=vase yom=(list (pair wing vase))]
^- (bolt vase)
%^ maim cof
%+ slop suh
|- ^- vase
?~ yom [[%atom %n] ~]
(slop q.i.yom $(yom t.yom))
^- twig
:+ %cncb [%& 2]~
=+ axe=3
|- ^- (list (pair wing twig))
?~ yom ~
:- [p.i.yom [%$ (peg axe 2)]]
$(yom t.yom, axe (peg axe 3))
::
++ lace :: load and check ++ lace :: load and check
|= [cof=cafe for=mark bem=beam arg=heel] |= [cof=cafe for=mark bem=beam arg=heel]
^- (bolt (unit vase)) ^- (bolt (unit vase))
@ -755,7 +750,7 @@
?> ?=(^ u.wuy) ?> ?=(^ u.wuy)
%+ cope (make cof %bake i.u.wuy bem arg) %+ cope (make cof %bake i.u.wuy bem arg)
|= [cof=cafe hoc=cage] |= [cof=cafe hoc=cage]
%+ cope (lope cof i.u.wuy t.u.wuy bem q.hoc) %+ cope (lope cof i.u.wuy t.u.wuy -.bem q.hoc)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof ~ vax) (fine cof ~ vax)
:: ::
@ -771,14 +766,14 @@
^$(s.mob t.s.mob, mer [i.s.mob mer]) ^$(s.mob t.s.mob, mer [i.s.mob mer])
:: ::
++ link :: translate ++ link :: translate
|= [cof=cafe too=mark for=mark bem=beam vax=vase] |= [cof=cafe too=mark for=mark bek=beak vax=vase]
^- (bolt vase) ^- (bolt vase)
?: =(too for) (fine cof vax) ?: =(too for) (fine cof vax)
:: ?: &(=(%hoon for) |(=(%core too) =(%gate too) =(%door too)))
?: |(=(%noun for) =(%$ for)) ?: |(=(%noun for) =(%$ for))
((lake too -.bem) cof vax) ((lake too bek) cof vax)
%+ cope %+ cope
(make cof %boil %gate [[p.bem %main r.bem] /[too]/tan/[for]/sys] ~) :: (make cof %boil %door bek /[for]/gun)
(make cof %boil %gate [[p.bek %main r.bek] /[too]/tan/[for]/sys] ~)
|= [cof=cafe cay=cage] |= [cof=cafe cay=cage]
(maul cof q.cay vax) (maul cof q.cay vax)
:: ::
@ -816,10 +811,10 @@
-- --
:: ::
++ lope :: translation pipe ++ lope :: translation pipe
|= [cof=cafe for=mark yaw=(list mark) bem=beam vax=vase] |= [cof=cafe for=mark yaw=(list mark) bek=beak vax=vase]
^- (bolt vase) ^- (bolt vase)
?~ yaw (fine cof vax) ?~ yaw (fine cof vax)
%+ cope (link cof i.yaw for bem vax) %+ cope (link cof i.yaw for bek vax)
|= [cof=cafe yed=vase] |= [cof=cafe yed=vase]
^$(cof cof, for i.yaw, yaw t.yaw, vax yed) ^$(cof cof, for i.yaw, yaw t.yaw, vax yed)
:: ::
@ -887,7 +882,7 @@
%+ cool |.(leaf/"ford: cast {<p.kas>}") %+ cool |.(leaf/"ford: cast {<p.kas>}")
%+ cope $(kas q.kas) %+ cope $(kas q.kas)
|= [cof=cafe cay=cage] |= [cof=cafe cay=cage]
%+ cope (link cof p.kas p.cay `beam`[[our %main %da now] ~] q.cay) %+ cope (link cof p.kas p.cay [our %main %da now] q.cay)
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof [p.kas vax]) (fine cof [p.kas vax])
:: ::