implement inline link

fperrad · Mar 21, 2009 · 2e86cee · 2e86cee
1 parent ba4ab03
commit 2e86cee
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 3 deletions.
diff --git a/src/Compiler.pir b/src/Compiler.pir
@@ -226,10 +226,13 @@ Return generated HTML for all of its children.
     $S1 = node.'title'()
     unless $S1 goto L1
     $S0 .= "\" title=\""
+    $I0 = length $S1
+    $I0 -= 2
+    $S1 = substr $S1, 1, $I0
     $S0 .= $S1
   L1:
     $S0 .= "\">"
-    $S1 = node.'text'()
+    $S1 = self.'html_children'(node)
     $S0 .= $S1
     $S0 .= "</a>"
     set code, $S0

diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -216,13 +216,23 @@ method Link($/, $key) {
     make $( $/{$key} );
 }
 
+method ExplicitLink($/) {
+    my $mast := Markdown::Link.new( :title( ~$<Title>.text() ),
+                                    :url( ~$<Source><SourceContents>.text() ) );
+    for $<Label><Inline> {
+        $mast.push( $( $_ ) );
+    }
+    make $mast;
+}
+
 method AutoLink($/, $key) {
     make $( $/{$key} );
 }
 
 method AutoLinkUrl($/) {
-    make Markdown::Link.new( :text( $/[0].text() ),
-                             :url( $/[0].text() ) );
+    my $mast := Markdown::Link.new( :url( $/[0].text() ) );
+    $mast.push( Markdown::Line.new( :text( $/[0].text() ) ));
+    make $mast
 }
 
 method AutoLinkEmail($/) {

diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -291,6 +291,45 @@ token StrongUI {
 
 token Link {
     | <AutoLink> {*}            #= AutoLink
+    | <ExplicitLink> {*}        #= ExplicitLink
+}
+
+token ExplicitLink {
+    <Label> <.Spnl> '(' <.Sp> <Source> <.Spnl> <Title> <.Sp> ')'
+    {*}
+}
+
+token Source {
+    | '<' <SourceContents> '>'
+    | <SourceContents>
+}
+
+token SourceContents {
+    [ <!_Sc> <Nonspacechar> ]*
+}
+
+token _Sc { '(' | ')' | '>' }
+
+token Title {
+    | <TitleSingle>
+    | <TitleDouble>
+    | ''
+}
+
+token TitleSingle {
+    '\'' ( [ <!_TitleS> <!Newline> . ]* ) '\''
+}
+
+token _TitleS {
+    '\'' <.Sp> [ ')' | <.Newline> ]
+}
+
+token TitleDouble {
+    '"' ( [ <!_TitleD> <!Newline> . ]* ) '"'
+}
+
+token _TitleD {
+    '"' <.Sp> [ ')' | <.Newline> ]
 }
 
 token AutoLink {
@@ -310,6 +349,12 @@ token AutoLinkEmail {
 
 token _Gt { '>' }
 
+token Label {
+    '[' [ <!_EndLabel> <Inline> ]* ']'
+}
+
+token _EndLabel { ']' }
+
 token Ticks1 { '`' }
 token Ticks2 { '``' }
 token Ticks3 { '```' }
@@ -382,6 +427,8 @@ token Newline { \n }
 
 token Sp { <Spacechar>* }
 
+token Spnl { <.Sp> [<.Newline> <.Sp>]? }
+
 token SpecialChar { '*' | '_' | '`' | '&' | '[' | ']' | '<' | '!' | '\\' }
 
 token NormalChar { <!SpecialChar> <!Spacechar> <!Newline> . }

diff --git a/t/31-link.t b/t/31-link.t
@@ -0,0 +1,45 @@
+#! perl
+# Copyright (C) 2009, Parrot Foundation.
+# $Id$
+
+=head1 Markdown inline link
+
+=head2 Synopsis
+
+    % perl t/31-link.t
+
+=cut
+
+use strict;
+use warnings;
+use FindBin;
+use lib "$FindBin::Bin/../../../lib", "$FindBin::Bin";
+
+use Parrot::Test tests => 2;
+use Test::More;
+
+language_output_is( 'markdown', <<'CODE', <<'OUT', 'inline link' );
+
+This is an [example link](http://example.com/).
+
+CODE
+<p>This is an <a href="http://example.com/">example link</a>.</p>
+
+OUT
+
+language_output_is( 'markdown', <<'CODE', <<'OUT', 'inline link with title' );
+
+This is an [example link](http://example.com/ "With a Title").
+
+CODE
+<p>This is an <a href="http://example.com/" title="With a Title">example link</a>.</p>
+
+OUT
+
+
+# Local Variables:
+#   mode: cperl
+#   cperl-indent-level: 4
+#   fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4: