pub/Impl: Lib/IMPL/DOM/Node.pm comparison

Removed absolute modules Updated DOM model, selectNodes can now select a complex path Web DOM model release candidate

comparison

equal deleted inserted replaced

-:0e72ad99eef7
+:c6fb6964de4c
 	my ($this,$axis) = @_;
 	return $Axes{$axis}->($this)
 }
 sub selectNodes {
-my ($this,$query,$axis) = @_;
+	my $this = shift;
+	my ($path) = @_;
+	$path = ref $path eq 'ARRAY' ? $path :  ( @_ == 1 ? $this->translatePath($path) : [@_]);
+	my @set = ($this);
+	while (my $query = shift @$path) {
+		@set = map $_->selectNodesAxis($query), @set;
+	}
+	return wantarray ? @set : \@set;
+}
+sub translatePath {
+	my ($this,$path) = @_;
+	# TODO: Move path compilation here from IMPL::DOM::Schema::Validator::Compare
+	return [$path];
+}
+sub selectNodesAxis {
+	 my ($this,$query,$axis) = @_;
 $axis ||= 'child';
 die new IMPL::InvalidOperationException('Unknown axis',$axis) unless exists $Axes{$axis};
 } elsif (ref $query eq 'ARRAY' ) {
 my %keys = map (($_,1),@$query);
 @result = grep $keys{$_->nodeName}, @{$nodes};
 } elsif (ref $query eq 'HASH') {
 	while( my ($axis,$filter) = each %$query ) {
-		push @result, $this->selectNodes($filter,$axis);
+		push @result, $this->selectNodesAxis($filter,$axis);
 	}
 } elsif (defined $query) {
 @result = grep $_->nodeName eq $query, @{$nodes};
 } else {
 return wantarray ? @{$nodes} : $nodes;
 }
 return wantarray ? @result : \@result;
-}
-sub selectPath {
-	my ($this,$path) = @_;
-	my @set = ($this);
-	while (my $query = shift @$path) {
-		@set = map $_->selectNodes($query), @set;
-	}
-	return wantarray ? @set : \@set;
 }
 sub selectParent {
 	my ($this) = @_;

Mercurial > pub > Impl