allow inline in BlockQuote & ListBlock

test "Auto links.text" pass
fperrad · Mar 27, 2009 · 5124e85 · 5124e85
1 parent ddc1372
commit 5124e85
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -84,12 +84,16 @@ method SetextHeading2($/) {
 }
 
 method BlockQuote($/) {
-    make $( $<BlockQuoteRaw> );
+    my $mast := Markdown::BlockQuote.new();
+    for $<BlockQuoteRaw> {
+        $mast.push( $( $_ ) );
+    }
+    make $mast;
 }
 
 method BlockQuoteRaw($/) {
-    my $mast := Markdown::BlockQuote.new();
-    for $<Line> {
+    my $mast := Markdown::Node.new();
+    for $<Inline> {
         $mast.push( $( $_ ) );
     }
     make $mast;
@@ -164,7 +168,11 @@ method ListItem($/) {
 }
 
 method ListBlock($/) {
-    make $( $<Line> );
+    my $mast := Markdown::Node.new();
+    for $<Inline> {
+        $mast.push( $( $_ ) );
+    }
+    make $mast;
 }
 
 method OrderedList($/, $key) {

diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -70,16 +70,16 @@ token Heading {
 }
 
 token BlockQuote {
-    <BlockQuoteRaw>
+    <BlockQuoteRaw>+
     {*}
 }
 
 token BlockQuoteRaw {
     [
-        <._Chevron> ' '? <Line>
-        [ <!_Chevron> <!BlankLine> <Line> ]*
+        <._Chevron> ' '? <Inline>+
+        [ <!_Chevron> <!BlankLine> <Inline>+ ]*
         <.BlankLine>*
-    ]+
+    ]
     {*}
 }
 
@@ -142,7 +142,7 @@ token ListItem {
 }
 
 token ListBlock {
-    <Line> <ListBlockLine>*
+    <Inline>+ <ListBlockLine>*
     {*}
 }