r63113 - in /branches/upstream/libyaml-syck-perl/current: Changes META.yml lib/JSON/Syck.pm lib/YAML/Syck.pm t/3-objects.t

[angelabad-guest at users.alioth.debian.org]

Author: angelabad-guest
Date: Thu Sep 30 19:06:31 2010
New Revision: 63113

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63113
Log:
[svn-upgrade] new version libyaml-syck-perl (1.15)

Modified:
    branches/upstream/libyaml-syck-perl/current/Changes
    branches/upstream/libyaml-syck-perl/current/META.yml
    branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm
    branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm
    branches/upstream/libyaml-syck-perl/current/t/3-objects.t

Modified: branches/upstream/libyaml-syck-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libyaml-syck-perl/current/Changes?rev=63113&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/Changes (original)
+++ branches/upstream/libyaml-syck-perl/current/Changes Thu Sep 30 19:06:31 2010
@@ -1,3 +1,12 @@
+[Changes for 1.15 (YAML::Syck 0.38 ) - 2010-09-23]
+
+* perl RT #78008 - The 5.13.5 development release of perl changed how
+  regexes are stringified, breaking our tests. Update the tests to
+  deal with the new syntax.
+
+  See fb85c04 (http://perl5.git.perl.org/perl.git/commit/fb85c04) in
+  perl.git for context.
+
 [Changes for 1.14 (YAML::Syck 0.37 ) - 2010-08-03]
 * RT RT60771 - Further refactor for JSON. if a number is a valid
   perl string, quote it. "1" + "1" = "11" in javascript.

Modified: branches/upstream/libyaml-syck-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libyaml-syck-perl/current/META.yml?rev=63113&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/META.yml (original)
+++ branches/upstream/libyaml-syck-perl/current/META.yml Thu Sep 30 19:06:31 2010
@@ -25,4 +25,4 @@
   homepage: http://search.cpan.org/dist/YAML-Syck
   license: http://opensource.org/licenses/mit-license.php
   repository: http://github.com/avar/YAML-Syck
-version: 1.14
+version: 1.15

Modified: branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm?rev=63113&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm (original)
+++ branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm Thu Sep 30 19:06:31 2010
@@ -5,7 +5,7 @@
 use YAML::Syck ();
 
 BEGIN {
-    $VERSION    = '0.37';
+    $VERSION    = '0.38';
     @EXPORT_OK  = qw( Load Dump LoadFile DumpFile );
     @ISA        = 'Exporter';
     *Load       = \&YAML::Syck::LoadJSON;

Modified: branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm?rev=63113&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm (original)
+++ branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm Thu Sep 30 19:06:31 2010
@@ -13,7 +13,7 @@
 use Exporter;
 
 BEGIN {
-    $VERSION = '1.14';
+    $VERSION = '1.15';
     @EXPORT  = qw( Dump Load DumpFile LoadFile );
     @ISA     = qw( Exporter );
 

Modified: branches/upstream/libyaml-syck-perl/current/t/3-objects.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libyaml-syck-perl/current/t/3-objects.t?rev=63113&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/t/3-objects.t (original)
+++ branches/upstream/libyaml-syck-perl/current/t/3-objects.t Thu Sep 30 19:06:31 2010
@@ -1,4 +1,4 @@
-use t::TestYAML tests => 47, (
+use t::TestYAML tests => 48, (
     ($] < 5.008) ? (todo => [19..20, 26..29])
                  : ()
 );
@@ -28,15 +28,32 @@
     !ruby/object:Test::Bear ruby::object:Test::Bear
 ));
 
+
+# perl 5.13.5 and later has fb85c04, which changed the regex
+# stringification syntax. This is also valid.
+use constant REGEX_CARET => qr// =~ /\Q(?^\E/;
+
 my $rx = qr/123/;
-is(Dump($rx), "--- !!perl/regexp (?-xism:123)\n");
-is(Dump(Load(Dump($rx))), "--- !!perl/regexp (?-xism:123)\n");
+if (REGEX_CARET) {
+    ok(1, "Testing regexes with the >=5.13.5 caret syntax");
+    is(Dump($rx), "--- !!perl/regexp (?^:123)\n");
+    is(Dump(Load(Dump($rx))), "--- !!perl/regexp (?^:(?^:123))\n");
+} else {
+    ok(1, "Testing regexes with the old <5.13.5 syntax");
+    is(Dump($rx), "--- !!perl/regexp (?-xism:123)\n");
+    is(Dump(Load(Dump($rx))), "--- !!perl/regexp (?-xism:123)\n");
+}
 
 SKIP: {
     Test::More::skip "5.6 doesn't support printing regexes", 2 if($] < 5.007);
     my $rx_obj = bless qr/123/i => 'Foo';
-    is(Dump($rx_obj), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
-    is(Dump(Load(Dump($rx_obj))), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
+    if (REGEX_CARET) {
+        is(Dump($rx_obj), "--- !!perl/regexp:Foo (?^i:123)\n");
+        is(Dump(Load(Dump($rx_obj))), "--- !!perl/regexp:Foo (?^:(?^i:123))\n");
+    } else {
+        is(Dump($rx_obj), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
+        is(Dump(Load(Dump($rx_obj))), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
+    }
 }
 
 my $obj = bless(\(my $undef) => 'Foo');