r20457 - in /branches/upstream/libyaml-syck-perl/current: Changes SIGNATURE emitter.c lib/JSON/Syck.pm lib/YAML/Syck.pm perl_syck.h t/3-objects.t t/json-basic.t t/json-singlequote.t

yvesago-guest at users.alioth.debian.org yvesago-guest at users.alioth.debian.org
Tue May 27 19:17:25 UTC 2008


Author: yvesago-guest
Date: Tue May 27 19:17:25 2008
New Revision: 20457

URL: http://svn.debian.org/wsvn/?sc=1&rev=20457
Log:
[svn-upgrade] Integrating new upstream version, libyaml-syck-perl (1.04)

Modified:
    branches/upstream/libyaml-syck-perl/current/Changes
    branches/upstream/libyaml-syck-perl/current/SIGNATURE
    branches/upstream/libyaml-syck-perl/current/emitter.c
    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/perl_syck.h
    branches/upstream/libyaml-syck-perl/current/t/3-objects.t
    branches/upstream/libyaml-syck-perl/current/t/json-basic.t
    branches/upstream/libyaml-syck-perl/current/t/json-singlequote.t

Modified: branches/upstream/libyaml-syck-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/Changes?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/Changes (original)
+++ branches/upstream/libyaml-syck-perl/current/Changes Tue May 27 19:17:25 2008
@@ -1,3 +1,22 @@
+[Changes for 1.04 (JSON::Syck 0.29) - 2008-02-17]
+
+* The 'Name "YAML::Syck::ImplicitBinary" used only once: possible typo'
+  warnings no longer triggers in Perl 5.10 when running with perl -w.
+  Reported by: Jesse Vincent
+
+[Changes for 1.03 (JSON::Syck 0.29) - 2008-02-16]
+
+* JSON::Syck: When $JSON::Syck::SingleQuote is false, implicit booleans
+  such as "yes" and "no" should be dumped with double quotes, instead of
+  single quotes (which breaks RFC 4627).
+  Reported by: cho45
+
+[Changes for 1.02 (JSON::Syck 0.28) - 2008-02-16]
+
+* JSON::Syck: Colons in single-quoted strings are no longer loaded
+  with an extra space after it.
+  Reported by: Agent Zhang
+
 [Changes for 1.01 (JSON::Syck 0.27) - 2008-01-19]
 
 * JSON::XS is now promoted prominiently in JSON::Syck's documentation.

Modified: branches/upstream/libyaml-syck-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/SIGNATURE?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/SIGNATURE (original)
+++ branches/upstream/libyaml-syck-perl/current/SIGNATURE Tue May 27 19:17:25 2008
@@ -16,14 +16,14 @@
 
 SHA1 266b208fdc19cae4b9355a2cabd18c336d6e1997 COMPATIBILITY
 SHA1 3710975c0e6727079e17c6d1f27948c40729d710 COPYING
-SHA1 005117bd0038b74db9ae70749370fe5e97389c40 Changes
+SHA1 d7a0bbde3ca5e18492f71ef37ba8a840a3e36254 Changes
 SHA1 419410fc0a8856d06927b23e9306c086391b48a6 MANIFEST
 SHA1 a37e5e92a896d112eb4f26f90d57cf60a4858548 META.yml
 SHA1 daaefadfd003a303e85e31d8888c4b3951ec852b Makefile.PL
 SHA1 44486cfe5444a9f666ef60f093ab63603bb23d0e README
 SHA1 33c36d61607a784b206df02e9508c31649106d77 Syck.xs
 SHA1 e8f69df417217515647747d232d15520ac59f6cc bytecode.c
-SHA1 896495724536f6b55502d026298217f4b48f6d9e emitter.c
+SHA1 3ef81beab6d078384ed27a232e11c5c2edd33a6a emitter.c
 SHA1 e6426f94d8acb9d9e3159d8906e570b1e70d6eea gram.c
 SHA1 f4f2cc6ce84bd40f33a80d33d8881402f03ce75d gram.h
 SHA1 02bfa0b1b4a60af2a2f973631956e9602fd2f42e handler.c
@@ -42,13 +42,13 @@
 SHA1 6e95f0ebeb31abc5608a987e88edf2e2427912c4 inc/Test/Builder/Module.pm
 SHA1 1296aa4ac787d6df9f9679d2bae4851ffef63e5a inc/Test/More.pm
 SHA1 f8e70396a1f3e0b34668d08871d7519321995283 inc/attributes.pm
-SHA1 7bdca379342200beb6f6bed12d9ea659a41ad92a lib/JSON/Syck.pm
+SHA1 5665cec9b0ef01a34298904e84c0d906a513f51d lib/JSON/Syck.pm
 SHA1 2c2459b2b5cf94a7f9cd1905a242d7d01616ee0b lib/YAML/Dumper/Syck.pm
 SHA1 534000ebfb91c993f5344ae4e34185d853954e6f lib/YAML/Loader/Syck.pm
-SHA1 6296a35a32a1674940c241df44a9fa9e748119a7 lib/YAML/Syck.pm
+SHA1 85407b729f2d0ae5c8433cb007c45f34c42b0162 lib/YAML/Syck.pm
 SHA1 6cbfdd21b89093ca277b790660a92ba964519a7d node.c
 SHA1 af82db418593d376e80f7eb85f7eedb91bc5dd8e perl_common.h
-SHA1 a26c26336a23398dfcf85391aebcf5c5dc04e351 perl_syck.h
+SHA1 4f4852e5e976cc2b34a9474fba9120f8507e1326 perl_syck.h
 SHA1 489b224360d0c3f2428bed3d23798e56041257a4 ppport.h
 SHA1 9c9255d4d1a4b4ce5aa75ae4220df496cf8e4a44 ppport_math.h
 SHA1 604dd165210e0209bc5464e9793cdd22d9c6e3fd ppport_sort.h
@@ -60,10 +60,10 @@
 SHA1 cb6584c4bacab73b216754ffa52b13e67ad92a4d t/11-loadfile.t
 SHA1 1c1eac01406dc4dae5251c3a361f10d8f1c17787 t/12-dumpfile.t
 SHA1 21cfa8fd24bd77b290e94dbe62e25e26ad8beb9b t/2-scalars.t
-SHA1 577344db96b21dca5ff5a5fbf7e6b24537927f00 t/3-objects.t
+SHA1 9f3eba9efd8f85ff7396e9cf46a187dd654587c9 t/3-objects.t
 SHA1 3d204931ed3bec06971a56a07fd3952c19330ccb t/4-perl_tag_scheme.t
 SHA1 ca5354e0a76bd6ec804184c0a5ceec35b0ae782a t/TestYAML.pm
-SHA1 a477aea3af5e7c76c29f2b9f33996ec393cf021e t/json-basic.t
+SHA1 9725a5c5d62cc6b730a514bb2fe7fa46fe808db9 t/json-basic.t
 SHA1 02cbee738704ef9a8577be36d8c88efae849f92f t/json-circular-ref.t
 SHA1 b91ff631ee1812c31028abbf1dbbbf2d4a2ac41e t/json-crlf.t
 SHA1 f4aa3d499da1908b785ce8cf7312ba7c3982c122 t/json-empty.t
@@ -72,7 +72,7 @@
 SHA1 3dc96f9d89222f01a6138717698ca0b6214e4347 t/json-newline.t
 SHA1 23a780343e0a3ee7db38788639a19c69e5476bf2 t/json-null.t
 SHA1 70a819945e04b4b57aa7fd7bec54c909202b6618 t/json-refs.t
-SHA1 a2d8988827a06cc1b031f3682a44a0503a14e852 t/json-singlequote.t
+SHA1 3c729d8597211afbe7f36e960767a5e1d573a6d1 t/json-singlequote.t
 SHA1 d989749380ac7246395b89f55de17718ed14b82f t/leak.t
 SHA1 31df717d2ffca807f649634311fcbfe8846d9dd6 t/yaml-blessed-ref.t
 SHA1 128dee2bb3952494ed9322c185e8cdf35de1f8d4 t/yaml-implicit-warnings.t
@@ -81,7 +81,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (Darwin)
 
-iD8DBQFHkOZ8tLPdNzw1AaARAoJCAJ9uGx/iKVbQBOXzzKLLeYf943GxYwCfZpzd
-0kasUknqfimHCqD/TE8hpOw=
-=M2CF
+iD8DBQFHtwuHtLPdNzw1AaARAjgmAJ9X8W3jz6OuFbewLEpdLpRE3LiiSACfTQc8
+hon63uyZ9akmj2Pv/9ZRqQg=
+=zm2J
 -----END PGP SIGNATURE-----

Modified: branches/upstream/libyaml-syck-perl/current/emitter.c
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/emitter.c?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/emitter.c (original)
+++ branches/upstream/libyaml-syck-perl/current/emitter.c Tue May 27 19:17:25 2008
@@ -684,7 +684,7 @@
             &&
             (len > 0)
             ) {
-        force_style = scalar_1quote;
+        force_style = (force_style == scalar_2quote) ? scalar_2quote : scalar_1quote;
     } else {
         /* complex key -- disabled by Audrey Tang -/
         if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 &&

Modified: branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm (original)
+++ branches/upstream/libyaml-syck-perl/current/lib/JSON/Syck.pm Tue May 27 19:17:25 2008
@@ -5,7 +5,7 @@
 use YAML::Syck ();
 
 BEGIN {
-    $VERSION    = '0.27';
+    $VERSION    = '0.29';
     @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/branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm (original)
+++ branches/upstream/libyaml-syck-perl/current/lib/YAML/Syck.pm Tue May 27 19:17:25 2008
@@ -5,7 +5,7 @@
 use vars qw(
     @ISA @EXPORT $VERSION
     $Headless $SortKeys $SingleQuote
-    $ImplicitTyping $ImplicitUnicode 
+    $ImplicitBinary $ImplicitTyping $ImplicitUnicode 
     $UseCode $LoadCode $DumpCode
     $DeparseObject
 );
@@ -13,7 +13,7 @@
 use Exporter;
 
 BEGIN {
-    $VERSION = '1.01';
+    $VERSION = '1.04';
     @EXPORT  = qw( Dump Load DumpFile LoadFile );
     @ISA     = qw( Exporter );
 
@@ -139,7 +139,7 @@
 
 =head1 VERSION
 
-This document describes version 1.01 of YAML::Syck, released January 18, 2008.
+This document describes version 1.04 of YAML::Syck, released February 17, 2008.
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libyaml-syck-perl/current/perl_syck.h
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/perl_syck.h?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/perl_syck.h (original)
+++ branches/upstream/libyaml-syck-perl/current/perl_syck.h Tue May 27 19:17:25 2008
@@ -496,7 +496,7 @@
     int i;
     char *out;
     char ch;
-    bool in_string = 0;
+    char in_string = '\0';
     bool in_quote  = 0;
     char *pos;
     STRLEN len = strlen(s);
@@ -516,11 +516,16 @@
         else if (ch == '\\') {
             in_quote = 1;
         }
-        else if (ch == json_quote_char) {
-            in_string = !in_string;
-        }
-        else if ((ch == ':' || ch == ',') && !in_string) {
-            *pos++ = ' ';
+        else if (in_string == '\0') {
+            switch (ch) {
+                case ':':  { *pos++ = ' '; break; }
+                case ',':  { *pos++ = ' '; break; }
+                case '"':  { in_string = '"'; break; }
+                case '\'': { in_string = '\''; break; }
+            }
+        }
+        else if (ch == in_string) {
+            in_string = '\0';
         }
     }
 

Modified: branches/upstream/libyaml-syck-perl/current/t/3-objects.t
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/t/3-objects.t?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/t/3-objects.t (original)
+++ branches/upstream/libyaml-syck-perl/current/t/3-objects.t Tue May 27 19:17:25 2008
@@ -1,6 +1,4 @@
 use t::TestYAML tests => 29, (
-    ($] < 5.006) ? (todo => [18..20, 26..29])
-                 :
     ($] < 5.008) ? (todo => [19..20, 26..29])
                  : ()
 );

Modified: branches/upstream/libyaml-syck-perl/current/t/json-basic.t
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/t/json-basic.t?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/t/json-basic.t (original)
+++ branches/upstream/libyaml-syck-perl/current/t/json-basic.t Tue May 27 19:17:25 2008
@@ -4,7 +4,7 @@
 use Test::More;
 use JSON::Syck;
 
-our $HAS_JSON = 0;
+my $HAS_JSON = 0;
 BEGIN {
 unless (defined &utf8::encode) {
     plan skip_all => 'No Unicode support';

Modified: branches/upstream/libyaml-syck-perl/current/t/json-singlequote.t
URL: http://svn.debian.org/wsvn/branches/upstream/libyaml-syck-perl/current/t/json-singlequote.t?rev=20457&op=diff
==============================================================================
--- branches/upstream/libyaml-syck-perl/current/t/json-singlequote.t (original)
+++ branches/upstream/libyaml-syck-perl/current/t/json-singlequote.t Tue May 27 19:17:25 2008
@@ -2,7 +2,7 @@
 use warnings;
 
 use t::TestYAML ();
-use Test::More tests => 4;
+use Test::More tests => 5;
 use JSON::Syck;
 
 {
@@ -32,3 +32,12 @@
     $dump = JSON::Syck::Dump($thing);
     is(JSON::Syck::Load($dump), $thing);
 }
+
+{
+    my $url = 'http://www.pugscode.org';
+    my $var = JSON::Syck::Load(<<"_EOC_");
+    { url: '$url' }
+_EOC_
+
+    is $var->{url}, $url, "no extra space in the URL";
+}




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