r42380 - in /branches/upstream/libxml-parser-lite-tree-perl/current: MANIFEST META.yml lib/XML/Parser/Lite/Tree.pm lib/XML/Parser/LiteCopy.pm t/06_attributes.t t/07_stack.t

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Fri Aug 21 23:09:23 UTC 2009


Author: jawnsy-guest
Date: Fri Aug 21 23:09:17 2009
New Revision: 42380

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=42380
Log:
[svn-upgrade] Integrating new upstream version, libxml-parser-lite-tree-perl (0.11)

Added:
    branches/upstream/libxml-parser-lite-tree-perl/current/t/06_attributes.t
    branches/upstream/libxml-parser-lite-tree-perl/current/t/07_stack.t
Modified:
    branches/upstream/libxml-parser-lite-tree-perl/current/MANIFEST
    branches/upstream/libxml-parser-lite-tree-perl/current/META.yml
    branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/Lite/Tree.pm
    branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/LiteCopy.pm

Modified: branches/upstream/libxml-parser-lite-tree-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-parser-lite-tree-perl/current/MANIFEST?rev=42380&op=diff
==============================================================================
--- branches/upstream/libxml-parser-lite-tree-perl/current/MANIFEST (original)
+++ branches/upstream/libxml-parser-lite-tree-perl/current/MANIFEST Fri Aug 21 23:09:17 2009
@@ -6,6 +6,8 @@
 t/03_comments.t
 t/04_processing_instructions.t
 t/05_doctypes.t
+t/06_attributes.t
+t/07_stack.t
 lib/XML/Parser/LiteCopy.pm
 lib/XML/Parser/Lite/Tree.pm
 META.yml                                 Module meta-data (added by MakeMaker)

Modified: branches/upstream/libxml-parser-lite-tree-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-parser-lite-tree-perl/current/META.yml?rev=42380&op=diff
==============================================================================
--- branches/upstream/libxml-parser-lite-tree-perl/current/META.yml (original)
+++ branches/upstream/libxml-parser-lite-tree-perl/current/META.yml Fri Aug 21 23:09:17 2009
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         XML-Parser-Lite-Tree
-version:      0.09
+version:      0.11
 version_from: lib/XML/Parser/Lite/Tree.pm
 installdirs:  site
 requires:

Modified: branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/Lite/Tree.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/Lite/Tree.pm?rev=42380&op=diff
==============================================================================
--- branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/Lite/Tree.pm (original)
+++ branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/Lite/Tree.pm Fri Aug 21 23:09:17 2009
@@ -5,7 +5,7 @@
 use warnings;
 use XML::Parser::LiteCopy;
 
-our $VERSION = '0.09';
+our $VERSION = '0.11';
 
 use vars qw( $parser );
 
@@ -80,6 +80,7 @@
 
 	push @{$self->{tag_stack}->[-1]->{children}}, $new_tag;
 	push @{$self->{tag_stack}}, $new_tag;
+	1;
 }
 
 sub _do_char {
@@ -95,12 +96,14 @@
 
 		push @{$self->{tag_stack}->[-1]->{children}}, $new_tag;
 	}
+	1;
 }
 
 sub _end_tag {
 	my $self = shift;
 
 	pop @{$self->{tag_stack}};
+	1;
 }
 
 sub _do_comment {
@@ -116,6 +119,7 @@
 
 		push @{$self->{tag_stack}->[-1]->{children}}, $new_tag;
 	}
+	1;
 }
 
 sub _do_xmldecl {
@@ -126,6 +130,7 @@
 		'type' => 'pi',
 		'content' => shift,
 	};
+	1;
 }
 
 sub _do_doctype {
@@ -136,6 +141,7 @@
 		'type' => 'dtd',
 		'content' => shift,
 	};
+	1;
 }
 
 sub mark_namespaces {

Modified: branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/LiteCopy.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/LiteCopy.pm?rev=42380&op=diff
==============================================================================
--- branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/LiteCopy.pm (original)
+++ branches/upstream/libxml-parser-lite-tree-perl/current/lib/XML/Parser/LiteCopy.pm Fri Aug 21 23:09:17 2009
@@ -108,7 +108,7 @@
     my $ElemTagCE = "($Name)"
         . "(?:$S($Name)(?:$S)?=(?:$S)?(?:$AttValSE)"
         . "(?{[\@{\$^R||[]},\$8=>defined\$9?\$9:\$10]}))*(?:$S)?(/)?>"
-        . "(?{${package}::_start(\$7,\@{\$^R||[]})})(?{\$11 and ${package}::_end(\$7)})";
+        . "(?{${package}::_start(\$7,\@{\$^R||[]}),\$^R=[]})(?{\$11 and ${package}::_end(\$7)})";
 
     my $MarkupSPE = "<(?:!(?:$DeclCE)?|\\?(?:$PI_CE)?|/(?:$EndTagCE)?|(?:$ElemTagCE)?)";
 

Added: branches/upstream/libxml-parser-lite-tree-perl/current/t/06_attributes.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-parser-lite-tree-perl/current/t/06_attributes.t?rev=42380&op=file
==============================================================================
--- branches/upstream/libxml-parser-lite-tree-perl/current/t/06_attributes.t (added)
+++ branches/upstream/libxml-parser-lite-tree-perl/current/t/06_attributes.t Fri Aug 21 23:09:17 2009
@@ -1,0 +1,32 @@
+use Test::More tests => 11;
+
+#
+# this tests a bug present in 0.10 on perl 5.8.9 only which
+# caused attributes to be copied from one node into the next
+#
+
+use XML::Parser::Lite::Tree;
+my $x = XML::Parser::Lite::Tree->instance();
+
+my $tree = $x->parse('<foo><bar id="a" /><bar a="1" b="2" /><baz /></foo>');
+
+# has a root element called 'foo' with 3 children
+is($tree->{children}->[0]->{name}, "foo");
+is(scalar @{$tree->{children}->[0]->{children}}, 3);
+
+# children are called bar, bar, baz
+is($tree->{children}->[0]->{children}->[0]->{name}, "bar");
+is($tree->{children}->[0]->{children}->[1]->{name}, "bar");
+is($tree->{children}->[0]->{children}->[2]->{name}, "baz");
+
+# first child has a single attribute (id="a")
+is(scalar keys %{$tree->{children}->[0]->{children}->[0]->{attributes}}, 1);
+is($tree->{children}->[0]->{children}->[0]->{attributes}->{id}, "a");
+
+# second child has 2 attributes (a=1, b=2)
+is(scalar keys %{$tree->{children}->[0]->{children}->[1]->{attributes}}, 2);
+is($tree->{children}->[0]->{children}->[1]->{attributes}->{a}, "1");
+is($tree->{children}->[0]->{children}->[1]->{attributes}->{b}, "2");
+
+# third child has no attributes
+is(scalar keys %{$tree->{children}->[0]->{children}->[2]->{attributes}}, 0);

Added: branches/upstream/libxml-parser-lite-tree-perl/current/t/07_stack.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-parser-lite-tree-perl/current/t/07_stack.t?rev=42380&op=file
==============================================================================
--- branches/upstream/libxml-parser-lite-tree-perl/current/t/07_stack.t (added)
+++ branches/upstream/libxml-parser-lite-tree-perl/current/t/07_stack.t Fri Aug 21 23:09:17 2009
@@ -1,0 +1,16 @@
+use Test::More tests => 2;
+
+#
+# this tests a bug present in 0.09 on perl 5.10 only which
+# cuased the parse stack to become undefined during the
+# parse.
+#
+
+use XML::Parser::Lite::Tree;
+my $x = XML::Parser::Lite::Tree->instance();
+
+my $tree = $x->parse('<aaa id="a1"><bbb id="b1" /><ccc id="c1" /><bbb id="b2" /><ddd><bbb id="b3" /></ddd><ccc id="c2" /></aaa>');
+
+# has a root element called 'aaa' with 5 children
+is($tree->{children}->[0]->{name}, "aaa");
+is(scalar @{$tree->{children}->[0]->{children}}, 5);




More information about the Pkg-perl-cvs-commits mailing list