pldb (list): Allow multiple ranges.

diff --git a/pldb b/pldb
index 631e544..7f59373 100755 (executable)
--- a/pldb
+++ b/pldb
@@ -260,7 +260,7 @@ defcmd "next [-pu] [-o N] [-n N] GROUP [LIST]", sub {
   defined $prevlist and print "$prevlist\n", map "\t$_\n", @out;
 };
 
-defcmd "list [-g [MARK=]GROUP,...] [-r [LO][-[HI]]] LIST", sub {
+defcmd "list [-g [MARK=]GROUP,...] [-r [LO][-[HI]],...] LIST", sub {
   local @ARGV = @_;
   my $bogusp = 0;
   my %opt;
@@ -309,12 +309,42 @@ defcmd "list [-g [MARK=]GROUP,...] [-r [LO][-[HI]]] LIST", sub {
      WHERE e.list_name = ?";
   my @arg = ($list);
 
+  my @r;
   if (defined $opt{"r"}) {
-    $opt{"r"} =~ /^ (\d+)? (?: - (\d+)?)? $/x
-      or die "invalid range expression `$opt{'r'}'";
-    my ($lo, $hi) = ($1, $2);
-    if (defined $lo) { $q .= " AND ? <= e.entry"; push @arg, $lo; }
-    if (defined $hi) { $q .= " AND e.entry < ?"; push @arg, $hi; }
+    for my $r (split /,/, $opt{"r"}) {
+      $r =~ /^ (\d+)? (?: - (\d+)?)? $/x
+       or die "invalid range expression `$r'";
+      my ($lo, $hi) = ($1 // 0, $2 // $emax + 1);
+      $hi <= $emax or $hi = $emax + 1;
+      push @r, [$lo, $hi];
+    }
+  }
+
+  if (@r) {
+    my ($curr_lo, $curr_hi) = (undef, undef);
+    my @newr;
+    RANGE: for my $r (sort { $a->[0] <=> $b->[0] ||
+                            $a->[1] <=> $b->[1] } @r) {
+      my ($lo, $hi) = @$r;
+      if (defined $curr_hi) {
+       if ($lo <= $curr_hi) { $curr_hi = $hi; next RANGE; }
+       push @newr, [$curr_lo, $curr_hi];
+      }
+      ($curr_lo, $curr_hi) = ($lo, $hi);
+    }
+    push @newr, [$curr_lo, $curr_hi];
+    my @q;
+    for my $r (@newr) {
+      my ($lo, $hi) = @$r;
+      my @qr;
+      if ($lo > 0) { push @qr, "? <= e.entry"; push @arg, $lo; }
+      if ($hi <= $emax ) { push @qr, "e.entry < ?"; push @arg, $hi; }
+      if (!@qr) { }
+      elsif (@qr == 1) { push @q, @qr; }
+      else { push @q, "(" . join(" AND ", @qr) . ")"; }
+    }
+    if (@q == 1) { $q .= " AND $q[0]"; }
+    else { $q .= " AND (" . join(" OR ", @q) . ")"; }
   }
 
   $q .= " ORDER BY e.entry ASC";