response

[git.ikiwiki.info.git] / doc / todo / tracking_bugs_with_dependencies.mdwn

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index a2287cdf4ae87001b48a013858a3729412045c6b..417d5910ed256e72d43f1fdaf7a755ae742a601f 100644 (file)
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -11,6 +11,8 @@ I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so
 >
 >> I thought about this briefly, and got about that far.. glad you got
 >> further. :-) --[[Joey]]
 >
 >> I thought about this briefly, and got about that far.. glad you got
 >> further. :-) --[[Joey]]

+
+>> Or, one [[!taglink could_also_refer|pagespec_in_DL_style]] to the language of [[!wikipedia description logics]]: their formulas actually define classes of objects through quantified relations to other classes. --Ivan Z.

 > 
 > Another option would be go with a more functional syntax.  The concept here would
 > be to allow a pagespec to appear in a 'pagespec function' anywhere a page can.  e.g.
 > 
 > Another option would be go with a more functional syntax.  The concept here would
 > be to allow a pagespec to appear in a 'pagespec function' anywhere a page can.  e.g.


@@ -58,6 +60,7 @@ I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so
 
 >> So, equivilant example: `define(bugs, bugs/* and !*/Discussion) and define(openbugs, bugs and !link(done)) and openbugs and !link(openbugs)`
 >> 
 
 >> So, equivilant example: `define(bugs, bugs/* and !*/Discussion) and define(openbugs, bugs and !link(done)) and openbugs and !link(openbugs)`
 >> 

+

 >> Re recursion, it is avoided.. but building a pagespec that is O(N^X) where N is the
 >> number of pages in the wiki is not avoided. Probably need to add DOS prevention.
 >>  --[[Joey]]
 >> Re recursion, it is avoided.. but building a pagespec that is O(N^X) where N is the
 >> number of pages in the wiki is not avoided. Probably need to add DOS prevention.
 >>  --[[Joey]]


@@ -67,13 +70,15 @@ I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so
 
 >>>> Yeah, guess that'd work. :-)
 
 
 >>>> Yeah, guess that'd work. :-)
 

-> One quick further thought.  All the above discussion assumes that 'dependency' is the
+> <a id="another_kind_of_links" />One quick further thought.  All the above discussion assumes that 'dependency' is the

 > same as 'links to', which is not really true.  For example, you'd like to be able to say
 > "This bug does not depend upon [ [ link to other bug ] ]" and not have a dependency.
 > Without having different types of links, I don't see how this would be possible.
 >
 > -- [[Will]]
 
 > same as 'links to', which is not really true.  For example, you'd like to be able to say
 > "This bug does not depend upon [ [ link to other bug ] ]" and not have a dependency.
 > Without having different types of links, I don't see how this would be possible.
 >
 > -- [[Will]]
 

+>> I saw that this issue is targeted at by the work on [[structured page data#another_kind_of_links]]. --Ivan Z.
+

 Okie - I've had a quick attempt at this.  Initial patch attached.  This one doesn't quite work.
 And there is still a lot of debugging stuff in there.
 
 Okie - I've had a quick attempt at this.  Initial patch attached.  This one doesn't quite work.
 And there is still a lot of debugging stuff in there.
 


@@ -136,7 +141,13 @@ The following three inlines work for me with this patch:
 >>>> `%params` contains the parameters passed to `pagespec_match`, not
 >>>> user-supplied parameters. The user-supplied parameter to a function
 >>>> like `match_glob()` or `match_link()` is passed in the second positional parameter. --[[Joey]]
 >>>> `%params` contains the parameters passed to `pagespec_match`, not
 >>>> user-supplied parameters. The user-supplied parameter to a function
 >>>> like `match_glob()` or `match_link()` is passed in the second positional parameter. --[[Joey]]

->>
+
+>>>>> OK.  That seems reasonable then.  The only problem is that my PERLfu is not strong enough to make it
+>>>>> work.  I really have to wonder what substance was influencing the designers of PERL...
+>>>>> I can't figure out how to use the %params.  And I'm pissed off enough with PERL that I'm not going
+>>>>> to try and figure it out any more.  There are two patches below now.  The first one uses an extra
+>>>>> argument and works.  The second one tries to use %params and doesn't - take your pick :-). -- [[Will]]
+

 >> What do you think is best to do about `is_globlist()`?  At the moment it requires that the 'second word', as
 >> delimited by a space and ignoring parens, is 'and' or 'or'.  This doesn't hold in the above example pagespecs (so I just hard wired it to 0 to test my patch).
 >> My thought was just to search for 'and' or 'or' as words anywhere in the pagespec.  Thoughts?
 >> What do you think is best to do about `is_globlist()`?  At the moment it requires that the 'second word', as
 >> delimited by a space and ignoring parens, is 'and' or 'or'.  This doesn't hold in the above example pagespecs (so I just hard wired it to 0 to test my patch).
 >> My thought was just to search for 'and' or 'or' as words anywhere in the pagespec.  Thoughts?


@@ -144,6 +155,8 @@ The following three inlines work for me with this patch:
 >>> Dunno, we could just finish deprecating it. Or change the regexp to
 >>> skip over spaces in parens. (`/[^\s]+\s+([^)]+)/`) --[[Joey]]
 
 >>> Dunno, we could just finish deprecating it. Or change the regexp to
 >>> skip over spaces in parens. (`/[^\s]+\s+([^)]+)/`) --[[Joey]]
 

+>>>> I think I have a working regexp now.
+

 >> Oh, one more thing.  In pagespec_translate (now pagespec_makeperl), there is a part of the regular expression for `# any other text`.
 >> This contained `()`, which has no effect.  I replaced that with `\(\)`, but that is a change in the definition of pagespecs unrelated to the
 >> rest of this patch. In a related change, commands were not able to contain `)` in their parameters.  I've extended that so the cannot
 >> Oh, one more thing.  In pagespec_translate (now pagespec_makeperl), there is a part of the regular expression for `# any other text`.
 >> This contained `()`, which has no effect.  I replaced that with `\(\)`, but that is a change in the definition of pagespecs unrelated to the
 >> rest of this patch. In a related change, commands were not able to contain `)` in their parameters.  I've extended that so the cannot


@@ -167,467 +180,398 @@ The following three inlines work for me with this patch:
 >>> Re commands containing '(', I don't really see any reason not to
 >>> allow that, unless it breaks something. --[[Joey]]
 
 >>> Re commands containing '(', I don't really see any reason not to
 >>> allow that, unless it breaks something. --[[Joey]]
 

+>>>> Oh, I didn't realise you didn't need to escape parens inside [].  All else I
+>>>> I understood.  I have stopped commands from containing parens because
+>>>> once you allow that then you might have a extra level of depth in the parsing
+>>>> of define() statements. -- [[Will]]
+

 >>> Updated patch.  Moved the specFuncsRef to the front of the arg list.  Still haven't thought through the security implications of
 >>> having it in `%params`.  I've also removed all the debugging `print` statements.  And I've updated the `is_globlist()` function.
 >>> I think this is ready for people other than me to have a play.  It is not well enough tested to commit just yet.
 >>> -- [[Will]]
 
 >>> Updated patch.  Moved the specFuncsRef to the front of the arg list.  Still haven't thought through the security implications of
 >>> having it in `%params`.  I've also removed all the debugging `print` statements.  And I've updated the `is_globlist()` function.
 >>> I think this is ready for people other than me to have a play.  It is not well enough tested to commit just yet.
 >>> -- [[Will]]
 

+I've lost track of the indent level, so I'm going back to not indented - I think this is a working [[patch]] taking into
+account all comments above (which doesn't mean it is above reproach :) ).  --[[Will]]
+
+> Very belated code review of last version of the patch:
+> 
+> * `is_globlist` is no longer needed
+
+>> Good :)
+
+> * I don't understand why the pagespec match regexp is changed
+>   from having flags `igx` to `ixgs`. Don't see why you
+>   want `.` to match '\n` in it, and don't see any `.` in the regexp 
+>   anyway?
+
+>> Because you have to define all the named pagespecs in the pagespec, you sometimes end up with very long pagespecs.  I found it useful to split them over multiple lines.  That didn't work at one point and I added the 's' to make it work.  I may have further altered the regex since then to make the 's' redundant.  Remove it and see if multi-line pagespecs still work. :)
+
+>>> Well, I can tell you that multi-line pagespecs are supported w/o
+>>> your patch .. I use them all the time. The reason I find your
+>>> use of `/s` unlikely is because without it `\s` already matches
+>>> a newline. Only if you want to treat a newline as non-whitespace
+>>> is `/s` typically necessary. --[[Joey]] 
+
+> * Some changes of `@_` to `%params` in `pagespec_makeperl` do not
+>   make sense to me. I don't see where \%params is defined and populated,
+>   except with `\$params{specFunc}`.
+
+>> I'm not a perl hacker.  This was a mighty battle for me to get going.
+>> There is probably some battlefield carnage from my early struggles
+>> learning perl left here. Part of this is that @_ / @params already
+>> existed as a way of passing in extra parameters.  I didn't want to
+>> pollute that top level namespace - just at my own parameter (a hash)
+>> which contained the data I needed.
+
+>>> I think I understand how the various `%params`
+>>> (there's not just one) work in your code now, but it's really a mess.
+>>> Explaining it in words would take pages.. It could be fixed by,
+>>> in `pagespec_makeperl` something like:
+>>> 
+>>>    my %specFuncs;
+>>>    push @_, specFuncs => \%specFuncs;
+>>> 
+>>> With that you have the hash locally available for populating
+>>> inside `pagespec_makeperl`, and when the `match_*` functions
+>>> are called the same hash data will be available inside their
+>>> `@_` or `%params`. No need to change how the functions are called
+>>> or do any of the other hacks.
+>>>
+>>> Currently, specFuncs is populated by building up code
+>>> that recursively calls `pagespec_makeperl`, and is then
+>>> evaluated when the pagespec gets evaluated. My suggested
+>>> change to `%params` will break that, but that had to change 
+>>> anyway.
+>>>
+>>> It probably has a security hole, and is certianly inviting
+>>> one, since the pagespec definition is matched by a loose regexp (`.*`)
+>>> and then subject to string interpolation before being evaluated
+>>> inside perl code. I recently changed ikiwiki to never interpolate
+>>> user-supplied strings when translating pagespecs, and that
+>>> needs to happen here too. The obvious way, it seems to me,
+>>> is to not generate perl code, but just directly run perl code that
+>>> populates specFuncs.
+
+> * Seems that the only reason `match_glob` has to check for `~` is
+>   because when a named spec appears in a pagespec, it is translated
+>   to `match_glob("~foo")`. If, instead, `pagespec_makeperl` checked
+>   for named specs, it could convert them into `check_named_spec("foo")`
+>   and avoid that ugliness.
+
+>> Yeah - I wanted to make named specs syntactically different on my first pass.  You are right in that this could be made a fallback - named specs always override pagenames.
+
+> * The changes to `match_link` seem either unecessary, or incomplete.
+>   Shouldn't it check for named specs and call
+>   `check_named_spec_existential`?
+
+>>  An earlier version did.  Then I realised it wasn't actually needed in that case - match_link() already included a loop that was like a type of existential matching.  Each time through the loop it would
+>> call match_glob().  match_glob() in turn will handle the named spec.  I tested this version briefly and it seemed to work.  I remember looking at this again later and wondering if I had mis-understood
+>> some of the logic in match_link(), which might mean there are cases where you would need an explicit call to check_named_spec_existential() - I never checked it properly after having that thought.
+
+>>> In the common case, `match_link` does not call `match_glob`,
+>>> because the link target it is being asked to check for is a single
+>>> page name, not a glob.
+
+> * Generally, the need to modify `match_*` functions so that they
+>   check for and handle named pagespecs seems suboptimal, if
+>   only because there might be others people may want to use named
+>   pagespecs with. It would be possible to move this check
+>   to `pagespec_makeperl`, by having it check if the parameter
+>   passed to a pagespec function looked like a named pagespec.
+>   The only issue is that some pagespec functions take a parameter
+>   that is not a page name at all, and it could be weird
+>   if such a parameter were accidentially interpreted as a named
+>   pagespec. (But, that seems unlikely to happen.)
+
+>> Possibly.  I'm not sure which I prefer between the current solution and that one.  Each have advantages and disadvantages.
+>> It really isn't much code for the match functions to add a call to check_named_spec_existential().
+
+>>> But if a plugin adds its own match function, it has
+>>> to explicitly call that code to support named pagespecs.
+
+> * I need to check if your trick to avoid infinite recursion
+>   works if there are two named specs that recursively
+>   call one-another. I suspect it does, but will test this
+>   myself..
+
+>> It worked for me. :)
+
+> * I also need to verify if memoizing the named pagespecs has
+>   really guarded against very expensive pagespecs DOSing the wiki..
+
+> --[[Joey]] 
+
+>>  There is one issue that I've been thinking about that I haven't raised anywhere (or checked myself), and that is how this all interacts with page dependencies.
+>>  Firstly, I'm not sure anymore that the `pagespec_merge` function will continue to work in all cases.
+
+>>> The problem I can see there is that if two pagespecs
+>>> get merged and both use `~foo` but define it differently,
+>>> then the second definition might be used at a point when
+>>> it shouldn't (but I haven't verified that really happens).
+>>> That could certianly be a show-stopper. --[[Joey]] 
+
+>>  Secondly, it seems that there are two types of dependency, and ikiwiki
+>>  currently only handles one of them.  The first type is "Rebuild this
+>>  page when any of these other pages changes" - ikiwiki handles this.
+>>  The second type is "rebuild this page when set of pages referred to by
+>>  this pagespec changes" - ikiwiki doesn't seem to handle this.  I
+>>  suspect that named pagespecs would make that second type of dependency
+>>  more important.  I'll try to come up with a good example. -- [[Will]]
+
+>>> Hrm, I was going to build an example of this with backlinks, but it
+>>> looks like that is handled as a special case at the moment (line 458 of
+>>> render.pm).  I'll see if I can breapk
+>>> things another way.  Fixing this properly would allow removal of that special case. -- [[Will]]
+
+>>>> I can't quite understand the distinction you're trying to draw
+>>>> between the two types of dependencies. Backlinks are a very special
+>>>> case though and I'll be suprised if they fit well into pagespecs.
+>>>> --[[Joey]] 
+

 ----
 
 ----
 

-diff --git a/IkiWiki.pm b/IkiWiki.pm
-index e476521..532aaf5 100644
---- a/IkiWiki.pm
-+++ b/IkiWiki.pm
-@@ -1524,7 +1524,16 @@ sub globlist_to_pagespec ($) { #{{{
- 
- sub is_globlist ($) { #{{{
-       my $s=shift;
--      return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-+      return ! ($s =~ /
-+                      (^\s*
-+                              [^\s\(]+                # single item
-+                                      (\(                     # possibly with parens after it
-+                                              ([^\)]* # with stuff inside those parens
-+                                              (\([^\)]*\))*)* # maybe even nested parens
-+                                      \))?\s*$
-+                      ) |
-+                              (\s and \s) | (\s or \s)        # or we find 'and' or 'or' somewhere
-+                      /x);
- } #}}}
- 
- sub safequote ($) { #{{{
-@@ -1605,7 +1614,7 @@ sub pagespec_merge ($$) { #{{{
-       return "($a) or ($b)";
- } #}}}
- 
--sub pagespec_translate ($) { #{{{
-+sub pagespec_makeperl ($) { #{{{
-       my $spec=shift;
- 
-       # Support for old-style GlobLists.
-@@ -1624,9 +1633,11 @@ sub pagespec_translate ($) { #{{{
-               |
-                       \)              # )
-               |
--                      \w+\([^\)]*\)   # command(params)
-+                      define\(\s*~\w+\s*,((\([^\(\)]*\)) | ([^\(\)]+))+\)     # define(~specName, spec) - spec can contain parens 1 deep
-+              |
-+                      \w+\([^\(\)]*\) # command(params) - params cannot contain parens
-               |
--                      [^\s()]+        # any other text
-+                      [^\s\(\)]+      # any other text
-               )
-               \s*             # ignore whitespace
-       }igx) {
-@@ -1640,16 +1651,23 @@ sub pagespec_translate ($) { #{{{
-               elsif ($word eq "(" || $word eq ")" || $word eq "!") {
-                       $code.=' '.$word;
-               }
-+              elsif ($word =~ /^define\(\s*~(\w+)\s*,(.*)\)$/) {
-+                      $code .= " (\$specFuncsRef->{$1}=";
-+                      $code .= "memoize(";
-+                      $code .= &pagespec_makeperl($2);
-+                      $code .= ")";
-+                      $code .= ") ";
-+              }
-               elsif ($word =~ /^(\w+)\((.*)\)$/) {
-                       if (exists $IkiWiki::PageSpec::{"match_$1"}) {
--                              $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
-+                              $code.="IkiWiki::PageSpec::match_$1(\$specFuncsRef, \$page, ".safequote($2).", \@_)";
-                       }
-                       else {
-                               $code.=' 0';
-                       }
-               }
-               else {
--                      $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";
-+                      $code.=" IkiWiki::PageSpec::match_glob(\$specFuncsRef, \$page, ".safequote($word).", \@_)";
-               }
-       }
- 
-@@ -1657,8 +1675,16 @@ sub pagespec_translate ($) { #{{{
-               $code=0;
-       }
- 
-+      return 'sub { my $specFuncsRef=shift; my $page=shift; '.$code.' }';
-+} #}}}
-+
-+sub pagespec_translate ($) { #{{{
-+      my $spec=shift;
-+
-+      my $code = pagespec_makeperl($spec);
-+
-       no warnings;
--      return eval 'sub { my $page=shift; '.$code.' }';
-+      return eval $code;
- } #}}}
- 
- sub pagespec_match ($$;@) { #{{{
-@@ -1673,7 +1699,7 @@ sub pagespec_match ($$;@) { #{{{
- 
-       my $sub=pagespec_translate($spec);
-       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
--      return $sub->($page, @params);
-+      return $sub->({}, $page, @params);
- } #}}}
- 
- sub pagespec_valid ($) { #{{{
-@@ -1722,11 +1748,71 @@ sub new { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_glob ($$;@) { #{{{
-+sub check_named_spec($$$;@) {
-+      my $specFuncsRef=shift;
-+      my $page=shift;
-+      my $specName=shift;
-+      my %params=@_;
-+      
-+      return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
-+              unless (substr($specName, 0, 1) eq '~');
-+      
-+      $specName = substr($specName, 1);
-+
-+      if (exists $specFuncsRef->{$specName}) {
-+              # remove the named spec from the spec refs
-+              # when we recurse to avoid infinite recursion
-+              my $sub = $specFuncsRef->{$specName};
-+              $specFuncsRef->{$specName} = undef;
-+              my $result = $sub->($specFuncsRef, $page, %params);
-+              $specFuncsRef->{$specName} = $sub;
-+              return $result;
-+      } else {
-+              return IkiWiki::FailReason->new("Page spec '$specName' does not exist");
-+      }
-+}
-+
-+sub check_named_spec_existential($$$$;@) {
-+      my $specFuncsRef=shift;
-+      my $page=shift;
-+      my $specName=shift;
-+      my $funcref=shift;
-+      my %params=@_;
-+      
-+      return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
-+              unless (substr($specName, 0, 1) eq '~');
-+      $specName = substr($specName, 1);
-+      
-+      if (exists $specFuncsRef->{$specName}) {
-+              # remove the named spec from the spec refs
-+              # when we recurse to avoid infinite recursion
-+              my $sub = $specFuncsRef->{$specName};
-+              $specFuncsRef->{$specName} = undef;
-+              
-+              foreach my $nextpage (keys %IkiWiki::pagesources) {
-+                      if ($sub->($specFuncsRef, $nextpage, %params)) {
-+                              my $tempResult = $funcref->($specFuncsRef, $page, $nextpage, %params);
-+                              return $tempResult if ($tempResult);
-+                      }
-+              }
-+              
-+              $specFuncsRef->{$specName} = $sub;
-+              return IkiWiki::FailReason->new("No page in spec '$specName' was successfully matched");
-+      } else {
-+              return IkiWiki::FailReason->new("Named page spec '$specName' does not exist");
-+      }
-+}
-+
-+sub match_glob ($$$;@) { #{{{
-+      my $specFuncsRef=shift;
-       my $page=shift;
-       my $glob=shift;
-       my %params=@_;
-       
-+      if (substr($glob, 0, 1) eq '~') {
-+              return check_named_spec($specFuncsRef, $page, $glob);
-+      }
-+
-       my $from=exists $params{location} ? $params{location} : '';
-       
-       # relative matching
-@@ -1750,17 +1836,23 @@ sub match_glob ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_internal ($$;@) { #{{{
--      return match_glob($_[0], $_[1], @_, internal => 1)
-+sub match_internal ($$$;@) { #{{{
-+      return match_glob(shift, shift, shift, @_, internal => 1)
- } #}}}
- 
--sub match_link ($$;@) { #{{{
-+sub match_link ($$$;@) { #{{{
-+      my $specFuncsRef=shift;
-       my $page=shift;
--      my $link=lc(shift);
-+      my $fulllink=shift;
-+      my $link=lc($fulllink);
-       my %params=@_;
- 
--      my $from=exists $params{location} ? $params{location} : '';
-+      if (substr($fulllink, 0, 1) eq '~') {
-+              return check_named_spec_existential($specFuncsRef, $page, $fulllink, \&match_link);
-+      }
- 
-+      my $from=exists $params{location} ? $params{location} : '';
-+      
-       # relative matching
-       if ($link =~ m!^\.! && defined $from) {
-               $from=~s#/?[^/]+$##;
-@@ -1778,17 +1870,21 @@ sub match_link ($$;@) { #{{{
-               }
-               else {
-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
--                              if match_glob($p, $link, %params);
-+                              if match_glob($specFuncsRef, $p, $link, %params);
-               }
-       }
-       return IkiWiki::FailReason->new("$page does not link to $link");
- } #}}}
- 
--sub match_backlink ($$;@) { #{{{
--      return match_link($_[1], $_[0], @_);
-+sub match_backlink ($$$;@) { #{{{
-+      my $specFuncsRef=shift;
-+      my $page=shift;
-+      my $backlink=shift;
-+      return match_link($specFuncsRef, $backlink, $page, @_);
- } #}}}
- 
--sub match_created_before ($$;@) { #{{{
-+sub match_created_before ($$$;@) { #{{{
-+      my $specFuncsRef=shift;
-       my $page=shift;
-       my $testpage=shift;
- 
-@@ -1805,7 +1901,8 @@ sub match_created_before ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_created_after ($$;@) { #{{{
-+sub match_created_after ($$$;@) { #{{{
-+      my $specFuncsRef=shift;
-       my $page=shift;
-       my $testpage=shift;
- 
-@@ -1822,8 +1919,12 @@ sub match_created_after ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_creation_day ($$;@) { #{{{
--      if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
-+sub match_creation_day ($$$;@) { #{{{
-+      shift;
-+      my $page=shift;
-+      my $time=shift;
-+
-+      if ((gmtime($IkiWiki::pagectime{$page}))[3] == $time) {
-               return IkiWiki::SuccessReason->new('creation_day matched');
-       }
-       else {
-@@ -1831,8 +1932,12 @@ sub match_creation_day ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_creation_month ($$;@) { #{{{
--      if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
-+sub match_creation_month ($$$;@) { #{{{
-+      shift;
-+      my $page=shift;
-+      my $time=shift;
-+
-+      if ((gmtime($IkiWiki::pagectime{$page}))[4] + 1 == $time) {
-               return IkiWiki::SuccessReason->new('creation_month matched');
-       }
-       else {
-@@ -1840,8 +1945,12 @@ sub match_creation_month ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_creation_year ($$;@) { #{{{
--      if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
-+sub match_creation_year ($$$;@) { #{{{
-+      shift;
-+      my $page=shift;
-+      my $time=shift;
-+
-+      if ((gmtime($IkiWiki::pagectime{$page}))[5] + 1900 == $time) {
-               return IkiWiki::SuccessReason->new('creation_year matched');
-       }
-       else {
-diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
-index f1f792a..a410e48 100644
---- a/IkiWiki/Plugin/attachment.pm
-+++ b/IkiWiki/Plugin/attachment.pm
-@@ -291,7 +291,8 @@ sub attachment_list ($) { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_user ($$;@) { #{{{
-+sub match_user ($$$;@) { #{{{
-+      shift;
-       shift;
-       my $user=shift;
-       my %params=@_;
-@@ -311,7 +312,8 @@ sub match_user ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_ip ($$;@) { #{{{
-+sub match_ip ($$$;@) { #{{{
-+      shift;
-       shift;
-       my $ip=shift;
-       my %params=@_;
-diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
-index 7716fce..c0dbb50 100644
---- a/IkiWiki/Plugin/conditional.pm
-+++ b/IkiWiki/Plugin/conditional.pm
-@@ -70,7 +70,8 @@ sub preprocess_if (@) { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_enabled ($$;@) { #{{{
-+sub match_enabled ($$$;@) { #{{{
-+      shift;
-       shift;
-       my $plugin=shift;
-       
-@@ -83,13 +84,14 @@ sub match_enabled ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_sourcepage ($$;@) { #{{{
-+sub match_sourcepage ($$$;@) { #{{{
-+      my $specFuncsRef=shift;
-       shift;
-       my $glob=shift;
-       my %params=@_;
- 
-       return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
--      if (match_glob($params{sourcepage}, $glob, @_)) {
-+      if (match_glob($specFuncsRef, $params{sourcepage}, $glob, @_)) {
-               return IkiWiki::SuccessReason->new("sourcepage matches $glob");
-       }
-       else {
-@@ -97,13 +99,14 @@ sub match_sourcepage ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_destpage ($$;@) { #{{{
-+sub match_destpage ($$$;@) { #{{{
-+      my $specFuncsRef=shift;
-       shift;
-       my $glob=shift;
-       my %params=@_;
-       
-       return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
--      if (match_glob($params{destpage}, $glob, @_)) {
-+      if (match_glob($specFuncsRef, $params{destpage}, $glob, @_)) {
-               return IkiWiki::SuccessReason->new("destpage matches $glob");
-       }
-       else {
-@@ -111,7 +114,8 @@ sub match_destpage ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_included ($$;@) { #{{{
-+sub match_included ($$$;@) { #{{{
-+      shift;
-       shift;
-       shift;
-       my %params=@_;
-diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-index 6f71be3..3592342 100644
---- a/IkiWiki/Plugin/filecheck.pm
-+++ b/IkiWiki/Plugin/filecheck.pm
-@@ -66,7 +66,8 @@ sub humansize ($) { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_maxsize ($$;@) { #{{{
-+sub match_maxsize ($$$;@) { #{{{
-+      shift;
-       my $page=shift;
-       my $maxsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
-       if ($@) {
-@@ -87,7 +88,8 @@ sub match_maxsize ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_minsize ($$;@) { #{{{
-+sub match_minsize ($$$;@) { #{{{
-+      shift;
-       my $page=shift;
-       my $minsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
-       if ($@) {
-@@ -108,7 +110,8 @@ sub match_minsize ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_mimetype ($$;@) { #{{{
-+sub match_mimetype ($$$;@) { #{{{
-+      shift;
-       my $page=shift;
-       my $wanted=shift;
- 
-@@ -138,7 +141,8 @@ sub match_mimetype ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_virusfree ($$;@) { #{{{
-+sub match_virusfree ($$$;@) { #{{{
-+      shift;
-       my $page=shift;
-       my $wanted=shift;
- 
-@@ -180,7 +184,7 @@ sub match_virusfree ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_ispage ($$;@) { #{{{
-+sub match_ispage ($$$;@) { #{{{
-       my $filename=shift;
- 
-       if (defined IkiWiki::pagetype($filename)) {
-diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
-index b2c85c8..788f248 100644
---- a/IkiWiki/Plugin/meta.pm
-+++ b/IkiWiki/Plugin/meta.pm
-@@ -263,6 +263,7 @@ sub pagetemplate (@) { #{{{
- 
- sub match { #{{{
-       my $field=shift;
-+      shift;
-       my $page=shift;
-       
-       # turn glob into a safe regexp
-@@ -291,23 +292,23 @@ sub match { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_title ($$;@) { #{{{
-+sub match_title ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("title", @_);      
- } #}}}
- 
--sub match_author ($$;@) { #{{{
-+sub match_author ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("author", @_);
- } #}}}
- 
--sub match_authorurl ($$;@) { #{{{
-+sub match_authorurl ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("authorurl", @_);
- } #}}}
- 
--sub match_license ($$;@) { #{{{
-+sub match_license ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("license", @_);
- } #}}}
- 
--sub match_copyright ($$;@) { #{{{
-+sub match_copyright ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("copyright", @_);
- } #}}}
- 
+    diff --git a/IkiWiki.pm b/IkiWiki.pm
+    index 4e4da11..8b3cdfe 100644
+    --- a/IkiWiki.pm
+    +++ b/IkiWiki.pm
+    @@ -1550,7 +1550,16 @@ sub globlist_to_pagespec ($) {
+     
+     sub is_globlist ($) {
+       my $s=shift;
+    -  return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
+    +  return ! ($s =~ /
+    +                  (^\s*
+    +                          [^\s(]+         # single item
+    +                                  (\(                     # possibly with parens after it
+    +                                          ([^)]*  # with stuff inside those parens
+    +                                          (\([^)]*\))*)*  # maybe even nested parens
+    +                                  \))?\s*$
+    +                  ) |
+    +                          (\s and \s) | (\s or \s)        # or we find 'and' or 'or' somewhere
+    +                  /xs);
+     }
+     
+     sub safequote ($) {
+    @@ -1631,7 +1640,7 @@ sub pagespec_merge ($$) {
+       return "($a) or ($b)";
+     }
+     
+    -sub pagespec_translate ($) {
+    +sub pagespec_makeperl ($) {
+       my $spec=shift;
+     
+       # Support for old-style GlobLists.
+    @@ -1650,12 +1659,14 @@ sub pagespec_translate ($) {
+               |
+                       \)              # )
+               |
+    -                  \w+\([^\)]*\)   # command(params)
+    +                  define\(\s*~\w+\s*,((\([^()]*\)) | ([^()]+))+\) # define(~specName, spec) - spec can contain parens 1 deep
+    +          |
+    +                  \w+\([^()]*\)   # command(params) - params cannot contain parens
+               |
+                       [^\s()]+        # any other text
+               )
+               \s*             # ignore whitespace
+    -  }igx) {
+    +  }igxs) {
+               my $word=$1;
+               if (lc $word eq 'and') {
+                       $code.=' &&';
+    @@ -1666,16 +1677,23 @@ sub pagespec_translate ($) {
+               elsif ($word eq "(" || $word eq ")" || $word eq "!") {
+                       $code.=' '.$word;
+               }
+    -          elsif ($word =~ /^(\w+)\((.*)\)$/) {
+    +          elsif ($word =~ /^define\(\s*~(\w+)\s*,(.*)\)$/s) {
+    +                  $code .= " (\$params{specFuncs}->{$1}=";        # (exists \$params{specFuncs}) && 
+    +                  $code .= "memoize(";
+    +                  $code .= &pagespec_makeperl($2);
+    +                  $code .= ")";
+    +                  $code .= ") ";
+    +          }
+    +          elsif ($word =~ /^(\w+)\((.*)\)$/s) {
+                       if (exists $IkiWiki::PageSpec::{"match_$1"}) {
+    -                          $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
+    +                          $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \%params)";
+                       }
+                       else {
+                               $code.=' 0';
+                       }
+               }
+               else {
+    -                  $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";
+    +                  $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \%params)";
+               }
+       }
+     
+    @@ -1683,8 +1701,18 @@ sub pagespec_translate ($) {
+               $code=0;
+       }
+     
+    +  return 'sub { my $page=shift; my %params = @_; '.$code.' }';
+    +}
+    +
+    +sub pagespec_translate ($) {
+    +  my $spec=shift;
+    +
+    +  my $code = pagespec_makeperl($spec);
+    +
+    +  # print STDERR "Spec '$spec' generated code '$code'\n";
+    +
+       no warnings;
+    -  return eval 'sub { my $page=shift; '.$code.' }';
+    +  return eval $code;
+     }
+     
+     sub pagespec_match ($$;@) {
+    @@ -1699,7 +1727,7 @@ sub pagespec_match ($$;@) {
+     
+       my $sub=pagespec_translate($spec);
+       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
+    -  return $sub->($page, @params);
+    +  return $sub->($page, @params, specFuncs => {});
+     }
+     
+     sub pagespec_valid ($) {
+    @@ -1748,11 +1776,78 @@ sub new {
+     
+     package IkiWiki::PageSpec;
+     
+    +sub check_named_spec($$;@) {
+    +  my $page=shift;
+    +  my $specName=shift;
+    +  my %params=@_;
+    +  
+    +  error("Unable to find specFuncs in params to check_named_spec()!") unless exists $params{specFuncs};
+    +
+    +  my $specFuncsRef=$params{specFuncs};
+    +  
+    +  return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
+    +          unless (substr($specName, 0, 1) eq '~');
+    +  
+    +  $specName = substr($specName, 1);
+    +
+    +  if (exists $specFuncsRef->{$specName}) {
+    +          # remove the named spec from the spec refs
+    +          # when we recurse to avoid infinite recursion
+    +          my $sub = $specFuncsRef->{$specName};
+    +          delete $specFuncsRef->{$specName};
+    +          my $result = $sub->($page, %params);
+    +          $specFuncsRef->{$specName} = $sub;
+    +          return $result;
+    +  } else {
+    +          return IkiWiki::FailReason->new("Page spec '$specName' does not exist");
+    +  }
+    +}
+    +
+    +sub check_named_spec_existential($$$;@) {
+    +  my $page=shift;
+    +  my $specName=shift;
+    +  my $funcref=shift;
+    +  my %params=@_;
+    +  
+    +  error("Unable to find specFuncs in params to check_named_spec_existential()!") unless exists $params{specFuncs};
+    +  my $specFuncsRef=$params{specFuncs};
+    +  
+    +  return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
+    +          unless (substr($specName, 0, 1) eq '~');
+    +  $specName = substr($specName, 1);
+    +  
+    +  if (exists $specFuncsRef->{$specName}) {
+    +          # remove the named spec from the spec refs
+    +          # when we recurse to avoid infinite recursion
+    +          my $sub = $specFuncsRef->{$specName};
+    +          delete $specFuncsRef->{$specName};
+    +          
+    +          foreach my $nextpage (keys %IkiWiki::pagesources) {
+    +                  if ($sub->($nextpage, %params)) {
+    +                          my $tempResult = $funcref->($page, $nextpage, %params);
+    +                          if ($tempResult) {
+    +                                  $specFuncsRef->{$specName} = $sub;
+    +                                  return $tempResult;
+    +                          }
+    +                  }
+    +          }
+    +          
+    +          $specFuncsRef->{$specName} = $sub;
+    +          return IkiWiki::FailReason->new("No page in spec '$specName' was successfully matched");
+    +  } else {
+    +          return IkiWiki::FailReason->new("Named page spec '$specName' does not exist");
+    +  }
+    +}
+    +
+     sub match_glob ($$;@) {
+       my $page=shift;
+       my $glob=shift;
+       my %params=@_;
+       
+    +  if (substr($glob, 0, 1) eq '~') {
+    +          return check_named_spec($page, $glob, %params);
+    +  }
+    +
+       my $from=exists $params{location} ? $params{location} : '';
+       
+       # relative matching
+    @@ -1782,11 +1877,12 @@ sub match_internal ($$;@) {
+     
+     sub match_link ($$;@) {
+       my $page=shift;
+    -  my $link=lc(shift);
+    +  my $fulllink=shift;
+       my %params=@_;
+    +  my $link=lc($fulllink);
+     
+       my $from=exists $params{location} ? $params{location} : '';
+    -
+    +  
+       # relative matching
+       if ($link =~ m!^\.! && defined $from) {
+               $from=~s#/?[^/]+$##;
+    @@ -1804,19 +1900,32 @@ sub match_link ($$;@) {
+               }
+               else {
+                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+    -                          if match_glob($p, $link, %params);
+    +                          if match_glob($p, $fulllink, %params);
+               }
+       }
+       return IkiWiki::FailReason->new("$page does not link to $link");
+     }
+     
+     sub match_backlink ($$;@) {
+    -  return match_link($_[1], $_[0], @_);
+    +  my $page=shift;
+    +  my $backlink=shift;
+    +  my @params=@_;
+    +
+    +  if (substr($backlink, 0, 1) eq '~') {
+    +          return check_named_spec_existential($page, $backlink, \&match_backlink, @params);
+    +  }
+    +
+    +  return match_link($backlink, $page, @params);
+     }
+     
+     sub match_created_before ($$;@) {
+       my $page=shift;
+       my $testpage=shift;
+    +  my @params=@_;
+    +
+    +  if (substr($testpage, 0, 1) eq '~') {
+    +          return check_named_spec_existential($page, $testpage, \&match_created_before, @params);
+    +  }
+     
+       if (exists $IkiWiki::pagectime{$testpage}) {
+               if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
+    @@ -1834,6 +1943,11 @@ sub match_created_before ($$;@) {
+     sub match_created_after ($$;@) {
+       my $page=shift;
+       my $testpage=shift;
+    +  my @params=@_;
+    +
+    +  if (substr($testpage, 0, 1) eq '~') {
+    +          return check_named_spec_existential($page, $testpage, \&match_created_after, @params);
+    +  }
+     
+       if (exists $IkiWiki::pagectime{$testpage}) {
+               if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {