urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 12:43:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'bf54034' into cc-merge

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-11-13 19:35:40 -08:00
commit 58a0d104ff
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/drum.hoon
View File

@ -396,8 +396,8 @@
|= lin/(pair @ud stub:^dill) |= lin/(pair @ud stub:^dill)
^+ +> ^+ +>
?: =(mir lin) +> ?: =(mir lin) +>
=. +> ?:(=(p.mir p.lin) +> (se-blit %hop (add p.lin (lent-stye:klr q.lin))))
=. +> ?:(=(q.mir q.lin) +> (se-blit %pom q.lin)) =. +> ?:(=(q.mir q.lin) +> (se-blit %pom q.lin))
=. +> ?:(=(p.mir p.lin) +> (se-blit %hop p.lin))
+>(mir lin) +>(mir lin)
:: ::
++ se-just :: adjusted buffer ++ se-just :: adjusted buffer
@ -837,7 +837,7 @@
=; vew/(pair (list @c) styx:^dill) =; vew/(pair (list @c) styx:^dill)
=+ lin=(make:klr q.vew) =+ lin=(make:klr q.vew)
:_ (welp lin [*stye:^dill p.vew]~) :_ (welp lin [*stye:^dill p.vew]~)
(add pos.inp (roll (lnts:klr lin) add)) (add pos.inp (lent-char:klr lin))
?: vis.pom ?: vis.pom
:- buf.say.inp :: default prompt :- buf.say.inp :: default prompt
?~ ris ?~ ris
@ -943,14 +943,30 @@
[a b] [a b]
[[p.a (weld q.a q.i.b)] t.b] [[p.a (weld q.a q.i.b)] t.b]
:: ::
++ lnts :: stub pair lengths ++ lent-stye
|= a/stub |= a/stub ^- @
(roll (lnts-stye a) add)
::
++ lent-char
|= a/stub ^- @
(roll (lnts-char a) add)
::
++ lnts-stye :: stub pair head lengths
|= a/stub ^- (list @)
%+ turn a %+ turn a
|= a/(pair stye (list @c)) |= a/(pair stye (list @c))
%+ add ;: add :: presumes impl of cvrt:ansi in %dill
(lent q.a) (mul 5 2) :: bg
=+ d=~(wyt in p.p.a) (mul 5 2) :: fg
(mul 4 ?:(=(0 d) 0 +(d))) =+ b=~(wyt in p.p.a) :: effect
?:(=(0 b) 0 (mul 4 +(b)))
==
::
++ lnts-char :: stub pair tail lengths
|= a/stub ^- (list @)
%+ turn a
|= a/(pair stye (list @c))
(lent q.a)
:: ::
++ brek :: index + incl-len of ++ brek :: index + incl-len of
|= {a/@ b/(list @)} :: stub pair w/ idx a |= {a/@ b/(list @)} :: stub pair w/ idx a
@ -965,7 +981,7 @@
++ slag :: slag stub, keep stye ++ slag :: slag stub, keep stye
|= {a/@ b/stub} |= {a/@ b/stub}
^- stub ^- stub
=+ c=(lnts b) =+ c=(lnts-char b)
=+ i=(brek a c) =+ i=(brek a c)
?~ i b ?~ i b
=+ r=(^slag +(p.u.i) b) =+ r=(^slag +(p.u.i) b)
@ -978,7 +994,7 @@
++ scag :: scag stub, keep stye ++ scag :: scag stub, keep stye
|= {a/@ b/stub} |= {a/@ b/stub}
^- stub ^- stub
=+ c=(lnts b) =+ c=(lnts-char b)
=+ i=(brek a c) =+ i=(brek a c)
?~ i b ?~ i b
?: =(a q.u.i) ?: =(a q.u.i)