mirror of
https://github.com/urbit/shrub.git
synced 2025-01-06 04:07:23 +03:00
Various fixes.
This commit is contained in:
C. Guy Yarvin
parent
3fef8a2e09
commit
3236823369
@ -369,39 +369,6 @@
|
|||||||
r/(list (pair term twig)) :: bridges
|
r/(list (pair term twig)) :: bridges
|
||||||
== ::
|
== ::
|
||||||
++ typo span :: old span
|
++ typo span :: old span
|
||||||
++ udal :: atomic change (%b)
|
|
||||||
$: p/@ud :: blockwidth
|
|
||||||
q/(list {p/@ud q/(unit {p/@ q/@})}) :: indels
|
|
||||||
== ::
|
|
||||||
++ udon :: abstract delta
|
|
||||||
$: p/umph :: preprocessor
|
|
||||||
$= q :: patch
|
|
||||||
$% {$a p/* q/*} :: trivial replace
|
|
||||||
{$b p/udal} :: atomic indel
|
|
||||||
{$c p/(urge)} :: list indel
|
|
||||||
{$d p/upas q/upas} :: tree edit
|
|
||||||
== ::
|
|
||||||
== ::
|
|
||||||
++ umph :: change filter
|
|
||||||
$@ $? $a :: no filter
|
|
||||||
$b :: jamfile
|
|
||||||
$c :: LF text
|
|
||||||
== ::
|
|
||||||
$% {$d p/@ud} :: blocklist
|
|
||||||
== ::
|
|
||||||
++ unce |* a/mold :: change part
|
|
||||||
$% {$& p/@ud} :: skip[copy]
|
|
||||||
{$| p/(list a) q/(list a)} :: p -> q[chunk]
|
|
||||||
== ::
|
|
||||||
++ unit |* a/mold :: maybe
|
|
||||||
$@($~ {$~ u/a}) ::
|
|
||||||
++ upas :: tree change (%d)
|
|
||||||
$^ {p/upas q/upas} :: cell
|
|
||||||
$% {$0 p/axis} :: copy old
|
|
||||||
{$1 p/*} :: insert new
|
|
||||||
{$2 p/axis q/udon} :: mutate!
|
|
||||||
== ::
|
|
||||||
++ urge |*(a/mold (list (unce a))) :: list change
|
|
||||||
++ vase {p/span q/*} :: span-value pair
|
++ vase {p/span q/*} :: span-value pair
|
||||||
++ vise {p/typo q/*} :: old vase
|
++ vise {p/typo q/*} :: old vase
|
||||||
++ wall (list tape) :: text lines (no \n)
|
++ wall (list tape) :: text lines (no \n)
|
||||||
|
|||||||
@ -20,9 +20,7 @@
|
|||||||
:::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
:::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
:::::: :::::: volume 1, Hoon models ::::::
|
:::::: :::::: volume 1, Hoon models ::::::
|
||||||
:::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
:::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
~% %one
|
~% %one + ~
|
||||||
+
|
|
||||||
~
|
|
||||||
|% ::
|
|% ::
|
||||||
++ atom @ :: just an atom
|
++ atom @ :: just an atom
|
||||||
++ axis @ :: tree address
|
++ axis @ :: tree address
|
||||||
|
|||||||
@ -1,10 +1,11 @@
|
|||||||
!: ::
|
!: ::
|
||||||
:::: /hoon/hoon ::
|
:::: /hoon/hoon ::
|
||||||
:: ::
|
:: ::
|
||||||
=> %151 =>
|
=> %150 =>
|
||||||
:: ::
|
:: ::
|
||||||
:::: 0: version stub ::
|
:::: 0: version stub ::
|
||||||
:: ::
|
:: ::
|
||||||
|
~% %k.150 ~ ~ ::
|
||||||
|%
|
|%
|
||||||
++ hoon +
|
++ hoon +
|
||||||
-- =>
|
-- =>
|
||||||
@ -15,12 +16,10 @@
|
|||||||
:: 1b: tree addressing ::
|
:: 1b: tree addressing ::
|
||||||
:: 1c: molds and mold builders ::
|
:: 1c: molds and mold builders ::
|
||||||
::
|
::
|
||||||
|
~% %one + ~
|
||||||
|%
|
|%
|
||||||
:: ::
|
:: ::
|
||||||
:::: 1a: unsigned arithmetic and tree addressing ::
|
:::: 1a: unsigned arithmetic and tree addressing ::
|
||||||
:: ::
|
|
||||||
:: add, dec, div, dvr, gte, gth, lte, ::
|
|
||||||
:: lth, max, min, mod, mul, sub ::
|
|
||||||
::
|
::
|
||||||
++ add :: unsigned addition
|
++ add :: unsigned addition
|
||||||
~/ %add
|
~/ %add
|
||||||
@ -162,8 +161,6 @@
|
|||||||
:: ::
|
:: ::
|
||||||
:::: 1c: ideal containers ::
|
:::: 1c: ideal containers ::
|
||||||
:: ::
|
:: ::
|
||||||
:: ache, bloq, each, gate, list, lone, pair, pole ::
|
|
||||||
:: qual, quid, quip, trap, tree, trel, unit ::
|
|
||||||
::
|
::
|
||||||
++ ache |*({a/gate b/gate} $%({$| p/b} {$& p/a})) :: a or b, b default
|
++ ache |*({a/gate b/gate} $%({$| p/b} {$& p/a})) :: a or b, b default
|
||||||
++ bloq @ :: bitblock, eg 3=byte
|
++ bloq @ :: bitblock, eg 3=byte
|
||||||
@ -203,6 +200,7 @@
|
|||||||
:: 2p: serialization ::
|
:: 2p: serialization ::
|
||||||
:: 2q: molds
|
:: 2q: molds
|
||||||
::
|
::
|
||||||
|
~% %two + ~
|
||||||
|%
|
|%
|
||||||
:: ::
|
:: ::
|
||||||
:::: 2a: unit logic ::
|
:::: 2a: unit logic ::
|
||||||
@ -1523,6 +1521,7 @@
|
|||||||
:: ::
|
:: ::
|
||||||
:::: 3: layer three ::
|
:::: 3: layer three ::
|
||||||
:: ::
|
:: ::
|
||||||
|
~% %tri + ~
|
||||||
|%
|
|%
|
||||||
::
|
::
|
||||||
:::: 3a: signed and modular ints ::
|
:::: 3a: signed and modular ints ::
|
||||||
@ -1664,8 +1663,7 @@
|
|||||||
:: rlyd, rlys, rlyh, rlyq ::
|
:: rlyd, rlys, rlyh, rlyq ::
|
||||||
:: ryld, ryls, rylh, rylq ::
|
:: ryld, ryls, rylh, rylq ::
|
||||||
::
|
::
|
||||||
-- =>
|
%
|
||||||
|%
|
|
||||||
++ fn :: float, infinity, or NaN
|
++ fn :: float, infinity, or NaN
|
||||||
:: s=sign, e=exponent, a=arithmetic form
|
:: s=sign, e=exponent, a=arithmetic form
|
||||||
:: (-1)^s * a * 2^e
|
:: (-1)^s * a * 2^e
|
||||||
@ -2563,8 +2561,6 @@
|
|||||||
:::: ::
|
:::: ::
|
||||||
:: year, yore, yell, yule, yall, yawn, yelp, yo ::
|
:: year, yore, yell, yule, yall, yawn, yelp, yo ::
|
||||||
::
|
::
|
||||||
-- =>
|
|
||||||
|%
|
|
||||||
++ year :: date to @d
|
++ year :: date to @d
|
||||||
|= det/date
|
|= det/date
|
||||||
^- @da
|
^- @da
|
||||||
@ -3022,8 +3018,6 @@
|
|||||||
:: ::
|
:: ::
|
||||||
:: aesc, ga ::
|
:: aesc, ga ::
|
||||||
::
|
::
|
||||||
-- =>
|
|
||||||
|%
|
|
||||||
++ aesc :: AES-256
|
++ aesc :: AES-256
|
||||||
~% %aesc + ~
|
~% %aesc + ~
|
||||||
|%
|
|%
|
||||||
@ -3309,8 +3303,6 @@
|
|||||||
:: ::
|
:: ::
|
||||||
:: ob ::
|
:: ob ::
|
||||||
::
|
::
|
||||||
-- =>
|
|
||||||
|%
|
|
||||||
++ un :: =(x (wred (wren x)))
|
++ un :: =(x (wred (wren x)))
|
||||||
|%
|
|%
|
||||||
++ wren :: conceal structure
|
++ wren :: conceal structure
|
||||||
@ -3490,7 +3482,6 @@
|
|||||||
::
|
::
|
||||||
:::: 3g: molds and mold builders
|
:::: 3g: molds and mold builders
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ coin $% {$$ p/dime} :: print format
|
++ coin $% {$$ p/dime} :: print format
|
||||||
{$blob p/*} ::
|
{$blob p/*} ::
|
||||||
{$many p/(list coin)} ::
|
{$many p/(list coin)} ::
|
||||||
@ -3523,6 +3514,12 @@
|
|||||||
:: ::
|
:: ::
|
||||||
:::: 4: layer four ::
|
:::: 4: layer four ::
|
||||||
:: ::
|
:: ::
|
||||||
|
~% %qua
|
||||||
|
+
|
||||||
|
==
|
||||||
|
%mute mute
|
||||||
|
%show show
|
||||||
|
==
|
||||||
|%
|
|%
|
||||||
::
|
::
|
||||||
:::: 4a: exotic bases
|
:::: 4a: exotic bases
|
||||||
@ -3607,7 +3604,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4b: miscellaneous text processing
|
:::: 4b: miscellaneous text processing
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ at :: basic printing
|
++ at :: basic printing
|
||||||
|_ a/@
|
|_ a/@
|
||||||
++ r
|
++ r
|
||||||
@ -3935,7 +3931,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4c: tank printer
|
:::: 4c: tank printer
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ wash :: render tank at width
|
++ wash :: render tank at width
|
||||||
|= {{tab/@ edg/@} tac/tank} ^- wall
|
|= {{tab/@ edg/@} tac/tank} ^- wall
|
||||||
(~(win re tac) tab edg)
|
(~(win re tac) tab edg)
|
||||||
@ -4139,7 +4134,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4d: parsing (tracing)
|
:::: 4d: parsing (tracing)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ last |= {zyc/hair naz/hair} :: farther trace
|
++ last |= {zyc/hair naz/hair} :: farther trace
|
||||||
^- hair
|
^- hair
|
||||||
?: =(p.zyc p.naz)
|
?: =(p.zyc p.naz)
|
||||||
@ -4152,7 +4146,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4e: parsing (combinators)
|
:::: 4e: parsing (combinators)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ bend :: conditional comp
|
++ bend :: conditional comp
|
||||||
~/ %bend
|
~/ %bend
|
||||||
|* raq/_|*({a/* b/*} [~ u=[a b]])
|
|* raq/_|*({a/* b/*} [~ u=[a b]])
|
||||||
@ -4234,8 +4227,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4f: parsing (rule builders)
|
:::: 4f: parsing (rule builders)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
::
|
|
||||||
++ bass :: leftmost base
|
++ bass :: leftmost base
|
||||||
|* {wuc/@ tyd/rule}
|
|* {wuc/@ tyd/rule}
|
||||||
%+ cook
|
%+ cook
|
||||||
@ -4507,7 +4498,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4g: parsing (outside caller)
|
:::: 4g: parsing (outside caller)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ rash |*({naf/@ sab/rule} (scan (trip naf) sab)) ::
|
++ rash |*({naf/@ sab/rule} (scan (trip naf) sab)) ::
|
||||||
++ rose |* {los/tape sab/rule}
|
++ rose |* {los/tape sab/rule}
|
||||||
=+ vex=(sab [[1 1] los])
|
=+ vex=(sab [[1 1] los])
|
||||||
@ -4529,7 +4519,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4h: parsing (ascii glyphs)
|
:::: 4h: parsing (ascii glyphs)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ ace (just ' ')
|
++ ace (just ' ')
|
||||||
++ bar (just '|')
|
++ bar (just '|')
|
||||||
++ bas (just '\\')
|
++ bas (just '\\')
|
||||||
@ -4566,7 +4555,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4i: parsing (useful idioms)
|
:::: 4i: parsing (useful idioms)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ alf ;~(pose low hig) :: alphabetic
|
++ alf ;~(pose low hig) :: alphabetic
|
||||||
++ aln ;~(pose low hig nud) :: alphanumeric
|
++ aln ;~(pose low hig nud) :: alphanumeric
|
||||||
++ alp ;~(pose low hig nud hep) :: alphanumeric and -
|
++ alp ;~(pose low hig nud hep) :: alphanumeric and -
|
||||||
@ -4680,7 +4668,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4j: parsing (bases and base digits)
|
:::: 4j: parsing (bases and base digits)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ ab
|
++ ab
|
||||||
|%
|
|%
|
||||||
++ bix (bass 16 (stun [2 2] six))
|
++ bix (bass 16 (stun [2 2] six))
|
||||||
@ -4784,7 +4771,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4k: atom printing
|
:::: 4k: atom printing
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ co !.
|
++ co !.
|
||||||
~% %co ..co ~
|
~% %co ..co ~
|
||||||
=< |_ lot/coin
|
=< |_ lot/coin
|
||||||
@ -5007,7 +4993,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4l: atom parsing
|
:::: 4l: atom parsing
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ so
|
++ so
|
||||||
~% %so + ~
|
~% %so + ~
|
||||||
|%
|
|%
|
||||||
@ -5185,7 +5170,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4m: formatting functions
|
:::: 4m: formatting functions
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ scot |=(mol/dime ~(rent co %$ mol))
|
++ scot |=(mol/dime ~(rent co %$ mol))
|
||||||
++ scow |=(mol/dime ~(rend co %$ mol))
|
++ scow |=(mol/dime ~(rend co %$ mol))
|
||||||
++ slat |=(mod/@tas |=(txt/@ta (slaw mod txt)))
|
++ slat |=(mod/@tas |=(txt/@ta (slaw mod txt)))
|
||||||
@ -5220,7 +5204,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4n: virtualization
|
:::: 4n: virtualization
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ mack
|
++ mack
|
||||||
|= {sub/* fol/*}
|
|= {sub/* fol/*}
|
||||||
^- (unit)
|
^- (unit)
|
||||||
@ -5398,7 +5381,6 @@
|
|||||||
::
|
::
|
||||||
:::: 4o: molds and mold builders
|
:::: 4o: molds and mold builders
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ abel typo :: original sin: span
|
++ abel typo :: original sin: span
|
||||||
++ atom @ :: just an atom
|
++ atom @ :: just an atom
|
||||||
++ aura @ta :: atom format
|
++ aura @ta :: atom format
|
||||||
@ -5664,6 +5646,13 @@
|
|||||||
:: ::
|
:: ::
|
||||||
:::: 5: layer five
|
:::: 5: layer five
|
||||||
::
|
::
|
||||||
|
~% %pen
|
||||||
|
+
|
||||||
|
==
|
||||||
|
%al al
|
||||||
|
%ap ap
|
||||||
|
%ut ut
|
||||||
|
==
|
||||||
|%
|
|%
|
||||||
::
|
::
|
||||||
:::: 5a: compiler utilities
|
:::: 5a: compiler utilities
|
||||||
@ -6522,7 +6511,6 @@
|
|||||||
::
|
::
|
||||||
:::: 5c: compiler backend and prettyprinter
|
:::: 5c: compiler backend and prettyprinter
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ ut
|
++ ut
|
||||||
~% %ut
|
~% %ut
|
||||||
+>+
|
+>+
|
||||||
@ -8431,7 +8419,6 @@
|
|||||||
::
|
::
|
||||||
:::: 5d: hoon parser
|
:::: 5d: hoon parser
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ vang
|
++ vang
|
||||||
|= {bug/? wer/path}
|
|= {bug/? wer/path}
|
||||||
%*(. vast bug bug, wer wer)
|
%*(. vast bug bug, wer wer)
|
||||||
@ -9590,7 +9577,6 @@
|
|||||||
::
|
::
|
||||||
:::: 5e: caching compiler
|
:::: 5e: caching compiler
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ wa !: :: cached compile
|
++ wa !: :: cached compile
|
||||||
|_ worm
|
|_ worm
|
||||||
++ nell |=(ref/span (nest [%cell %noun %noun] ref)) :: nest in cell
|
++ nell |=(ref/span (nest [%cell %noun %noun] ref)) :: nest in cell
|
||||||
@ -9673,7 +9659,6 @@
|
|||||||
::
|
::
|
||||||
:::: 5f: profiling support (XX move)
|
:::: 5f: profiling support (XX move)
|
||||||
::
|
::
|
||||||
-- => |%
|
|
||||||
++ doss
|
++ doss
|
||||||
$: mon/moan :: sample count
|
$: mon/moan :: sample count
|
||||||
hit/(map term @ud) :: hit points
|
hit/(map term @ud) :: hit points
|
||||||
@ -9898,6 +9883,7 @@
|
|||||||
:: ::
|
:: ::
|
||||||
:::: 6: layer six
|
:::: 6: layer six
|
||||||
::
|
::
|
||||||
|
~% %hex + ~
|
||||||
|%
|
|%
|
||||||
::
|
::
|
||||||
:::: 6a: arvo core
|
:::: 6a: arvo core
|
||||||
|
|||||||
@ -8,6 +8,40 @@
|
|||||||
:: section 2eP, diff (move me) ::
|
:: section 2eP, diff (move me) ::
|
||||||
::
|
::
|
||||||
::
|
::
|
||||||
|
++ udal :: atomic change (%b)
|
||||||
|
$: p/@ud :: blockwidth
|
||||||
|
q/(list {p/@ud q/(unit {p/@ q/@})}) :: indels
|
||||||
|
== ::
|
||||||
|
++ udon :: abstract delta
|
||||||
|
$: p/umph :: preprocessor
|
||||||
|
$= q :: patch
|
||||||
|
$% {$a p/* q/*} :: trivial replace
|
||||||
|
{$b p/udal} :: atomic indel
|
||||||
|
{$c p/(urge)} :: list indel
|
||||||
|
{$d p/upas q/upas} :: tree edit
|
||||||
|
== ::
|
||||||
|
== ::
|
||||||
|
++ umph :: change filter
|
||||||
|
$@ $? $a :: no filter
|
||||||
|
$b :: jamfile
|
||||||
|
$c :: LF text
|
||||||
|
== ::
|
||||||
|
$% {$d p/@ud} :: blocklist
|
||||||
|
== ::
|
||||||
|
++ unce |* a/mold :: change part
|
||||||
|
$% {$& p/@ud} :: skip[copy]
|
||||||
|
{$| p/(list a) q/(list a)} :: p -> q[chunk]
|
||||||
|
== ::
|
||||||
|
++ unit |* a/mold :: maybe
|
||||||
|
$@($~ {$~ u/a}) ::
|
||||||
|
++ upas :: tree change (%d)
|
||||||
|
$^ {p/upas q/upas} :: cell
|
||||||
|
$% {$0 p/axis} :: copy old
|
||||||
|
{$1 p/*} :: insert new
|
||||||
|
{$2 p/axis q/udon} :: mutate!
|
||||||
|
== ::
|
||||||
|
++ urge |*(a/mold (list (unce a))) :: list change
|
||||||
|
::
|
||||||
++ berk :: invert diff patch
|
++ berk :: invert diff patch
|
||||||
|* bur/(urge)
|
|* bur/(urge)
|
||||||
|- ^+ bur
|
|- ^+ bur
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user