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

Fixed issues with codeblocks where they prevented subsequent items from being processed properly.

Browse Source 
Codeblocks can now contain newlines.
This commit is contained in:
Fang 2017-07-27 18:06:43 -07:00
parent 63d6ff5d76
commit 2d0a5d1aa3
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gen/cram.hoon
View File

@ -466,9 +466,19 @@
?~ hac .
%= .
hac t.hac
cur [p.i.hac (weld fine q.i.hac)]
cur [p.i.hac (concat-code (weld fine q.i.hac))]
==
:: ::
++ concat-code
|= a/flow
?~ a a
?. ?=({$pre *} -.i.a) a
|-
?~ t.a a
?. ?=({$pre $~} -.i.t.a) a
:: add blank line between blocks
$(t.a t.t.a, c.i.a (welp c.i.t.a ;/("\0a") c.i.a))
::
++ snap :: capture raw line
=| nap/tape
|- ^+ [nap +>]
@ -504,22 +514,19 @@
?: ?=($code p.cur)
:: add blank line between blocks
::
=. q.cur
?~ q.cur q.cur
:_(q.cur ;/("\0a"))
=- +(q.u.lub ~, q.cur (weld - q.cur))
=- fold(lub ~, q.cur (weld - q.cur))
%+ turn q.u.lub
|= tape ^- mars
:: each line is text data with its newline
::
;/((weld (slag (dec col) +<) "\0a"))
:: if block is verse
;/((weld (slag (add 4 (dec col)) +<) "\0a"))
::
?: ?=($poem p.cur)
:: add break between stanzas
::
=. q.cur ?~(q.cur q.cur [[[%br ~] ~] q.cur])
=- +(q.u.lub ~, q.cur (weld - q.cur))
=- fold(lub ~, q.cur (weld - q.cur))
%+ turn q.u.lub
|= tape ^- manx
:: each line is a paragraph
@ -612,7 +619,6 @@
::
=/ dif (sub col.pic col)
=/ erp [p.naz col.pic]
=. col col.pic
:: nap: take first line
::
=^ nap ..$ snap