ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-22 16:09:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "backtracking hack to fix dedent parsing; adds == as terminator"

Browse Source 
This reverts commit 459ff495b3.
This commit is contained in:
Ted Blackman 2017-08-23 10:26:10 -07:00
parent ef7ee5918a
commit 45658a6017
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/vast2.hoon
View File

@ -170,7 +170,6 @@
$head :: # heading
$bloc :: > block-quote
$expr :: ;sail expression
$stet :: == to end markdown
$text :: anything else
== ::
++ graf :: paragraph element
@ -208,7 +207,6 @@
:: hac: stack of items under construction
:: cur: current item under construction
:: lub: current block being read in
:: last-column: last column read, for backtracking
:: top: initial markdown indent
:: [naz los]: parsing state
::
@ -218,7 +216,6 @@
=| hac/(list item)
=/ cur/item [%down ~]
=| lub/(unit (pair hair wall))
=| last-column/@ud
|_ {top/@ud naz/hair los/tape}
::
++ $ :: resolve
@ -306,7 +303,7 @@
$(los t.los, q.naz +(q.naz), nap [i.los nap])
::
:: consume newline
:_ +>(los t.los, naz [+(p.naz) 1], last-column q.naz)
:_ +>(los t.los, naz [+(p.naz) 1])
::
:: trim trailing spaces
|- ^- tape
@ -314,6 +311,21 @@
$(nap t.nap)
(flop nap)
::
++ skip :: discard line
|- ^+ ..^$
::
:: no unterminated lines
?~ los
::~& %unterminated-line
..^$(err `naz)
?. =(`@`10 i.los)
::
:: eat byte and repeat
$(los t.los)
::
:: consume newline
..^$(los t.los, naz [+(p.naz) 1])
::
++ look :: inspect line
^- (unit trig)
(wonk (look:parse naz los))
@ -377,23 +389,15 @@
?~ pic
::
:: break section
=~(+:snap close-item line)
=~(skip close-item line)
::
:: line is not blank
=> .(pic u.pic)
::
:: if end of input, complete
?: ?=($done sty.pic)
?: |(?=($done sty.pic) (lth col.pic top))
..$(q.naz col.pic)
::
:: if == or dedent, complete and backtrack
?: |(?=($stet sty.pic) (lth col.pic top))
%_ ..$
p.naz (dec p.naz)
q.naz last-column
los ['\0a' los] :: put newline back
==
::
:: bal: inspection copy of lub, current section
=/ bal lub
::
@ -493,7 +497,7 @@
$8 (push %poem) :: verse literal
$0 :: unindented forms
?- sty.pic
?($done $stet) !! :: end of markdown
$done !! :: blank
$rule (push %rule) :: horizontal ruler
$head (push %head) :: heading
$bloc (entr %bloc) :: blockquote line
@ -550,7 +554,6 @@
;~ pose
(full (easy %done)) :: end of input
(cold ~ (just `@`10)) :: blank line
(cold %stet duz) :: == (ends markdown)
(cold %rule ;~(plug hep hep hep)) :: --- horizontal ruler
(cold %fens ;~(plug tec tec tec)) :: ``` code fence
(cold %head ;~(plug (star hax) ace)) :: # heading