allow HtmlComment as HmtlBlock

test "Inline HTML comments.text" pass
fperrad · Mar 30, 2009 · 10c470f · 10c470f
1 parent 1432d7a
commit 10c470f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/src/Compiler.pir b/src/Compiler.pir
@@ -77,6 +77,21 @@ Markdown::HTML::Compiler implements a compiler for MAST nodes.
     .return (str)
 .end
 
+.sub 'detabn' :anon
+    .param string str
+    $P0 = split "\n", str
+    $P1 = new 'ResizableStringArray'
+  L1:
+    unless $P0 goto L2
+    $S0 = shift $P0
+    $S0 = detab($S0)
+    push $P1, $S0
+    goto L1
+  L2:
+    str = join "\n", $P1
+    .return (str)
+.end
+
 .sub 'obscure_text' :anon
     .param string str
     $S0 = ''
@@ -506,6 +521,10 @@ Return generated HTML for all of its children.
 .sub 'html' :method :multi(_, ['Markdown'; 'Entity'])
     .param pmc node
     $S0 = node.'text'()
+    $I0 = node.'detab'()
+    unless $I0 goto L1
+    $S0 = detabn($S0)
+  L1:
     .local pmc code
     new code, 'CodeString'
     set code, $S0

diff --git a/src/Node.pir b/src/Node.pir
@@ -47,9 +47,6 @@ for Markdown.
     .tailcall self.'attr'('text', value, has_value)
 .end
 
-
-.namespace ['Markdown'; 'Line']
-
 .sub 'detab' :method
     .param pmc value           :optional
     .param int has_value       :opt_flag

diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -255,6 +255,10 @@ method OrderedListItem($/) {
     make $( $<ListItem> );
 }
 
+method HtmlBlock($/, $key) {
+    make $( $/{$key} );
+}
+
 method Emph($/, $key) {
     make $( $/{$key} );
 }
@@ -365,7 +369,8 @@ method RawHtml($/, $key) {
 }
 
 method HtmlComment($/) {
-    make Markdown::Entity.new( :text( $/.text() ) );
+    make Markdown::Entity.new( :text( $/.text() ),
+                               :detab( 1 ) );
 }
 
 method HtmlTag($/) {

diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -25,6 +25,7 @@ token Block {
         | <Heading> {*}         #= Heading
         | <OrderedList> {*}     #= OrderedList
         | <BulletList> {*}      #= BulletList
+        | <HtmlBlock> {*}       #= HtmlBlock
         | <Para> {*}            #= Para
     ]
 }
@@ -197,6 +198,10 @@ token _ListItem {
     <.Indent>? [ <BulletListItem> | <OrderedListItem> ]
 }
 
+token HtmlBlock {
+    | <HtmlComment> {*}         #= HtmlComment
+}
+
 token Inlines {
     <_Inline>+
     <.Endline>?