Restore trailing whitespace for merge

This commit is contained in:
Fang 2018-08-28 16:31:43 +02:00
parent 6d01b1d0c4
commit 81c36e3a86

View File

@ -1834,7 +1834,7 @@
=| pri/@ :: priority level
|= a/tang ^+ same :: .= ~&(%a 1)
?~(a same ~>(%slog.[pri i.a] $(a t.a))) :: ((slog ~[>%a<]) 1)
:: ::
:: ::
++ mean :: crash with trace
|= a/tang
^+ !!
@ -5631,22 +5631,22 @@
::
++ musk :: nock with block set
=> |%
++ block
++ block
:: identity of resource awaited
:: XX parameterize
noun
::
++ result
++ result
:: internal interpreter result
::
$@(~ seminoun)
::
++ seminoun
:: partial noun; blocked subtrees are ~
++ seminoun
:: partial noun; blocked subtrees are ~
::
{mask/stencil data/noun}
::
++ stencil
++ stencil
:: noun knowledge map
::
$% :: no; noun has partial block substructure
@ -5655,7 +5655,7 @@
:: yes; noun is either fully complete, or fully blocked
::
{$& blocks/(set block)}
==
==
::
++ output
:: nil; interpreter stopped
@ -5664,8 +5664,8 @@
:: yes, complete noun; no, list of blocks
::
(each noun (list block))
--
|%
--
|%
++ abet
:: simplify raw result
::
@ -5680,7 +5680,7 @@
:- ~
:: merge all blocking sets
::
=/ blocks (squash mask.noy)
=/ blocks (squash mask.noy)
?: =(~ blocks)
:: no blocks, data is complete
::
@ -5705,11 +5705,11 @@
:: interpreter loop
::
|- ^- result
?@ fol
?@ fol
:: bad formula, stop
::
~
?: ?=(^ -.fol)
?: ?=(^ -.fol)
:: hed: interpret head
::
=+ hed=$(fol -.fol)
@ -5722,10 +5722,10 @@
:: propagate stop
::
?~ tal ~
:: combine
:: combine
::
(combine hed tal)
?+ fol
?+ fol
:: bad formula; stop
::
~
@ -5813,28 +5813,28 @@
::
:: 7; composition
::
{$7 b/* c/*}
{$7 b/* c/*}
:: use standard macro expansion (slow)
::
$(fol =>(fol [2 b 1 c]))
::
:: 8; declaration
::
{$8 b/* c/*}
{$8 b/* c/*}
:: use standard macro expansion (slow)
::
$(fol =>(fol [7 [[7 [0 1] b] 0 1] c]))
::
:: 9; invocation
::
{$9 b/* c/*}
{$9 b/* c/*}
:: use standard macro expansion (slow)
::
$(fol =>(fol [7 c 2 [0 1] 0 b]))
::
:: 10; static hint
::
{$10 @ c/*}
{$10 @ c/*}
:: ignore hint
::
$(fol c.fol)
@ -5859,7 +5859,7 @@
|= $: :: hed: head of pair
:: tal: tail of pair
::
hed/seminoun
hed/seminoun
tal/seminoun
==
^- seminoun
@ -5914,8 +5914,8 @@
::
%= $
axe lat
bus ?: =(2 now)
[left.mask.bus -.data.bus]
bus ?: =(2 now)
[left.mask.bus -.data.bus]
[rite.mask.bus +.data.bus]
== ==
:: require complete intermediate step
@ -6319,7 +6319,7 @@
++ vair ?($gold $iron $lead $zinc) :: in/contra/bi/co
++ vein (list (unit axis)) :: search trace
++ sect (list pica) :: paragraph
++ whit ::
++ whit ::
$: lab/(unit term) :: label
boy/(unit (pair cord (list sect))) :: body
def/(map term (pair cord (list sect))) :: definitions
@ -6338,7 +6338,7 @@
:: $mark :: described as mark?
:: $mime :: described as mime:
:: $json :: json schema?
::
::
==
--
:: ::
@ -6593,7 +6593,7 @@
$~ ~
::
{* $~ $~}
%+ bind (look cog q.q.n.dom)
%+ bind (look cog q.q.n.dom)
|=((pair axis (pair what foot)) [(peg axe p) q])
::
{* $~ *}
@ -6659,15 +6659,15 @@
doc=*(list what)
==
|_ mod/tile
++ bunt
++ bunt
:: ~& [%bunt-model mod]
:: =- ~& [%bunt-product -]
:: -
:: -
~$ %ut-ersatz-call
~+
~$ %ut-ersatz-make
ersatz
++ clam
++ clam
:: ~& [%clam-model mod]
:: =- ~& [%clam-product -]
:: -
@ -6675,7 +6675,7 @@
~+
~$ %ut-factory-make
factory
++ home
++ home
:: express a hoon against the original subject
::
|=(gen/hoon ^-(hoon ?:(=(1 dom) gen [%tsgr [%$ dom] gen])))
@ -6702,7 +6702,7 @@
?: ?=($herb -.cys)
(home [%tsgl [%limb %$] p.mod])
$(mod cys)
::
::
{$deet *}
$(mod q.mod)
::
@ -6713,7 +6713,7 @@
?~(t.p.mod ^$(mod i.p.mod) $(i.p.mod i.t.p.mod, t.p.mod t.t.p.mod))
::
{$kelp *}
:: last entry is the default value
:: last entry is the default value
::
|- ^- hoon
?~(t.p.mod ^$(mod i.p.mod) $(i.p.mod i.t.p.mod, t.p.mod t.t.p.mod))
@ -6763,7 +6763,7 @@
$void
:: should not actually be a thing
::
[%zpzp ~]
[%zpzp ~]
==
::
++ decorate
@ -6795,7 +6795,7 @@
?: ?=($herb -.cys)
(home [%tsgl [%limb %$] p.mod])
ersatz(mod cys)
::
::
{$deet *} [%dbug p.mod ersatz(mod q.mod)]
{$fern *} trivial
{$kelp *} trivial
@ -6825,7 +6825,7 @@
:: top: topographic type of sample
::
axe/axis
top/tope
top/tope
==
++ basic
|= bas/base
@ -6933,7 +6933,7 @@
|- ^- hoon
:: if no other choices, construct head
::
?~ rep construct(mod `tile`one)
?~ rep construct(mod `tile`one)
:: fin: loop completion
::
=/ fin/hoon $(one i.rep, rep t.rep)
@ -6967,7 +6967,7 @@
:+ %tsgr
:: construct within trap
::
:+ %brdt ~^~
:+ %brdt ~^~
:: trap is only kicked if sample is cell
::
:+ %sgbc
@ -7050,7 +7050,7 @@
construct(mod cys)
::
:: switch, $%
::
::
{$kelp *}
:: if atom or unknown, probe
::
@ -7089,7 +7089,7 @@
?@ top probe
:^ %wtpt
fetch-wing(axe (peg axe 2))
construct(top [%| %&], mod q.mod)
construct(top [%| %&], mod q.mod)
construct(top [[%& %&] %&], mod p.mod)
::
:: weed, $_
@ -7107,7 +7107,7 @@
%bunt bunt
%whip whip
==
=+ :* nag=`*`&
=+ :* nag=`*`&
gom=`axis`1
wat=*what
==
@ -7175,7 +7175,7 @@
[%wtcl [%bust %bean] $(p.sec t.p.sec) ^$(sec i.p.sec)]
%= $
sec
|- ^- tile
|- ^- tile
?~(t.p.sec i.p.sec $(i.p.sec i.t.p.sec, t.p.sec t.t.p.sec))
==
::
@ -7198,7 +7198,7 @@
{$weed *}
(hail (home p.sec))
==
++ clam
++ clam
^- hoon
=/ raw [%brts [~ ~] [%base %noun] (whip(gom 7) 6)]
::
@ -7212,9 +7212,9 @@
++ whip
|= axe/axis
=+ ^= tun
|= $: def/tile
|= $: def/tile
noy/$-(* hoon)
==
==
^- hoon
?@ nag
=+ luz=[%cnts [[%& 1] ~] [[[%& axe] ~] bunt(sec def)] ~]
@ -7381,13 +7381,13 @@
:: ?| ?=(^ lab)
:: ?=(^ boy)
:: |- ^- ?
:: ?~ def |
:: ?~ def |
:: |($(def l.def) $(def r.def) !(~(has in use) p.n.def))
:: ==
::
++ grad
|= $: gen/hoon
wit/whit
|= $: gen/hoon
wit/whit
aid/$-({? hoon whit} {hoon whit})
==
^- (unit (pair hoon whit))
@ -7401,7 +7401,7 @@
^- (unit (pair hoon whit))
=^ one wit prim
=^ two wit senc(gen one)
?: =(gen two)
?: =(gen two)
~
`(aid & two wit)
::
@ -7421,7 +7421,7 @@
$bchp runk
$bckt runk
$bcwt runk
$bcts flam
$bcts flam
$bcsm runk
$brcb ((doof -.gen +>.gen) p.gen)
$brcl ((doof -.gen +>.gen) p.gen)
@ -7482,14 +7482,14 @@
|= hot/toro
^- (pair hoon whit)
=^ tog wit (tong p.hot)
[[pif [tog q.hot] suf] wit]
[[pif [tog q.hot] suf] wit]
::
++ humm
|* {pif/@tas suf/*}
|= {wat/what cog/term}
^- (pair hoon whit)
=^ taw wit (grif cog wat)
[[pif [taw cog] suf] wit]
[[pif [taw cog] suf] wit]
::
++ runk
^- (pair hoon whit)
@ -7565,7 +7565,7 @@
{$tsgr *} (weld $(gen p.gen) $(gen q.gen))
{$wing *} [p.gen ~]
{$limb *} [[p.gen ~] ~]
==
==
::
++ bawl
~| %bawl-failure
@ -7713,7 +7713,7 @@
{$brdt *} :+ %brcn p.gen
=- [[0 [~ ~] -] ~ ~]
(~(put by *(map term (pair what foot))) %$ ~ [%ash q.gen])
{$brkt *} :+ %tsgr
{$brkt *} :+ %tsgr
:+ %brcn p.gen
=+ one=(~(got by r.gen) 0)
%+ ~(put by r.gen) 0
@ -7725,7 +7725,7 @@
:+ %brcn p.gen
=- [[0 [~ ~] -] ~ ~]
(~(put by *(map term (pair what foot))) %$ ~ [%elm r.gen])
{$brts *} :^ %brcb p.gen q.gen
{$brts *} :^ %brcb p.gen q.gen
=- [~ [[0 [~ ~] -] ~ ~]]
(~(put by *(map term (pair what foot))) %$ ~ [%ash r.gen])
{$brwt *} [%ktwt %brdt p.gen q.gen]
@ -7924,7 +7924,7 @@
:+ %kthp
:+ %bcts p.p.gen
[%tsgr [%limb %v] u.q.p.gen]
[%tsgl [%$ 2] [%limb %a]]
[%tsgl [%$ 2] [%limb %a]]
[%limb %v]
s.gen
::
@ -7963,7 +7963,7 @@
?~(p.gen [%rock %f 0] [%wtcl i.p.gen $(p.gen t.p.gen) [%rock %f 1]])
::
{$xray *}
|^ :- [(open-mane n.g.p.gen) %clsg (turn a.g.p.gen open-mart)]
|^ :- [(open-mane n.g.p.gen) %clsg (turn a.g.p.gen open-mart)]
[%smts c.p.gen]
::
++ open-mane
@ -7971,7 +7971,7 @@
?@(a [%rock %tas a] [[%rock %tas -.a] [%rock %tas +.a]])
::
++ open-mart
|= {n/mane:hoon v/(list beer:hoon)}
|= {n/mane:hoon v/(list beer:hoon)}
[(open-mane n) %knit v]
--
::
@ -8021,11 +8021,11 @@
==
^- {hoon life}
=/ use &
=< apex
|%
=< apex
|%
++ apex
|- ^- {hoon life}
=* aid |= {use/? gen/hoon vit/life}
=* aid |= {use/? gen/hoon vit/life}
^$(use use, gen gen, vit vit)
=/ gun ?:(use (mac gen vit aid) ~)
?^ gun u.gun
@ -8150,7 +8150,7 @@
++ arms
(raid (twin noop (raid (twin noop heel))))
::
++ bark
++ bark
|= wof/woof
?-(wof @ [wof vit], ^ (lead ~ (expr p.wof)))
::
@ -8366,10 +8366,10 @@
$void [&+[~ ~ ~] ~]
{$atom *} ?~(q.sut [&+[~ ~ ~] ~] [&+~ u.q.sut])
{$cell *} (combine:musk $(sut p.sut) $(sut q.sut))
{$core *} %+ combine:musk
{$core *} %+ combine:musk
?~ p.s.q.sut [&+[~ ~ ~] ~]
[&+~ p.s.q.sut]
$(sut p.sut)
$(sut p.sut)
{$face *} $(sut repo)
{$fork *} [&+[~ ~ ~] ~]
{$help *} $(sut repo)
@ -8823,7 +8823,7 @@
[(fork p.q.p.p.hax p.q.p.p.yor ~) q.q.p.p.hax]
?> ?=($& -.yor)
?> =(p.q.p.hax p.q.p.yor)
:^ %&
:^ %&
(join p.p.hax p.p.yor)
p.q.p.hax
?: &(?=($& -.q.q.p.hax) ?=($& -.q.q.p.yor))
@ -8853,7 +8853,7 @@
?~ zem [~ p.heg]
?:(=(0 p.heg) [zem 0] [~ (dec p.heg)])
?^ zem
:^ %&
:^ %&
p.q.u.zem
[`axe lon]
[%| (peg 2 p.u.zem) [[sut(p.q %gold) q.q.u.zem] ~ ~]]
@ -9329,7 +9329,7 @@
=+(vat=$(gen p.gen) [(wrap(sut p.vat) %lead) (wrap(sut q.vat) %lead)])
::
{$docs *}
=+ vat=$(gen q.gen)
=+ vat=$(gen q.gen)
[(help [%docs p.gen] p.vat) (help [%docs p.gen] q.vat)]
::
{$ktsg *} $(gen p.gen)
@ -9474,7 +9474,7 @@
|%
++ dext
^- ?
::
::
?: =(ref sut)
(nest(sut %void) | sut)
?- sut
@ -9485,7 +9485,7 @@
{$core *} sint(sut [%cell %noun %noun])
{$fork *} %+ levy ~(tap in p.sut)
|=(type dext(sut +<))
{$face *} dext(sut q.sut)
{$face *} dext(sut q.sut)
{$help *} dext(sut q.sut)
{$hold *} =+ (~(gas in *(set type)) `(list type)`[sut ref ~])
?: (~(has in gil) -)
@ -9753,7 +9753,7 @@
?~ wec `~
:: any reference faces must be clear
::
?. ?=({* $~ $~} wec)
?. ?=({* $~ $~} wec)
~& [%dear-many wec]
~
:- ~
@ -9773,7 +9773,7 @@
::
:: overlap is a weird corner case. +lip is
:: almost always 0. brute force is fine.
::
::
=/ lip
=| lup/(unit @ud)
=| lip/@ud
@ -9782,7 +9782,7 @@
(fall lup 0)
:: lep: overlap candidate: suffix of subject face stack
::
=/ lep (slag (sub p.len lip) hos)
=/ lep (slag (sub p.len lip) hos)
:: lap: overlap candidate: prefix of reference face stack
::
=/ lap (scag lip har)
@ -9800,12 +9800,12 @@
^- type
:: check for trivial cases
::
?: ?| =(sut ref)
?: ?| =(sut ref)
?=(?($noun $void {?($atom $core) *}) ref)
==
done
:: ~_ (dunk 'redo: dext: sut')
:: ~_ (dunk(sut ref) 'redo: dext: ref')
:: ~_ (dunk(sut ref) 'redo: dext: ref')
?- sut
?($noun $void {?($atom $core) *})
:: reduce reference and reassemble leaf
@ -9844,12 +9844,12 @@
[%help p.sut dext(sut q.sut)]
::
{$fork *}
:: reconstruct each case in fork
:: reconstruct each case in fork
::
(fork (turn ~(tap in p.sut) |=(type dext(sut +<))))
::
{$hold *}
:: reduce to hard
:: reduce to hard
::
=> (sint |)
?> ?=({$hold *} sut)
@ -9870,11 +9870,11 @@
:: ::
++ done :: complete assembly
^- type
:: :type: subject refurbished
:: :type: subject refurbished
::
:: lov: combined face stack
::
=/ lov
=/ lov
=/ lov dear
?~ lov
:: ~_ (dunk 'redo: dear: sut')
@ -9910,7 +9910,7 @@
wec (~(run in wec) |=((list tool) [q.p.ref +<]))
==
::
{$fork *}
{$fork *}
:: reconstruct all relevant cases
::
=- :: ~> %slog.[0 (dunk 'fork: sut')]
@ -10723,7 +10723,7 @@
++ rant
|* sec/rule
%- star
;~ pfix
;~ pfix
(indo null)
(plus (into sec))
==
@ -11109,7 +11109,7 @@
$fens :: ``` code fence
$expr :: ;sail expression
== == ::
{$new p/trig-new} :: open container
{$new p/trig-new} :: open container
{$old $text} :: anything else
== ::
++ trig-new :: start a
@ -11452,7 +11452,7 @@
++ lent :: list entry
|= ord/?($lord $lunt)
^+ +>
=> ?:(=(ord p.cur) +>.$ (push ord)) :: push list if new
=> ?:(=(ord p.cur) +>.$ (push ord)) :: push list if new
(entr %lime)
--
--
@ -11719,7 +11719,7 @@
=> (sail &) :: tall-form
%+ ifix [(star ace) ;~(simu gap (easy))] :: look-ahead for gap
(cook drop-top top-level) :: list of tags
::
::
::
++ whit :: whitespace
(cold ' ' (plus ;~(pose (just ' ') (just '\0a'))))
@ -11838,7 +11838,7 @@
(cold [%base %bean] wut)
==
:- '~'
(cold [%base %null] sig)
(cold [%base %null] sig)
:- '^'
;~ pose
scab
@ -12308,7 +12308,7 @@
(most muck boog)
::
++ wasp :: $brcb aliases
;~ pose
;~ pose
%+ ifix
[;~(plug lus tar muck) muck]
(most muck ;~(gunk sym loaf))
@ -12619,7 +12619,7 @@
:: XX performance: this makes the parser about 50% slower.
:: because we double-parse most of the spaces in the file.
:: just so we can do a postfix doc-comment.
::
::
:: the correct solution to this problem is to unify the
:: parsing of docs with the parsing of comments/spaces.
:: but at this point we're pretty much in parser rewrite.
@ -12631,7 +12631,7 @@
apex:docs
fel
apse:docs
==
==
++ tall :: full tall form
%+ knee *hoon
|.(~+((wart (wrap ;~(pose (norm | &) long lute apex:(sail &))))))
@ -12730,7 +12730,7 @@
$| (nets p.mes -.p.som)
==
?> hip
[[p.dor q.dor(+6 +7.som)] +>+<.$]
[[p.dor q.dor(+6 +7.som)] +>+<.$]
::
++ neat :: type compliance
|= {typ/type som/(each vase ^)}