More pre-breach fixes.

This commit is contained in:
C. Guy Yarvin 2014-05-31 13:22:49 -07:00
parent 32295555c5
commit 4db07a816d
9 changed files with 74 additions and 70 deletions

View File

@ -424,7 +424,8 @@
[~ +>.$] [~ +>.$]
=+ rad=(~(get by hoc.saf) her) =+ rad=(~(get by hoc.saf) her)
?^ rad ?^ rad
?> ?=(^ lew.wod.u.rad) ?. ?=(^ lew.wod.u.rad)
$(hoc.saf (~(del by hoc.saf) her)) :: XX how can this be?
?. =(pub r.q.i.lew.wod.u.rad) [~ +>.$] ?. =(pub r.q.i.lew.wod.u.rad) [~ +>.$]
[[~ lew.wod.u.rad] +>.$] [[~ lew.wod.u.rad] +>.$]
=+ syp=[[0 [~ p.nes] her now] ges pub] =+ syp=[[0 [~ p.nes] her now] ges pub]
@ -1466,7 +1467,7 @@
:: ::
++ scry ++ scry
|= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path]
^- (unit (unit)) ^- (unit (unit (pair lode ,*)))
?~ tyl [~ ~] ?~ tyl [~ ~]
=+ hun=(slaw %p i.tyl) =+ hun=(slaw %p i.tyl)
?~ hun [~ ~] ?~ hun [~ ~]
@ -1476,11 +1477,15 @@
?. =(0 ren) ~ ?. =(0 ren) ~
?+ lot ~ ?+ lot ~
[%$ %ud @] [%$ %ud @]
%+ bind
(perm who u.hun q.p.lot [syd t.tyl]) (perm who u.hun q.p.lot [syd t.tyl])
|=(a=* [%noun a])
:: ::
[%$ %da @] [%$ %da @]
?. =(now q.p.lot) ~ ?. =(now q.p.lot) ~
%+ bind
(temp who u.hun [syd t.tyl]) (temp who u.hun [syd t.tyl])
|=(a=* [%noun a])
== ==
:: ::
++ stay fox ++ stay fox
@ -1656,6 +1661,9 @@
=+ fod=(~(get by hoc.saf.u.gys) his) =+ fod=(~(get by hoc.saf.u.gys) his)
?~ fod ~ ?~ fod ~
(rick mar his lew.wod.u.fod) (rick mar his lew.wod.u.fod)
?: ?=([%tick ~] tyl)
?. =(our (sein his)) ~
[~ (end 6 1 (shaf %tick (mix his (shax sec:ex:q:sen:u.gys))))]
~ ~
?: ?=([%buck ~] tyl) ?: ?=([%buck ~] tyl)
=+ muc=(rice mar sex:u.gys) =+ muc=(rice mar sex:u.gys)
@ -1664,11 +1672,6 @@
[~ `buck`[u.muc u.luw]] [~ `buck`[u.muc u.luw]]
?: ?=([%code ~] tyl) ?: ?=([%code ~] tyl)
[~ (end 6 1 (shaf %code (shax sec:ex:q:sen:u.gys)))] [~ (end 6 1 (shaf %code (shax sec:ex:q:sen:u.gys)))]
?: ?=([%tick @ ~] tyl)
=+ hur=(slaw %p i.t.tyl)
?~ hur ~
?. =(our (sein u.hur)) ~
[~ (end 6 1 (shaf %tick (mix u.hur (shax sec:ex:q:sen:u.gys))))]
?: ?=([%will ~] tyl) ?: ?=([%will ~] tyl)
(rick mar our law.saf.u.gys) (rick mar our law.saf.u.gys)
~ ~

View File

@ -1279,7 +1279,7 @@
:: ::
++ scry ++ scry
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit)) ^- (unit (unit (pair lode ,*)))
~ ~
:: ::
++ stay [%0 big dez] ++ stay [%0 big dez]

View File

@ -437,7 +437,7 @@
:: ::
++ scry :: inspect ++ scry :: inspect
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit)) ^- (unit (unit (pair lode ,*)))
=+ got=(~(has by fat.ruf) his) =+ got=(~(has by fat.ruf) his)
=+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot)) =+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot))
?~ luk [~ ~] ?~ luk [~ ~]
@ -446,9 +446,10 @@
[~ ~] [~ ~]
=+ run=((soft care) ren) =+ run=((soft care) ren)
?~ run [~ ~] ?~ run [~ ~]
%+ bind
%. [u.run u.luk tyl] %. [u.run u.luk tyl]
=+ dud=?.(got (do now [his his] syd ruf) (di:une syd)) aver:?.(got (do now [his his] syd ruf) (di:une syd))
aver:dud |=(a=(unit) (bind a |=(b=* [%noun b])))
:: ::
++ stay [%0 ruf] ++ stay [%0 ruf]
-- --

View File

@ -451,7 +451,7 @@
:: ::
++ scry ++ scry
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit)) ^- (unit (unit (pair lode ,*)))
~ ~
:: ::
++ stay [%0 dug] ++ stay [%0 dug]

View File

@ -1718,7 +1718,7 @@
:: ::
%fun %fun
:- [~ pip(pez %way)] :- [~ pip(pez %way)]
=+ bem=`beam`(need (tome q.som.pip)) =+ bem=`bead`(need (tome q.som.pip))
=+ bek=`beak`[p.bem q.bem r.bem] =+ bek=`beak`[p.bem q.bem r.bem]
=+ kas=`silk`[%cast %mime bek `silk`[%boil p.som.pip bem]] =+ kas=`silk`[%cast %mime bek `silk`[%boil p.som.pip bem]]
+>.$(..ya (honk our num ses kas)) +>.$(..ya (honk our num ses kas))
@ -1866,7 +1866,7 @@
:: ::
++ scry ++ scry
|= [our=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] |= [our=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path]
^- (unit (unit)) ^- (unit (unit (pair lode ,*)))
~ ~
:: ::
++ stay `bolo`+>-.$ ++ stay `bolo`+>-.$

View File

@ -17,8 +17,8 @@
|* a=$+(* *) :: product clam |* a=$+(* *) :: product clam
$: p=cafe :: cache $: p=cafe :: cache
$= q :: $= q ::
$% [%0 p=(set beam) q=a] :: depends/product $% [%0 p=(set bead) q=a] :: depends/product
[%1 p=(set ,[p=beam q=(list tank)])] :: blocks [%1 p=(set ,[p=bead q=(list tank)])] :: blocks
[%2 p=(list tank)] :: error [%2 p=(list tank)] :: error
== :: == ::
== :: == ::
@ -34,7 +34,7 @@
:: :: :: ::
++ calm :: cache metadata ++ calm :: cache metadata
$: laz=@da :: last accessed $: laz=@da :: last accessed
dep=(set beam) :: dependencies dep=(set bead) :: dependencies
== :: == ::
++ calx :: concrete cache line ++ calx :: concrete cache line
$% [%comp p=calm q=cage r=twig] :: compile by text $% [%comp p=calm q=cage r=twig] :: compile by text
@ -43,7 +43,7 @@
++ task :: problem in progress ++ task :: problem in progress
$: nah=duct :: cause $: nah=duct :: cause
kas=silk :: problem kas=silk :: problem
kig=[p=@ud q=(map ,@ud beam)] :: blocks kig=[p=@ud q=(map ,@ud bead)] :: blocks
== :: == ::
-- :: -- ::
|% :: |% ::
@ -85,7 +85,7 @@
== ==
:: ::
++ fine |* [a=cafe b=*] :: bolt from data ++ fine |* [a=cafe b=*] :: bolt from data
[p=`cafe`a q=[%0 p=*(set beam) q=b]] :: [p=`cafe`a q=[%0 p=*(set bead) q=b]] ::
++ flaw |=([a=cafe b=(list tank)] [p=a q=[%2 p=b]]) :: bolt from error ++ flaw |=([a=cafe b=(list tank)] [p=a q=[%2 p=b]]) :: bolt from error
:: ::
++ grom :: merge sets ++ grom :: merge sets
@ -147,7 +147,7 @@
++ amok %_(..zo q.tad.bay (~(del by q.tad.bay) num)) ++ amok %_(..zo q.tad.bay (~(del by q.tad.bay) num))
++ camo :: stop requests ++ camo :: stop requests
^+ . ^+ .
=+ kiz=(~(tap by q.kig) *(list ,[p=@ud q=beam])) =+ kiz=(~(tap by q.kig) *(list ,[p=@ud q=bead]))
|- ^+ +> |- ^+ +>
?~ kiz +> ?~ kiz +>
%= $ %= $
@ -160,7 +160,7 @@
== ==
:: ::
++ camp :: request a file ++ camp :: request a file
|= [ren=care bem=beam] |= [ren=care bem=bead]
^+ +> ^+ +>
=+ tik=(scot %ud p.kig) =+ tik=(scot %ud p.kig)
=: p.kig +(p.kig) =: p.kig +(p.kig)
@ -240,13 +240,13 @@
^= q ^= q
?- -.ton ?- -.ton
%2 [%2 p=p.ton] %2 [%2 p=p.ton]
%0 [%0 p=*(set beam) q=(fun p.ton)] %0 [%0 p=*(set bead) q=(fun p.ton)]
%1 =- ?- faw %1 =- ?- faw
& [%1 p=(turn p.faw |=(a=beam [a *(list tank)]))] & [%1 p=(turn p.faw |=(a=bead [a *(list tank)]))]
| [%2 p=p.faw] | [%2 p=p.faw]
== ==
^= faw ^= faw
|- ^- (each (list beam) (list tank)) |- ^- (each (list bead) (list tank))
?~ p.ton [%& ~] ?~ p.ton [%& ~]
=+ nex=$(p.ton t.p.ton) =+ nex=$(p.ton t.p.ton)
=+ pax=(path i.p.ton) =+ pax=(path i.p.ton)
@ -277,7 +277,7 @@
=< abet =< abet
|- ^+ ..exec |- ^+ ..exec
?~ zuk ..exec ?~ zuk ..exec
=+ foo=`_..exec`(camp %x `beam`p.i.zuk) =+ foo=`_..exec`(camp %x `bead`p.i.zuk)
$(zuk t.zuk, ..exec foo) $(zuk t.zuk, ..exec foo)
== ==
:: ::
@ -342,7 +342,7 @@
(fine cof p.cay vax) (fine cof p.cay vax)
:: ::
++ krab :: load to twig ++ krab :: load to twig
|= [cof=cafe for=logo how=logo rem=spur bem=beam] |= [cof=cafe for=logo how=logo rem=spur bem=bead]
^- (bolt vase) ^- (bolt vase)
%+ cope (fade cof %bake how bem) %+ cope (fade cof %bake how bem)
|= [cof=cafe gen=twig] |= [cof=cafe gen=twig]
@ -351,7 +351,7 @@
(maul cof gat !>([`beak`[p.bem q.bem r.bem] for +:s.bem rem])) (maul cof gat !>([`beak`[p.bem q.bem r.bem] for +:s.bem rem]))
:: ::
++ lace :: load and check ++ lace :: load and check
|= [cof=cafe for=logo rem=spur bem=beam] |= [cof=cafe for=logo rem=spur bem=bead]
^- (bolt (unit vase)) ^- (bolt (unit vase))
=+ bek=`beak`[p.bem q.bem r.bem] =+ bek=`beak`[p.bem q.bem r.bem]
%+ cope (lend cof bem) %+ cope (lend cof bem)
@ -375,7 +375,7 @@
^- (bolt (unit vase)) ^- (bolt (unit vase))
?: ?=(?(%gate %core %hoon %hook) for) ?: ?=(?(%gate %core %hoon %hook) for)
(fine cof ~ sam) (fine cof ~ sam)
%+ cope (make cof %boil %gate p.bek q.bek r.bek /ref/[for]/sys) %+ cope (make cof %boil %gate bek /ref/[for]/sys)
|= [cof=cafe cay=cage] |= [cof=cafe cay=cage]
%+ cope (lane cof p.q.cay [%cnzy %$]) %+ cope (lane cof p.q.cay [%cnzy %$])
|= [cof=cafe ref=type] |= [cof=cafe ref=type]
@ -386,7 +386,7 @@
(fine cof ~ pro) (fine cof ~ pro)
:: ::
++ lair :: metaload ++ lair :: metaload
|= [for=logo bem=beam] |= [for=logo bem=bead]
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
^- (bolt vase) ^- (bolt vase)
?. (~(nest ut -:!>(*silk)) | p.vax) ?. (~(nest ut -:!>(*silk)) | p.vax)
@ -402,14 +402,14 @@
|=(ref=type ref) |=(ref=type ref)
:: ::
++ lend :: load arch ++ lend :: load arch
|= [cof=cafe bem=beam] |= [cof=cafe bem=bead]
^- (bolt arch) ^- (bolt arch)
=+ von=(ska %cy (tope bem)) =+ von=(ska %cy (tope bem))
?~ von [p=cof q=[%1 [bem ~] ~ ~]] ?~ von [p=cof q=[%1 [bem ~] ~ ~]]
(fine cof ((hard arch) (need u.von))) (fine cof ((hard arch) (need u.von)))
:: ::
++ liar :: load vase ++ liar :: load vase
|= [cof=cafe bem=beam] |= [cof=cafe bem=bead]
^- (bolt vase) ^- (bolt vase)
=+ von=(ska %cx (tope bem)) =+ von=(ska %cx (tope bem))
?~ von ?~ von
@ -422,14 +422,14 @@
|= [cof=cafe for=logo bek=beak] |= [cof=cafe for=logo bek=beak]
^- (bolt (list ,@tas)) ^- (bolt (list ,@tas))
%+ cope %+ cope
%+ cope (lend cof p.bek q.bek r.bek `path`~[%tan for %sys]) %+ cope (lend cof bek `path`~[%tan for %sys])
|= [cof=cafe arc=arch] |= [cof=cafe arc=arch]
(fine cof (turn (~(tap by r.arc) ~) |=([a=@tas b=~] a))) (fine cof (turn (~(tap by r.arc) ~) |=([a=@tas b=~] a)))
|= [cof=cafe all=(list ,@tas)] |= [cof=cafe all=(list ,@tas)]
(fine cof ?.(=(%hoon for) all [%hoot all])) (fine cof ?.(=(%hoon for) all [%hoot all]))
:: ::
++ lima :: load at depth ++ lima :: load at depth
|= [cof=cafe for=logo rem=spur bem=beam] |= [cof=cafe for=logo rem=spur bem=bead]
^- (bolt (unit vase)) ^- (bolt (unit vase))
%+ cope (lend cof bem) %+ cope (lend cof bem)
|= [cof=cafe arc=arch] |= [cof=cafe arc=arch]
@ -451,8 +451,8 @@
|= [cof=cafe vax=vase] |= [cof=cafe vax=vase]
(fine cof ~ vax) (fine cof ~ vax)
:: ::
++ lime :: load beam ++ lime :: load bead
|= [cof=cafe for=logo bem=beam] |= [cof=cafe for=logo bem=bead]
=+ [mob=bem rem=*path] =+ [mob=bem rem=*path]
|- ^- (bolt vase) |- ^- (bolt vase)
%+ cope (lima cof for rem bem) %+ cope (lima cof for rem bem)
@ -468,7 +468,7 @@
?: =(too for) (fine cof vax) ?: =(too for) (fine cof vax)
?: &(=(%hoot too) =(%hoon for)) ?: &(=(%hoot too) =(%hoon for))
(fine cof !>(ream)) (fine cof !>(ream))
%+ cope (make cof %boil %gate p.bek q.bek r.bek /[too]/tan/[for]/sys) %+ cope (make cof %boil %gate bek /[too]/tan/[for]/sys)
|= [cof=cafe cay=cage] |= [cof=cafe cay=cage]
(maul cof q.cay vax) (maul cof q.cay vax)
:: ::
@ -651,7 +651,7 @@
:: ::
++ scry ++ scry
|= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path]
^- (unit (unit)) ^- (unit (unit (pair lode ,*)))
~ ~
:: ::
++ stay `axle`+>-.$ ++ stay `axle`+>-.$

View File

@ -164,7 +164,7 @@
lot=coin lot=coin
tyl=path tyl=path
== ==
^- (unit (unit)) ^- (unit (unit (pair lode ,*)))
=+ ^= vew ^- lens :: XX future scry =+ ^= vew ^- lens :: XX future scry
%. :- use %. :- use
:- [who syd ((hard case) p.lot)] :- [who syd ((hard case) p.lot)]
@ -173,6 +173,7 @@
bid=bead :: position bid=bead :: position
== :: == ::
(beef:(gaur p.bid q.bid) use r.bid s.bid) (beef:(gaur p.bid q.bid) use r.bid s.bid)
%+ bind
?+ ren ~ ?+ ren ~
%u u.vew %u u.vew
%v v.vew %v v.vew
@ -181,6 +182,7 @@
%y y.vew %y y.vew
%z z.vew %z z.vew
== ==
|=(a=(unit) (bind a |=(b=* [%noun b])))
:: ::
++ doze ++ doze
|= [now=@da hen=duct] |= [now=@da hen=duct]
@ -358,7 +360,7 @@
%_(+>.$ ped.sat pen, mow :(weld new old mow)) %_(+>.$ ped.sat pen, mow :(weld new old mow))
:: ::
++ drum :: raw dependencies ++ drum :: raw dependencies
|= dep=(set beam) |= dep=(set bead)
^+ +> ^+ +>
?> ?=(^ orm.sat) ?> ?=(^ orm.sat)
%- drug %- drug
@ -395,7 +397,7 @@
++ home :: load application ++ home :: load application
^- silk ^- silk
:+ %boil %core :+ %boil %core
[our %main [%da now] %app ~] [[our %main [%da now]] %app ~]
:: ::
++ more :: accept result ++ more :: accept result
|= $: pax=path :: internal position |= $: pax=path :: internal position

View File

@ -9019,7 +9019,7 @@
ren=care ren=care
bed=bead bed=bead
== ==
^- (unit (unit)) ^- (unit (unit cage))
=+ ^= old =+ ^= old
:* fur :* fur
ren ren
@ -9028,9 +9028,12 @@
`coin`[%$ r.bed] `coin`[%$ r.bed]
(flop s.bed) (flop s.bed)
== ==
^- (unit (unit)) ^- (unit (unit cage))
=+ pro=(slym (slap rig [%cnzy %scry]) old) =+ pro=(slym (slap rig [%cnzy %scry]) old)
((hard (unit (unit))) q.pro) ?~ q.pro ~
?~ +.q.pro [~ ~]
=+ dat=(slot 7 pro)
[~ ~ (lode q.dat) (slot 3 dat)]
:: ::
++ soar :: postprocess vane ++ soar :: postprocess vane
|= sev=vase |= sev=vase
@ -9080,12 +9083,8 @@
|- ^- (unit (unit cage)) |- ^- (unit (unit cage))
?~ fan ~ ?~ fan ~
?. =(dis p.i.fan) $(fan t.fan) ?. =(dis p.i.fan) $(fan t.fan)
=+ ^= bop
%- scry:(wink:(vent vil bud q.i.fan) now (shax now) ..^$) %- scry:(wink:(vent vil bud q.i.fan) now (shax now) ..^$)
[fur ren bed] [fur ren bed]
?~ bop ~
?~ u.bop [~ ~]
[~ ~ [%$ %noun u.u.bop]]
:: ::
++ dink :: vase by char ++ dink :: vase by char
|= din=@tas ^- vase |= din=@tas ^- vase

View File

@ -1945,7 +1945,7 @@
:: ::
++ tome :: parse path ++ tome :: parse path
|= pax=path |= pax=path
^- (unit beam) ^- (unit bead)
?. ?=([* * * *] pax) ~ ?. ?=([* * * *] pax) ~
%+ biff (slaw %p i.pax) %+ biff (slaw %p i.pax)
|= who=ship |= who=ship
@ -1954,10 +1954,10 @@
%+ biff (slay i.t.t.pax) %+ biff (slay i.t.t.pax)
|= cis=coin |= cis=coin
?. ?=([%$ case] cis) ~ ?. ?=([%$ case] cis) ~
`(unit beam)`[~ who dex `case`p.cis (flop t.t.t.pax)] `(unit bead)`[~ [who dex `case`p.cis] (flop t.t.t.pax)]
:: ::
++ tope :: beam to path ++ tope :: bead to path
|= bem=beam |= bem=bead
^- path ^- path
[(scot %p p.bem) q.bem (scot r.bem) (flop s.bem)] [(scot %p p.bem) q.bem (scot r.bem) (flop s.bem)]
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -2018,14 +2018,13 @@
== :: == ::
++ beau ,[p=(unit ,@ud) q=(map wire goal) r=boor] :: next/want/thread ++ beau ,[p=(unit ,@ud) q=(map wire goal) r=boor] :: next/want/thread
++ beak ,[p=ship q=desk r=case] :: garnish with beak ++ beak ,[p=ship q=desk r=case] :: garnish with beak
++ beam ,[p=ship q=desk r=case s=spur] :: spur is flopped
++ bear ,[p=(map path goal) q=boar] :: thread with slips ++ bear ,[p=(map path goal) q=boar] :: thread with slips
++ beef :: raw product ++ beef :: raw product
$: p=(list gilt) :: actions $: p=(list gilt) :: actions
q=(list slip) :: requests q=(list slip) :: requests
r=boar :: state r=boar :: state
== :: == ::
++ beet ,[p=(set beam) q=cage] :: computed result ++ beet ,[p=(set bead) q=cage] :: computed result
++ bird :: packet in travel ++ bird :: packet in travel
$: gom=soap :: message identity $: gom=soap :: message identity
mup=@ud :: pktno in msg mup=@ud :: pktno in msg
@ -2582,11 +2581,11 @@
== :: == ::
++ silk :: construction layer ++ silk :: construction layer
$& [p=silk q=silk] :: cons $& [p=silk q=silk] :: cons
$% [%bake p=logo q=beam] :: local synthesis $% [%bake p=logo q=bead] :: local synthesis
[%boil p=logo q=beam] :: general synthesis [%boil p=logo q=bead] :: general synthesis
[%call p=silk q=silk] :: slam [%call p=silk q=silk] :: slam
[%cast p=logo q=beak r=silk] :: translate [%cast p=logo q=beak r=silk] :: translate
[%done p=(set beam) q=cage] :: literal [%done p=(set bead) q=cage] :: literal
[%mute p=silk q=(list (pair wing silk))] :: mutant [%mute p=silk q=(list (pair wing silk))] :: mutant
[%pass p=silk q=sill] :: twig construction [%pass p=silk q=sill] :: twig construction
[%reef ~] :: kernel reef [%reef ~] :: kernel reef
@ -2594,7 +2593,7 @@
++ sill :: code construction ++ sill :: code construction
$% [%0 p=@] :: direct text $% [%0 p=@] :: direct text
[%1 p=twig] :: direct twig [%1 p=twig] :: direct twig
[%2 p=beam] :: beam over %hoon [%2 p=bead] :: bead over %hoon
[%3 p=silk] :: build a %hoot [%3 p=silk] :: build a %hoot
== :: == ::
++ skit ,[p=(unit ,@ta) q=(list ,@ta) r=(list ,@ta)] :: tracking path ++ skit ,[p=(unit ,@ta) q=(list ,@ta) r=(list ,@ta)] :: tracking path