add influence info to match_*

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 78592e6ad2dcd6f8d5db3ebd1086ab5b34a213a4..9c386e154b545397d5787b88ee677b5eda9c695f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1536,7 +1536,7 @@ sub loadindex () {
                                };
                        }
                        elsif (exists $d->{depends_simple}) {
                                };
                        }
                        elsif (exists $d->{depends_simple}) {

-                               $depends{$page}=$d->{depends_simple};
+                               $depends_simple{$page}=$d->{depends_simple};

                        }
                        if (exists $d->{dependslist}) {
                                # old format
                        }
                        if (exists $d->{dependslist}) {
                                # old format


@@ -1810,9 +1810,7 @@ sub add_depends ($$;@) {
                        }
                }
        }
                        }
                }
        }

-       else {
-               $deptype=$DEPEND_CONTENT;
-       }
+       $deptype=$DEPEND_CONTENT unless $deptype;

 
        if ($simple) {
                $depends_simple{$page}{lc $pagespec} |= $deptype;
 
        if ($simple) {
                $depends_simple{$page}{lc $pagespec} |= $deptype;


@@ -1928,10 +1926,10 @@ sub pagespec_translate ($) {
        }gx) {
                my $word=$1;
                if (lc $word eq 'and') {
        }gx) {
                my $word=$1;
                if (lc $word eq 'and') {

-                       $code.=' &&';
+                       $code.=' &';

                }
                elsif (lc $word eq 'or') {
                }
                elsif (lc $word eq 'or') {

-                       $code.=' ||';
+                       $code.=' |';

                }
                elsif ($word eq "(" || $word eq ")" || $word eq "!") {
                        $code.=' '.$word;
                }
                elsif ($word eq "(" || $word eq ")" || $word eq "!") {
                        $code.=' '.$word;


@@ -2017,36 +2015,40 @@ sub glob2re ($) {
 package IkiWiki::FailReason;
 
 use overload (
 package IkiWiki::FailReason;
 
 use overload (

-       '""'    => sub { ${$_[0]} },
+       '""'    => sub { $_[0][0] },

        '0+'    => sub { 0 },
        '!'     => sub { bless $_[0], 'IkiWiki::SuccessReason'},
        '0+'    => sub { 0 },
        '!'     => sub { bless $_[0], 'IkiWiki::SuccessReason'},

+       '&'     => sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },
+       '|'     => sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },

        fallback => 1,
 );
 
        fallback => 1,
 );
 

-sub new {
-       my $class = shift;
-       my $value = shift;
-       return bless \$value, $class;
-}
-
-package IkiWiki::ErrorReason;
-
-our @ISA = 'IkiWiki::FailReason';
+our @ISA = 'IkiWiki::SuccessReason';

 
 package IkiWiki::SuccessReason;
 
 use overload (
 
 package IkiWiki::SuccessReason;
 
 use overload (

-       '""'    => sub { ${$_[0]} },
+       '""'    => sub { $_[0][0] },

        '0+'    => sub { 1 },
        '!'     => sub { bless $_[0], 'IkiWiki::FailReason'},
        '0+'    => sub { 1 },
        '!'     => sub { bless $_[0], 'IkiWiki::FailReason'},

+       '&'     => sub { $_[1][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[1] },
+       '|'     => sub { $_[0][1]={%{$_[0][1]}, %{$_[1][1]}}; $_[0] },

        fallback => 1,
 );
 
 sub new {
        my $class = shift;
        my $value = shift;
        fallback => 1,
 );
 
 sub new {
        my $class = shift;
        my $value = shift;

-       return bless \$value, $class;
-};
+       return bless [$value, {map { $_ => 1 } @_}], $class;
+}
+
+sub influences {
+       return keys %{$_[0][1]};
+}
+
+package IkiWiki::ErrorReason;
+
+our @ISA = 'IkiWiki::FailReason';

 
 package IkiWiki::PageSpec;
 
 
 package IkiWiki::PageSpec;
 


@@ -2097,23 +2099,23 @@ sub match_link ($$;@) {
        my $from=exists $params{location} ? $params{location} : '';
 
        my $links = $IkiWiki::links{$page};
        my $from=exists $params{location} ? $params{location} : '';
 
        my $links = $IkiWiki::links{$page};

-       return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links};
+       return IkiWiki::FailReason->new("$page has no links", $link) unless $links && @{$links};

        my $bestlink = IkiWiki::bestlink($from, $link);
        foreach my $p (@{$links}) {
                if (length $bestlink) {
        my $bestlink = IkiWiki::bestlink($from, $link);
        foreach my $p (@{$links}) {
                if (length $bestlink) {

-                       return IkiWiki::SuccessReason->new("$page links to $link")
+                       return IkiWiki::SuccessReason->new("$page links to $link", $page)

                                if $bestlink eq IkiWiki::bestlink($page, $p);
                }
                else {
                                if $bestlink eq IkiWiki::bestlink($page, $p);
                }
                else {

-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page)

                                if match_glob($p, $link, %params);
                        my ($p_rel)=$p=~/^\/?(.*)/;
                        $link=~s/^\///;
                                if match_glob($p, $link, %params);
                        my ($p_rel)=$p=~/^\/?(.*)/;
                        $link=~s/^\///;

-                       return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link")
+                       return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page)

                                if match_glob($p_rel, $link, %params);
                }
        }
                                if match_glob($p_rel, $link, %params);
                }
        }

-       return IkiWiki::FailReason->new("$page does not link to $link");
+       return IkiWiki::FailReason->new("$page does not link to $link", $page);

 }
 
 sub match_backlink ($$;@) {
 }
 
 sub match_backlink ($$;@) {


@@ -2129,14 +2131,14 @@ sub match_created_before ($$;@) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {

-                       return IkiWiki::SuccessReason->new("$page created before $testpage");
+                       return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage);

                }
                else {
                }
                else {

-                       return IkiWiki::FailReason->new("$page not created before $testpage");
+                       return IkiWiki::FailReason->new("$page not created before $testpage", $testpage);

                }
        }
        else {
                }
        }
        else {

-               return IkiWiki::ErrorReason->new("$testpage does not exist");
+               return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);

        }
 }
 
        }
 }
 


@@ -2149,14 +2151,14 @@ sub match_created_after ($$;@) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {

-                       return IkiWiki::SuccessReason->new("$page created after $testpage");
+                       return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage);

                }
                else {
                }
                else {

-                       return IkiWiki::FailReason->new("$page not created after $testpage");
+                       return IkiWiki::FailReason->new("$page not created after $testpage", $testpage);

                }
        }
        else {
                }
        }
        else {

-               return IkiWiki::ErrorReason->new("$testpage does not exist");
+               return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage);

        }
 }
 
        }
 }