r45593 - in /trunk/libjson-xs-perl: Changes MANIFEST META.json META.yml README XS.pm XS.xs debian/changelog debian/control debian/copyright t/01_utf8.t t/06_pc_pretty.t t/20_faihu.t t/21_evans.t
angelabad-guest at users.alioth.debian.org
angelabad-guest at users.alioth.debian.org
Sun Oct 11 22:41:10 UTC 2009
Author: angelabad-guest
Date: Sun Oct 11 22:41:04 2009
New Revision: 45593
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45593
Log:
New upstream 2.260
Added:
trunk/libjson-xs-perl/META.json
- copied unchanged from r45592, branches/upstream/libjson-xs-perl/2.23/META.json
trunk/libjson-xs-perl/t/20_faihu.t
- copied unchanged from r45592, branches/upstream/libjson-xs-perl/2.23/t/20_faihu.t
trunk/libjson-xs-perl/t/21_evans.t
- copied unchanged from r45592, branches/upstream/libjson-xs-perl/2.23/t/21_evans.t
Modified:
trunk/libjson-xs-perl/Changes
trunk/libjson-xs-perl/MANIFEST
trunk/libjson-xs-perl/META.yml
trunk/libjson-xs-perl/README
trunk/libjson-xs-perl/XS.pm
trunk/libjson-xs-perl/XS.xs
trunk/libjson-xs-perl/debian/changelog
trunk/libjson-xs-perl/debian/control
trunk/libjson-xs-perl/debian/copyright
trunk/libjson-xs-perl/t/01_utf8.t
trunk/libjson-xs-perl/t/06_pc_pretty.t
Modified: trunk/libjson-xs-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/Changes?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/Changes (original)
+++ trunk/libjson-xs-perl/Changes Sun Oct 11 22:41:04 2009
@@ -1,4 +1,10 @@
Revision history for Perl extension JSON::XS
+
+2.26 Sat Oct 10 03:26:19 CEST 2009
+ - big integers could become truncated (based on patch
+ by Strobl Anton).
+ - output format change: indent now adds a final newline, which is
+ more expected and more true to the documentation.
2.25 Sat Aug 8 12:04:41 CEST 2009
- the perl debugger completely breaks lvalue subs - try to work
Modified: trunk/libjson-xs-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/MANIFEST?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/MANIFEST (original)
+++ trunk/libjson-xs-perl/MANIFEST Sun Oct 11 22:41:04 2009
@@ -33,3 +33,4 @@
t/99_binary.t
typemap
META.yml Module meta-data (added by MakeMaker)
+META.json Module meta-data (added by MakeMaker)
Modified: trunk/libjson-xs-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/META.yml?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/META.yml (original)
+++ trunk/libjson-xs-perl/META.yml Sun Oct 11 22:41:04 2009
@@ -9,9 +9,9 @@
"version" : 1.4,
"url" : "http://module-build.sourceforge.net/META-spec-v1.4.html"
},
- "generated_by" : "ExtUtils::MakeMaker version 6.50",
+ "generated_by" : "ExtUtils::MakeMaker version 6.54",
"distribution_type" : "module",
- "version" : "2.25",
+ "version" : "2.26",
"name" : "JSON-XS",
"author" : [],
"license" : "unknown",
Modified: trunk/libjson-xs-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/README?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/README (original)
+++ trunk/libjson-xs-perl/README Sun Oct 11 22:41:04 2009
@@ -1155,10 +1155,10 @@
This will *usually* generate JSON texts that also parse as valid YAML.
Please note that YAML has hardcoded limits on (simple) object key
lengths that JSON doesn't have and also has different and incompatible
- unicode handling, so you should make sure that your hash keys are
- noticeably shorter than the 1024 "stream characters" YAML allows and
- that you do not have characters with codepoint values outside the
- Unicode BMP (basic multilingual page). YAML also does not allow "\/"
+ unicode character escape syntax, so you should make sure that your hash
+ keys are noticeably shorter than the 1024 "stream characters" YAML
+ allows and that you do not have characters with codepoint values outside
+ the Unicode BMP (basic multilingual page). YAML also does not allow "\/"
sequences in strings (which JSON::XS does not *currently* generate, but
other JSON generators might).
@@ -1184,6 +1184,12 @@
compatible to it, and educating users about the changes, instead of
spreading lies about the real compatibility for many *years* and
trying to silence people who point out that it isn't true.
+
+ Addendum/2009: the YAML 1.2 spec is still incomaptible with JSON,
+ even though the incompatibilities have been documented (and are
+ known to Brian) for many years and the spec makes explicit claims
+ that YAML is a superset of JSON. It would be so easy to fix, but
+ apparently, bullying and corrupting userdata is so much easier.
SPEED
It seems that JSON::XS is surprisingly fast, as shown in the following
Modified: trunk/libjson-xs-perl/XS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/XS.pm?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/XS.pm (original)
+++ trunk/libjson-xs-perl/XS.pm Sun Oct 11 22:41:04 2009
@@ -103,7 +103,7 @@
use common::sense;
-our $VERSION = '2.25';
+our $VERSION = '2.26';
our @ISA = qw(Exporter);
our @EXPORT = qw(encode_json decode_json to_json from_json);
@@ -1270,12 +1270,12 @@
This will I<usually> generate JSON texts that also parse as valid
YAML. Please note that YAML has hardcoded limits on (simple) object key
lengths that JSON doesn't have and also has different and incompatible
-unicode handling, so you should make sure that your hash keys are
-noticeably shorter than the 1024 "stream characters" YAML allows and that
-you do not have characters with codepoint values outside the Unicode BMP
-(basic multilingual page). YAML also does not allow C<\/> sequences in
-strings (which JSON::XS does not I<currently> generate, but other JSON
-generators might).
+unicode character escape syntax, so you should make sure that your hash
+keys are noticeably shorter than the 1024 "stream characters" YAML allows
+and that you do not have characters with codepoint values outside the
+Unicode BMP (basic multilingual page). YAML also does not allow C<\/>
+sequences in strings (which JSON::XS does not I<currently> generate, but
+other JSON generators might).
There might be other incompatibilities that I am not aware of (or the YAML
specification has been changed yet again - it does so quite often). In
@@ -1303,6 +1303,12 @@
educating users about the changes, instead of spreading lies about the
real compatibility for many I<years> and trying to silence people who
point out that it isn't true.
+
+Addendum/2009: the YAML 1.2 spec is still incomaptible with JSON, even
+though the incompatibilities have been documented (and are known to
+Brian) for many years and the spec makes explicit claims that YAML is a
+superset of JSON. It would be so easy to fix, but apparently, bullying and
+corrupting userdata is so much easier.
=back
Modified: trunk/libjson-xs-perl/XS.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/XS.xs?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/XS.xs (original)
+++ trunk/libjson-xs-perl/XS.xs Sun Oct 11 22:41:04 2009
@@ -19,7 +19,8 @@
# define UTF8_MAXBYTES 13
#endif
-#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 2)
+// three extra for rounding, sign, and end of string
+#define IVUV_MAXCHARS (sizeof (UV) * CHAR_BIT * 28 / 93 + 3)
#define F_ASCII 0x00000001UL
#define F_LATIN1 0x00000002UL
@@ -761,6 +762,7 @@
SvPOK_only (enc.sv);
encode_sv (&enc, scalar);
+ encode_nl (&enc);
SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
*SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
@@ -950,11 +952,10 @@
else if (ch >= 0x80)
{
STRLEN clen;
- UV uch;
--dec_cur;
- uch = decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
+ decode_utf8 (dec_cur, dec->end - dec_cur, &clen);
if (clen == (STRLEN)-1)
ERR ("malformed UTF-8 character in JSON string");
Modified: trunk/libjson-xs-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/debian/changelog?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/debian/changelog (original)
+++ trunk/libjson-xs-perl/debian/changelog Sun Oct 11 22:41:04 2009
@@ -1,8 +1,15 @@
-libjson-xs-perl (2.250-2) UNRELEASED; urgency=low
+libjson-xs-perl (2.260-1) unstable; urgency=low
+ [ Ryan Niebur ]
* Update ryan52's email address
- -- Ryan Niebur <ryan at debian.org> Fri, 25 Sep 2009 00:25:17 -0700
+ [ Angel Abad (Ikusnet SLL) ]
+ * New upstream release
+ * debian/control: Changed: Replace versioned (build-)dependency on
+ perl (>= 5.6.0-{12,16}) with an unversioned dependency on perl (as
+ permitted by Debian Policy 3.8.3).
+
+ -- Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com> Mon, 12 Oct 2009 00:33:59 +0200
libjson-xs-perl (2.250-1) unstable; urgency=low
Modified: trunk/libjson-xs-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/debian/control?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/debian/control (original)
+++ trunk/libjson-xs-perl/debian/control Sun Oct 11 22:41:04 2009
@@ -1,12 +1,12 @@
Source: libjson-xs-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7.0.50), perl (>= 5.8.8), libcommon-sense-perl
+Build-Depends: debhelper (>= 7.0.50), libcommon-sense-perl, perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com>,
- Ivan Kohler <ivan-debian at 420.am>,
- Niko Tyni <ntyni at debian.org>, gregor herrmann <gregoa at debian.org>,
- Ansgar Burchardt <ansgar at 43-1.org>, Ryan Niebur <ryan at debian.org>
+ Ivan Kohler <ivan-debian at 420.am>, Niko Tyni <ntyni at debian.org>,
+ gregor herrmann <gregoa at debian.org>, Ansgar Burchardt <ansgar at 43-1.org>,
+ Ryan Niebur <ryan at debian.org>
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libjson-xs-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libjson-xs-perl/
@@ -14,7 +14,8 @@
Package: libjson-xs-perl
Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, libcommon-sense-perl
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
+ libcommon-sense-perl
Description: Perl module for JSON serialising/deserialising
This module converts Perl data structures to JSON and vice versa. Its
primary goal is to be correct and its secondary goal is to be
Modified: trunk/libjson-xs-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/debian/copyright?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/debian/copyright (original)
+++ trunk/libjson-xs-perl/debian/copyright Sun Oct 11 22:41:04 2009
@@ -1,29 +1,32 @@
Format-Specification:
http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
Upstream-Maintainer: Marc Lehmann <schmorp at schmorp.de>
-Upstream-Source: http://search.cpan.org/dist/JSON-XS
+Upstream-Source: http://search.cpan.org/dist/JSON-XS/
Upstream-Name: JSON-XS
Files: *
-Copyright: Copyright 2007-2008, Marc Lehmann <schmorp at schmorp.de>
+Copyright: 2007-2009, Marc Lehmann <schmorp at schmorp.de>
License-Alias: Perl
License: Artistic | GPL-1+
Files: debian/*
-Copyright: Copyright 2007, Ivan Kohler <ivan-debian at 420.am>
- Copyright 2008, Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com>
-License-Alias: Perl
+Copyright: 2007, Ivan Kohler <ivan-debian at 420.am>
+ 2008, 2009, Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com>
+ 2008, Niko Tyni <ntyni at debian.org>
+ 2008, gregor herrmann <gregoa at debian.org>
+ 2009, Ansgar Burchardt <ansgar at 43-1.org>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
License: Artistic | GPL-1+
License: Artistic
This program is free software; you can redistribute it and/or modify
it under the terms of the Artistic License, which comes with Perl.
On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in /usr/share/common-licenses/Artistic
+ can be found in `/usr/share/common-licenses/Artistic'
License: GPL-1+
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
+ it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 1, or (at your option)
any later version.
On Debian GNU/Linux systems, the complete text of the GNU General
Modified: trunk/libjson-xs-perl/t/01_utf8.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/t/01_utf8.t?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/t/01_utf8.t (original)
+++ trunk/libjson-xs-perl/t/01_utf8.t Sun Oct 11 22:41:04 2009
@@ -11,7 +11,7 @@
ok (JSON::XS->new->allow_nonref (1)->utf8 (1)->encode ("ü") eq "\"\xc3\xbc\"");
ok (JSON::XS->new->allow_nonref (1)->encode ("ü") eq "\"ü\"");
ok (JSON::XS->new->allow_nonref (1)->ascii (1)->utf8 (1)->encode (chr 0x8000) eq '"\u8000"');
-ok (JSON::XS->new->allow_nonref (1)->ascii (1)->utf8 (1)->pretty (1)->encode (chr 0x10402) eq '"\ud801\udc02"');
+ok (JSON::XS->new->allow_nonref (1)->ascii (1)->utf8 (1)->pretty (1)->encode (chr 0x10402) eq "\"\\ud801\\udc02\"\n");
eval { JSON::XS->new->allow_nonref (1)->utf8 (1)->decode ('"ü"') };
ok $@ =~ /malformed UTF-8/;
Modified: trunk/libjson-xs-perl/t/06_pc_pretty.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/t/06_pc_pretty.t?rev=45593&op=diff
==============================================================================
--- trunk/libjson-xs-perl/t/06_pc_pretty.t (original)
+++ trunk/libjson-xs-perl/t/06_pc_pretty.t Sun Oct 11 22:41:04 2009
@@ -24,7 +24,8 @@
{
"foo" : "bar"
}
-]|);
+]
+|);
$obj = { foo => [ {a=>"b"}, 0, 1, 2 ] };
$pc->pretty(0);
@@ -44,7 +45,8 @@
1,
2
]
-}|);
+}
+|);
$obj = { foo => [ {a=>"b"}, 0, 1, 2 ] };
$pc->pretty(0);
@@ -54,11 +56,11 @@
$obj = {foo => "bar"};
$pc->indent(1);
-is($pc->encode($obj), qq|{\n "foo":"bar"\n}|, "nospace");
+is($pc->encode($obj), qq|{\n "foo":"bar"\n}\n|, "nospace");
$pc->space_after(1);
-is($pc->encode($obj), qq|{\n "foo": "bar"\n}|, "after");
+is($pc->encode($obj), qq|{\n "foo": "bar"\n}\n|, "after");
$pc->space_before(1);
-is($pc->encode($obj), qq|{\n "foo" : "bar"\n}|, "both");
+is($pc->encode($obj), qq|{\n "foo" : "bar"\n}\n|, "both");
$pc->space_after(0);
-is($pc->encode($obj), qq|{\n "foo" :"bar"\n}|, "before");
+is($pc->encode($obj), qq|{\n "foo" :"bar"\n}\n|, "before");
More information about the Pkg-perl-cvs-commits
mailing list