Hello community, here is the log from the commit of package perl-XML-XPath for openSUSE:Factory checked in at 2016-11-15 17:54:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-XML-XPath (Old) and /work/SRC/openSUSE:Factory/.perl-XML-XPath.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-XML-XPath" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-XML-XPath/perl-XML-XPath.changes 2016-11-11 14:31:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-XML-XPath.new/perl-XML-XPath.changes 2016-11-15 17:54:27.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Nov 11 07:35:02 UTC 2016 - [email protected] + +- updated to 1.39 + see /usr/share/doc/packages/perl-XML-XPath/Changes + + 1.39 2016-11-08 MANWAR + - Proposed fix for RT #118643. + +------------------------------------------------------------------- Old: ---- XML-XPath-1.38.tar.gz New: ---- XML-XPath-1.39.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-XML-XPath.spec ++++++ --- /var/tmp/diff_new_pack.aEDoXT/_old 2016-11-15 17:54:28.000000000 +0100 +++ /var/tmp/diff_new_pack.aEDoXT/_new 2016-11-15 17:54:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-XML-XPath -Version: 1.38 +Version: 1.39 Release: 0 %define cpan_name XML-XPath Summary: Parse and evaluate XPath statements @@ -31,7 +31,9 @@ BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Path::Tiny) >= 0.076 +BuildRequires: perl(Scalar::Util) >= 1.45 BuildRequires: perl(XML::Parser) >= 2.23 +Requires: perl(Scalar::Util) >= 1.45 Requires: perl(XML::Parser) >= 2.23 %{perl_requires} ++++++ XML-XPath-1.38.tar.gz -> XML-XPath-1.39.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/Changes new/XML-XPath-1.39/Changes --- old/XML-XPath-1.38/Changes 2016-10-31 10:44:00.000000000 +0100 +++ new/XML-XPath-1.39/Changes 2016-11-08 13:55:22.000000000 +0100 @@ -1,5 +1,8 @@ Revision history for XML::XPath +1.39 2016-11-08 MANWAR + - Proposed fix for RT #118643. + 1.38 2016-10-31 MANWAR - Fixed parser caching as reported by Jeremy (mysticprune). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/META.json new/XML-XPath-1.39/META.json --- old/XML-XPath-1.38/META.json 2016-10-31 10:44:34.000000000 +0100 +++ new/XML-XPath-1.39/META.json 2016-11-08 13:56:19.000000000 +0100 @@ -33,6 +33,7 @@ }, "runtime" : { "requires" : { + "Scalar::Util" : "1.45", "XML::Parser" : "2.23", "perl" : "5.006" } @@ -41,91 +42,91 @@ "provides" : { "XML::XPath" : { "file" : "lib/XML/XPath.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Boolean" : { "file" : "lib/XML/XPath/Boolean.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Builder" : { "file" : "lib/XML/XPath/Builder.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Expr" : { "file" : "lib/XML/XPath/Expr.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Function" : { "file" : "lib/XML/XPath/Function.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Literal" : { "file" : "lib/XML/XPath/Literal.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::LocationPath" : { "file" : "lib/XML/XPath/LocationPath.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Node" : { "file" : "lib/XML/XPath/Node.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Node::Attribute" : { "file" : "lib/XML/XPath/Node/Attribute.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Node::Comment" : { "file" : "lib/XML/XPath/Node/Comment.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Node::Element" : { "file" : "lib/XML/XPath/Node/Element.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Node::Namespace" : { "file" : "lib/XML/XPath/Node/Namespace.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Node::PI" : { "file" : "lib/XML/XPath/Node/PI.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Node::Text" : { "file" : "lib/XML/XPath/Node/Text.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::NodeSet" : { "file" : "lib/XML/XPath/NodeSet.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Number" : { "file" : "lib/XML/XPath/Number.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Parser" : { "file" : "lib/XML/XPath/Parser.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::PerlSAX" : { "file" : "lib/XML/XPath/PerlSAX.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Root" : { "file" : "lib/XML/XPath/Root.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Step" : { "file" : "lib/XML/XPath/Step.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::Variable" : { "file" : "lib/XML/XPath/Variable.pm", - "version" : "1.38" + "version" : "1.39" }, "XML::XPath::XMLParser" : { "file" : "lib/XML/XPath/XMLParser.pm", - "version" : "1.38" + "version" : "1.39" } }, "release_status" : "stable", @@ -136,6 +137,6 @@ "web" : "https://github.com/manwar/XML-XPath"; } }, - "version" : "1.38", + "version" : "1.39", "x_serialization_backend" : "JSON::PP version 2.27300" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/META.yml new/XML-XPath-1.39/META.yml --- old/XML-XPath-1.38/META.yml 2016-10-31 10:44:34.000000000 +0100 +++ new/XML-XPath-1.39/META.yml 2016-11-08 13:56:19.000000000 +0100 @@ -21,74 +21,75 @@ provides: XML::XPath: file: lib/XML/XPath.pm - version: '1.38' + version: '1.39' XML::XPath::Boolean: file: lib/XML/XPath/Boolean.pm - version: '1.38' + version: '1.39' XML::XPath::Builder: file: lib/XML/XPath/Builder.pm - version: '1.38' + version: '1.39' XML::XPath::Expr: file: lib/XML/XPath/Expr.pm - version: '1.38' + version: '1.39' XML::XPath::Function: file: lib/XML/XPath/Function.pm - version: '1.38' + version: '1.39' XML::XPath::Literal: file: lib/XML/XPath/Literal.pm - version: '1.38' + version: '1.39' XML::XPath::LocationPath: file: lib/XML/XPath/LocationPath.pm - version: '1.38' + version: '1.39' XML::XPath::Node: file: lib/XML/XPath/Node.pm - version: '1.38' + version: '1.39' XML::XPath::Node::Attribute: file: lib/XML/XPath/Node/Attribute.pm - version: '1.38' + version: '1.39' XML::XPath::Node::Comment: file: lib/XML/XPath/Node/Comment.pm - version: '1.38' + version: '1.39' XML::XPath::Node::Element: file: lib/XML/XPath/Node/Element.pm - version: '1.38' + version: '1.39' XML::XPath::Node::Namespace: file: lib/XML/XPath/Node/Namespace.pm - version: '1.38' + version: '1.39' XML::XPath::Node::PI: file: lib/XML/XPath/Node/PI.pm - version: '1.38' + version: '1.39' XML::XPath::Node::Text: file: lib/XML/XPath/Node/Text.pm - version: '1.38' + version: '1.39' XML::XPath::NodeSet: file: lib/XML/XPath/NodeSet.pm - version: '1.38' + version: '1.39' XML::XPath::Number: file: lib/XML/XPath/Number.pm - version: '1.38' + version: '1.39' XML::XPath::Parser: file: lib/XML/XPath/Parser.pm - version: '1.38' + version: '1.39' XML::XPath::PerlSAX: file: lib/XML/XPath/PerlSAX.pm - version: '1.38' + version: '1.39' XML::XPath::Root: file: lib/XML/XPath/Root.pm - version: '1.38' + version: '1.39' XML::XPath::Step: file: lib/XML/XPath/Step.pm - version: '1.38' + version: '1.39' XML::XPath::Variable: file: lib/XML/XPath/Variable.pm - version: '1.38' + version: '1.39' XML::XPath::XMLParser: file: lib/XML/XPath/XMLParser.pm - version: '1.38' + version: '1.39' requires: + Scalar::Util: '1.45' XML::Parser: '2.23' perl: '5.006' resources: repository: https://github.com/manwar/XML-XPath.git -version: '1.38' +version: '1.39' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/Makefile.PL new/XML-XPath-1.39/Makefile.PL --- old/XML-XPath-1.38/Makefile.PL 2016-10-29 20:56:30.000000000 +0200 +++ new/XML-XPath-1.39/Makefile.PL 2016-11-08 13:31:28.000000000 +0100 @@ -21,34 +21,35 @@ }, PREREQ_PM => { 'XML::Parser' => '2.23', + 'Scalar::Util' => '1.45', }, dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', }, clean => { FILES => 'XML-XPath-*' }, (eval { ExtUtils::MakeMaker->VERSION(6.46) } ? (META_MERGE => { 'meta-spec' => { version => 2 }, provides => { - 'XML::XPath' => { file => 'lib/XML/XPath.pm', version => '1.38' }, - 'XML::XPath::XMLParser' => { file => 'lib/XML/XPath/XMLParser.pm', version => '1.38' }, - 'XML::XPath::Parser' => { file => 'lib/XML/XPath/Parser.pm', version => '1.38' }, - 'XML::XPath::Expr' => { file => 'lib/XML/XPath/Expr.pm', version => '1.38' }, - 'XML::XPath::Function' => { file => 'lib/XML/XPath/Function.pm', version => '1.38' }, - 'XML::XPath::Literal' => { file => 'lib/XML/XPath/Literal.pm', version => '1.38' }, - 'XML::XPath::LocationPath' => { file => 'lib/XML/XPath/LocationPath.pm', version => '1.38' }, - 'XML::XPath::Number' => { file => 'lib/XML/XPath/Number.pm', version => '1.38' }, - 'XML::XPath::Node' => { file => 'lib/XML/XPath/Node.pm', version => '1.38' }, - 'XML::XPath::Node::Element' => { file => 'lib/XML/XPath/Node/Element.pm', version => '1.38' }, - 'XML::XPath::Node::Attribute' => { file => 'lib/XML/XPath/Node/Attribute.pm', version => '1.38' }, - 'XML::XPath::Node::Text' => { file => 'lib/XML/XPath/Node/Text.pm', version => '1.38' }, - 'XML::XPath::Node::Namespace' => { file => 'lib/XML/XPath/Node/Namespace.pm', version => '1.38' }, - 'XML::XPath::Node::PI' => { file => 'lib/XML/XPath/Node/PI.pm', version => '1.38' }, - 'XML::XPath::Node::Comment' => { file => 'lib/XML/XPath/Node/Comment.pm', version => '1.38' }, - 'XML::XPath::Step' => { file => 'lib/XML/XPath/Step.pm', version => '1.38' }, - 'XML::XPath::Variable' => { file => 'lib/XML/XPath/Variable.pm', version => '1.38' }, - 'XML::XPath::NodeSet' => { file => 'lib/XML/XPath/NodeSet.pm', version => '1.38' }, - 'XML::XPath::Boolean' => { file => 'lib/XML/XPath/Boolean.pm', version => '1.38' }, - 'XML::XPath::Root' => { file => 'lib/XML/XPath/Root.pm', version => '1.38' }, - 'XML::XPath::PerlSAX' => { file => 'lib/XML/XPath/PerlSAX.pm', version => '1.38' }, - 'XML::XPath::Builder' => { file => 'lib/XML/XPath/Builder.pm', version => '1.38' }, + 'XML::XPath' => { file => 'lib/XML/XPath.pm', version => '1.39' }, + 'XML::XPath::XMLParser' => { file => 'lib/XML/XPath/XMLParser.pm', version => '1.39' }, + 'XML::XPath::Parser' => { file => 'lib/XML/XPath/Parser.pm', version => '1.39' }, + 'XML::XPath::Expr' => { file => 'lib/XML/XPath/Expr.pm', version => '1.39' }, + 'XML::XPath::Function' => { file => 'lib/XML/XPath/Function.pm', version => '1.39' }, + 'XML::XPath::Literal' => { file => 'lib/XML/XPath/Literal.pm', version => '1.39' }, + 'XML::XPath::LocationPath' => { file => 'lib/XML/XPath/LocationPath.pm', version => '1.39' }, + 'XML::XPath::Number' => { file => 'lib/XML/XPath/Number.pm', version => '1.39' }, + 'XML::XPath::Node' => { file => 'lib/XML/XPath/Node.pm', version => '1.39' }, + 'XML::XPath::Node::Element' => { file => 'lib/XML/XPath/Node/Element.pm', version => '1.39' }, + 'XML::XPath::Node::Attribute' => { file => 'lib/XML/XPath/Node/Attribute.pm', version => '1.39' }, + 'XML::XPath::Node::Text' => { file => 'lib/XML/XPath/Node/Text.pm', version => '1.39' }, + 'XML::XPath::Node::Namespace' => { file => 'lib/XML/XPath/Node/Namespace.pm', version => '1.39' }, + 'XML::XPath::Node::PI' => { file => 'lib/XML/XPath/Node/PI.pm', version => '1.39' }, + 'XML::XPath::Node::Comment' => { file => 'lib/XML/XPath/Node/Comment.pm', version => '1.39' }, + 'XML::XPath::Step' => { file => 'lib/XML/XPath/Step.pm', version => '1.39' }, + 'XML::XPath::Variable' => { file => 'lib/XML/XPath/Variable.pm', version => '1.39' }, + 'XML::XPath::NodeSet' => { file => 'lib/XML/XPath/NodeSet.pm', version => '1.39' }, + 'XML::XPath::Boolean' => { file => 'lib/XML/XPath/Boolean.pm', version => '1.39' }, + 'XML::XPath::Root' => { file => 'lib/XML/XPath/Root.pm', version => '1.39' }, + 'XML::XPath::PerlSAX' => { file => 'lib/XML/XPath/PerlSAX.pm', version => '1.39' }, + 'XML::XPath::Builder' => { file => 'lib/XML/XPath/Builder.pm', version => '1.39' }, }, resources => { repository => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Boolean.pm new/XML-XPath-1.39/lib/XML/XPath/Boolean.pm --- old/XML-XPath-1.38/lib/XML/XPath/Boolean.pm 2016-10-29 20:48:30.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Boolean.pm 2016-11-08 13:07:18.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Boolean; -$VERSION = '1.38'; +$VERSION = '1.39'; use XML::XPath::Number; use XML::XPath::Literal; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Builder.pm new/XML-XPath-1.39/lib/XML/XPath/Builder.pm --- old/XML-XPath-1.38/lib/XML/XPath/Builder.pm 2016-10-29 20:48:42.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Builder.pm 2016-11-08 13:17:15.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Builder; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Expr.pm new/XML-XPath-1.39/lib/XML/XPath/Expr.pm --- old/XML-XPath-1.38/lib/XML/XPath/Expr.pm 2016-10-29 20:48:51.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Expr.pm 2016-11-08 13:19:14.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Expr; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Function.pm new/XML-XPath-1.39/lib/XML/XPath/Function.pm --- old/XML-XPath-1.38/lib/XML/XPath/Function.pm 2016-10-29 20:49:06.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Function.pm 2016-11-08 13:19:27.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Function; -$VERSION = '1.38'; +$VERSION = '1.39'; use XML::XPath::Number; use XML::XPath::Literal; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Literal.pm new/XML-XPath-1.39/lib/XML/XPath/Literal.pm --- old/XML-XPath-1.38/lib/XML/XPath/Literal.pm 2016-10-29 20:49:18.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Literal.pm 2016-11-08 13:19:51.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Literal; -$VERSION = '1.38'; +$VERSION = '1.39'; use XML::XPath::Boolean; use XML::XPath::Number; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/LocationPath.pm new/XML-XPath-1.39/lib/XML/XPath/LocationPath.pm --- old/XML-XPath-1.38/lib/XML/XPath/LocationPath.pm 2016-10-29 20:49:26.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/LocationPath.pm 2016-11-08 13:20:43.000000000 +0100 @@ -1,7 +1,8 @@ package XML::XPath::LocationPath; -$VERSION = '1.38'; +$VERSION = '1.39'; +use Scalar::Util qw(blessed); use XML::XPath::Root; use strict; use warnings; @@ -48,8 +49,8 @@ my $nodeset = XML::XPath::NodeSet->new(); $nodeset->push($context); - foreach my $step (@$self) { + next unless (defined $step && blessed($step)); # For each step # evaluate the step with the nodeset my $pos = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Node/Attribute.pm new/XML-XPath-1.39/lib/XML/XPath/Node/Attribute.pm --- old/XML-XPath-1.38/lib/XML/XPath/Node/Attribute.pm 2016-10-29 20:50:51.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Node/Attribute.pm 2016-11-08 13:23:06.000000000 +0100 @@ -4,7 +4,7 @@ use vars qw/@ISA $VERSION/; @ISA = ('XML::XPath::Node'); -$VERSION = '1.38'; +$VERSION = '1.39'; package XML::XPath::Node::AttributeImpl; @@ -12,7 +12,7 @@ @ISA = ('XML::XPath::NodeImpl', 'XML::XPath::Node::Attribute'); use XML::XPath::Node ':node_keys'; -$VERSION = '1.37'; +$VERSION = '1.39'; sub new { my $class = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Node/Comment.pm new/XML-XPath-1.39/lib/XML/XPath/Node/Comment.pm --- old/XML-XPath-1.38/lib/XML/XPath/Node/Comment.pm 2016-10-29 20:51:45.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Node/Comment.pm 2016-11-08 13:23:24.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Comment; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Node/Element.pm new/XML-XPath-1.39/lib/XML/XPath/Node/Element.pm --- old/XML-XPath-1.38/lib/XML/XPath/Node/Element.pm 2016-10-29 20:51:59.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Node/Element.pm 2016-11-08 13:24:27.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Element; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Node/Namespace.pm new/XML-XPath-1.39/lib/XML/XPath/Node/Namespace.pm --- old/XML-XPath-1.38/lib/XML/XPath/Node/Namespace.pm 2016-10-29 20:52:13.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Node/Namespace.pm 2016-11-08 13:24:48.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Namespace; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Node/PI.pm new/XML-XPath-1.39/lib/XML/XPath/Node/PI.pm --- old/XML-XPath-1.38/lib/XML/XPath/Node/PI.pm 2016-10-29 20:52:22.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Node/PI.pm 2016-11-08 13:25:01.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::PI; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Node/Text.pm new/XML-XPath-1.39/lib/XML/XPath/Node/Text.pm --- old/XML-XPath-1.38/lib/XML/XPath/Node/Text.pm 2016-10-29 20:54:08.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Node/Text.pm 2016-11-08 13:25:12.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node::Text; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use vars qw/@ISA/; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Node.pm new/XML-XPath-1.39/lib/XML/XPath/Node.pm --- old/XML-XPath-1.38/lib/XML/XPath/Node.pm 2016-10-29 20:50:04.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Node.pm 2016-11-08 13:21:20.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Node; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use vars qw(@ISA @EXPORT $AUTOLOAD %EXPORT_TAGS @EXPORT_OK); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/NodeSet.pm new/XML-XPath-1.39/lib/XML/XPath/NodeSet.pm --- old/XML-XPath-1.38/lib/XML/XPath/NodeSet.pm 2016-10-29 20:54:16.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/NodeSet.pm 2016-11-08 13:20:56.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::NodeSet; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Number.pm new/XML-XPath-1.39/lib/XML/XPath/Number.pm --- old/XML-XPath-1.38/lib/XML/XPath/Number.pm 2016-10-29 20:54:24.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Number.pm 2016-11-08 13:25:42.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Number; -$VERSION = '1.38'; +$VERSION = '1.39'; use XML::XPath::Boolean; use XML::XPath::Literal; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Parser.pm new/XML-XPath-1.39/lib/XML/XPath/Parser.pm --- old/XML-XPath-1.38/lib/XML/XPath/Parser.pm 2016-10-29 20:54:37.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Parser.pm 2016-11-08 13:25:55.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Parser; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use vars qw/ @@ -607,9 +607,11 @@ } } push @steps, Step($self, $tokens); - if (@steps > 1 && - $steps[-1]->{axis} eq 'self' && - $steps[-1]->{test} == XML::XPath::Step::test_nt_node) { + if ((scalar(@steps) > 1) + && + (defined $steps[-1]->{axis} && ($steps[-1]->{axis} eq 'self')) + && + (defined $steps[-1]->{test} && ($steps[-1]->{test} == XML::XPath::Step::test_nt_node))) { pop @steps; } } @@ -634,138 +636,159 @@ # AxisSpecifier NodeTest Predicate(s?) my $token = $tokens->[$self->{_tokpos}]; - debug("SUB: Checking $token\n"); + debug("SUB: Checking $token\n") if defined $token; my $step; - if ($token eq 'processing-instruction') { - $self->{_tokpos}++; - match($self, $tokens, '\\(', 1); - match($self, $tokens, $LITERAL); - $self->{_curr_match} =~ /^["'](.*)["']$/; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_nt_pi, - XML::XPath::Literal->new($1)); - match($self, $tokens, '\\)', 1); - } - elsif ($token =~ /^\@($NCWild|$QName|$QNWild)$/o) { - $self->{_tokpos}++; - if ($token eq '@*') { - $step = XML::XPath::Step->new($self, - 'attribute', - XML::XPath::Step::test_attr_any, - '*'); - } - elsif ($token =~ /^\@($NCName):\*$/o) { - $step = XML::XPath::Step->new($self, - 'attribute', - XML::XPath::Step::test_attr_ncwild, - $1); - } - elsif ($token =~ /^\@($QName)$/o) { - $step = XML::XPath::Step->new($self, - 'attribute', - XML::XPath::Step::test_attr_qname, - $1); - } - } - elsif ($token =~ /^($NCName):\*$/o) { # ns:* - $self->{_tokpos}++; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_ncwild, - $1); - } - elsif ($token =~ /^$QNWild$/o) { # * - $self->{_tokpos}++; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_any, - $token); - } - elsif ($token =~ /^$QName$/o) { # name:name - $self->{_tokpos}++; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_qname, - $token); - } - elsif ($token eq 'comment()') { - $self->{_tokpos}++; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_nt_comment); - } - elsif ($token eq 'text()') { - $self->{_tokpos}++; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_nt_text); - } - elsif ($token eq 'node()') { - $self->{_tokpos}++; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_nt_node); - } - elsif ($token eq 'processing-instruction()') { - $self->{_tokpos}++; - $step = XML::XPath::Step->new($self, 'child', - XML::XPath::Step::test_nt_pi); - } - elsif ($token =~ /^$AXIS_NAME($NCWild|$QName|$QNWild|$NODE_TYPE)$/o) { - my $axis = $1; - $self->{_tokpos}++; - $token = $2; + if (defined $token) { if ($token eq 'processing-instruction') { + $self->{_tokpos}++; match($self, $tokens, '\\(', 1); match($self, $tokens, $LITERAL); $self->{_curr_match} =~ /^["'](.*)["']$/; - $step = XML::XPath::Step->new($self, $axis, - XML::XPath::Step::test_nt_pi, - XML::XPath::Literal->new($1)); + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_nt_pi, + XML::XPath::Literal->new($1)); match($self, $tokens, '\\)', 1); } + elsif ($token =~ /^\@($NCWild|$QName|$QNWild)$/o) { + $self->{_tokpos}++; + if ($token eq '@*') { + $step = XML::XPath::Step->new( + $self, + 'attribute', + XML::XPath::Step::test_attr_any, + '*'); + } + elsif ($token =~ /^\@($NCName):\*$/o) { + $step = XML::XPath::Step->new( + $self, + 'attribute', + XML::XPath::Step::test_attr_ncwild, + $1); + } + elsif ($token =~ /^\@($QName)$/o) { + $step = XML::XPath::Step->new( + $self, + 'attribute', + XML::XPath::Step::test_attr_qname, + $1); + } + } elsif ($token =~ /^($NCName):\*$/o) { # ns:* - $step = XML::XPath::Step->new($self, $axis, - (($axis eq 'attribute') ? - XML::XPath::Step::test_attr_ncwild - : - XML::XPath::Step::test_ncwild), - $1); + $self->{_tokpos}++; + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_ncwild, + $1); } elsif ($token =~ /^$QNWild$/o) { # * - $step = XML::XPath::Step->new($self, $axis, - (($axis eq 'attribute') ? - XML::XPath::Step::test_attr_any - : - XML::XPath::Step::test_any), - $token); + $self->{_tokpos}++; + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_any, + $token); } elsif ($token =~ /^$QName$/o) { # name:name - $step = XML::XPath::Step->new($self, $axis, - (($axis eq 'attribute') ? - XML::XPath::Step::test_attr_qname - : - XML::XPath::Step::test_qname), - $token); + $self->{_tokpos}++; + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_qname, + $token); } elsif ($token eq 'comment()') { - $step = XML::XPath::Step->new($self, $axis, - XML::XPath::Step::test_nt_comment); + $self->{_tokpos}++; + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_nt_comment); } elsif ($token eq 'text()') { - $step = XML::XPath::Step->new($self, $axis, - XML::XPath::Step::test_nt_text); + $self->{_tokpos}++; + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_nt_text); } elsif ($token eq 'node()') { - $step = XML::XPath::Step->new($self, $axis, - XML::XPath::Step::test_nt_node); + $self->{_tokpos}++; + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_nt_node); } elsif ($token eq 'processing-instruction()') { - $step = XML::XPath::Step->new($self, $axis, + $self->{_tokpos}++; + $step = XML::XPath::Step->new( + $self, 'child', + XML::XPath::Step::test_nt_pi); + } + elsif ($token =~ /^$AXIS_NAME($NCWild|$QName|$QNWild|$NODE_TYPE)$/o) { + my $axis = $1; + $self->{_tokpos}++; + $token = $2; + if ($token eq 'processing-instruction') { + match($self, $tokens, '\\(', 1); + match($self, $tokens, $LITERAL); + $self->{_curr_match} =~ /^["'](.*)["']$/; + $step = XML::XPath::Step->new( + $self, $axis, + XML::XPath::Step::test_nt_pi, + XML::XPath::Literal->new($1)); + match($self, $tokens, '\\)', 1); + } + elsif ($token =~ /^($NCName):\*$/o) { # ns:* + $step = XML::XPath::Step->new( + $self, $axis, + (($axis eq 'attribute') ? + XML::XPath::Step::test_attr_ncwild + : + XML::XPath::Step::test_ncwild), + $1); + } + elsif ($token =~ /^$QNWild$/o) { # * + $step = XML::XPath::Step->new( + $self, $axis, + (($axis eq 'attribute') ? + XML::XPath::Step::test_attr_any + : + XML::XPath::Step::test_any), + $token); + } + elsif ($token =~ /^$QName$/o) { # name:name + $step = XML::XPath::Step->new( + $self, $axis, + (($axis eq 'attribute') ? + XML::XPath::Step::test_attr_qname + : + XML::XPath::Step::test_qname), + $token); + } + elsif ($token eq 'comment()') { + $step = XML::XPath::Step->new( + $self, $axis, + XML::XPath::Step::test_nt_comment); + } + elsif ($token eq 'text()') { + $step = XML::XPath::Step->new( + $self, $axis, + XML::XPath::Step::test_nt_text); + } + elsif ($token eq 'node()') { + $step = XML::XPath::Step->new( + $self, $axis, + XML::XPath::Step::test_nt_node); + } + elsif ($token eq 'processing-instruction()') { + $step = XML::XPath::Step->new( + $self, $axis, XML::XPath::Step::test_nt_pi); + } + else { + die "Shouldn't get here"; + } } else { - die "Shouldn't get here"; + die "token $token doesn't match format of a 'Step'\n"; } } - else { - die "token $token doesn't match format of a 'Step'\n"; - } while (match($self, $tokens, '\\[')) { push @{$step->{predicates}}, Expr($self, $tokens); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/PerlSAX.pm new/XML-XPath-1.39/lib/XML/XPath/PerlSAX.pm --- old/XML-XPath-1.38/lib/XML/XPath/PerlSAX.pm 2016-10-29 20:54:49.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/PerlSAX.pm 2016-11-08 13:26:09.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::PerlSAX; -$VERSION = '1.38'; +$VERSION = '1.39'; use XML::XPath::Node qw(:node_keys); use XML::XPath::XMLParser; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Root.pm new/XML-XPath-1.39/lib/XML/XPath/Root.pm --- old/XML-XPath-1.38/lib/XML/XPath/Root.pm 2016-10-29 20:54:58.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Root.pm 2016-11-08 13:27:10.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Root; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; use XML::XPath::XMLParser; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Step.pm new/XML-XPath-1.39/lib/XML/XPath/Step.pm --- old/XML-XPath-1.38/lib/XML/XPath/Step.pm 2016-10-29 20:55:11.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Step.pm 2016-11-08 13:27:25.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Step; -$VERSION = '1.38'; +$VERSION = '1.39'; use XML::XPath::Parser; use XML::XPath::Node; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/Variable.pm new/XML-XPath-1.39/lib/XML/XPath/Variable.pm --- old/XML-XPath-1.38/lib/XML/XPath/Variable.pm 2016-10-29 20:55:20.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/Variable.pm 2016-11-08 13:27:33.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::Variable; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath/XMLParser.pm new/XML-XPath-1.39/lib/XML/XPath/XMLParser.pm --- old/XML-XPath-1.38/lib/XML/XPath/XMLParser.pm 2016-10-29 20:55:31.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath/XMLParser.pm 2016-11-08 13:27:54.000000000 +0100 @@ -1,6 +1,6 @@ package XML::XPath::XMLParser; -$VERSION = '1.38'; +$VERSION = '1.39'; use strict; use warnings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/XML-XPath-1.38/lib/XML/XPath.pm new/XML-XPath-1.39/lib/XML/XPath.pm --- old/XML-XPath-1.38/lib/XML/XPath.pm 2016-10-29 20:47:47.000000000 +0200 +++ new/XML-XPath-1.39/lib/XML/XPath.pm 2016-11-08 13:07:06.000000000 +0100 @@ -6,14 +6,14 @@ =head1 VERSION -Version 1.38 +Version 1.39 =cut use strict; use warnings; use vars qw($VERSION $AUTOLOAD $revision); -$VERSION = '1.38'; +$VERSION = '1.39'; $XML::XPath::Namespaces = 1; $XML::XPath::ParseParamEnt = 1; $XML::XPath::Debug = 0;
