r50462 - in /trunk/libjson-xs-perl: Changes MANIFEST META.json META.yml XS.pm XS.xs debian/changelog debian/control debian/copyright debian/libjson-xs-perl.examples debian/rules t/20_faihu.t t/21_evans.t t/22_comment_at_eof.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Thu Jan 7 16:33:18 UTC 2010
Author: jawnsy-guest
Date: Thu Jan 7 16:33:02 2010
New Revision: 50462
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50462
Log:
* New upstream release
* Update copyright information to DEP5 format
* Add myself to Uploaders and Copyright
* Rewrite control description
* Install examples in eg/
* Add override to fix shebang in example script
Added:
trunk/libjson-xs-perl/META.json
- copied unchanged from r50459, branches/upstream/libjson-xs-perl/current/META.json
trunk/libjson-xs-perl/debian/libjson-xs-perl.examples
trunk/libjson-xs-perl/t/20_faihu.t
- copied unchanged from r50459, branches/upstream/libjson-xs-perl/current/t/20_faihu.t
trunk/libjson-xs-perl/t/21_evans.t
- copied unchanged from r50459, branches/upstream/libjson-xs-perl/current/t/21_evans.t
trunk/libjson-xs-perl/t/22_comment_at_eof.t
- copied unchanged from r50459, branches/upstream/libjson-xs-perl/current/t/22_comment_at_eof.t
Modified:
trunk/libjson-xs-perl/Changes
trunk/libjson-xs-perl/MANIFEST
trunk/libjson-xs-perl/META.yml
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/debian/rules
Modified: trunk/libjson-xs-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/Changes?rev=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/Changes (original)
+++ trunk/libjson-xs-perl/Changes Thu Jan 7 16:33:02 2010
@@ -1,4 +1,8 @@
Revision history for Perl extension JSON::XS
+
+2.27 Thu Jan 7 07:35:08 CET 2010
+ - support relaxed option inside the incremental parser
+ (testcase provided by IKEGAMI via Makamaka).
2.26 Sat Oct 10 03:26:19 CEST 2009
- big integers could become truncated (based on patch
Modified: trunk/libjson-xs-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/MANIFEST?rev=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/MANIFEST (original)
+++ trunk/libjson-xs-perl/MANIFEST Thu Jan 7 16:33:02 2010
@@ -30,6 +30,7 @@
t/19_incr.t
t/20_faihu.t
t/21_evans.t
+t/22_comment_at_eof.t
t/99_binary.t
typemap
META.yml 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=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/META.yml (original)
+++ trunk/libjson-xs-perl/META.yml Thu Jan 7 16:33:02 2010
@@ -11,7 +11,7 @@
},
"generated_by" : "ExtUtils::MakeMaker version 6.54",
"distribution_type" : "module",
- "version" : "2.26",
+ "version" : "2.27",
"name" : "JSON-XS",
"author" : [],
"license" : "unknown",
Modified: trunk/libjson-xs-perl/XS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/XS.pm?rev=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/XS.pm (original)
+++ trunk/libjson-xs-perl/XS.pm Thu Jan 7 16:33:02 2010
@@ -103,7 +103,7 @@
use common::sense;
-our $VERSION = '2.26';
+our $VERSION = '2.27';
our @ISA = qw(Exporter);
our @EXPORT = qw(encode_json decode_json to_json from_json);
Modified: trunk/libjson-xs-perl/XS.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/XS.xs?rev=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/XS.xs (original)
+++ trunk/libjson-xs-perl/XS.xs Thu Jan 7 16:33:02 2010
@@ -79,6 +79,8 @@
INCR_M_WS = 0, // initial whitespace skipping, must be 0
INCR_M_STR, // inside string
INCR_M_BS, // inside backslash
+ INCR_M_C0, // inside comment in initial whitespace sequence
+ INCR_M_C1, // inside comment in other places
INCR_M_JSON // outside anything, count nesting
};
@@ -1528,19 +1530,30 @@
{
const char *p = SvPVX (self->incr_text) + self->incr_pos;
+ // the state machine here is a bit convoluted and could be simplified a lot
+ // but this would make it slower, so...
+
for (;;)
{
//printf ("loop pod %d *p<%c><%s>, mode %d nest %d\n", p - SvPVX (self->incr_text), *p, p, self->incr_mode, self->incr_nest);//D
switch (self->incr_mode)
{
- // only used for intiial whitespace skipping
+ // only used for initial whitespace skipping
case INCR_M_WS:
for (;;)
{
if (*p > 0x20)
{
- self->incr_mode = INCR_M_JSON;
- goto incr_m_json;
+ if (*p == '#')
+ {
+ self->incr_mode = INCR_M_C0;
+ goto incr_m_c;
+ }
+ else
+ {
+ self->incr_mode = INCR_M_JSON;
+ goto incr_m_json;
+ }
}
else if (!*p)
goto interrupt;
@@ -1556,6 +1569,25 @@
++p;
self->incr_mode = INCR_M_STR;
goto incr_m_str;
+
+ // inside #-style comments
+ case INCR_M_C0:
+ case INCR_M_C1:
+ incr_m_c:
+ for (;;)
+ {
+ if (*p == '\n')
+ {
+ self->incr_mode = self->incr_mode == INCR_M_C0 ? INCR_M_WS : INCR_M_JSON;
+ break;
+ }
+ else if (!*p)
+ goto interrupt;
+
+ ++p;
+ }
+
+ break;
// inside a string
case INCR_M_STR:
@@ -1624,6 +1656,11 @@
case '}':
if (--self->incr_nest <= 0)
goto interrupt;
+ break;
+
+ case '#':
+ self->incr_mode = INCR_M_C1;
+ goto incr_m_c;
}
}
}
@@ -1634,6 +1671,7 @@
interrupt:
self->incr_pos = p - SvPVX (self->incr_text);
+ //printf ("interrupt<%.*s>\n", self->incr_pos, SvPVX(self->incr_text));//D
//printf ("return pos %d mode %d nest %d\n", self->incr_pos, self->incr_mode, self->incr_nest);//D
}
Modified: trunk/libjson-xs-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/debian/changelog?rev=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/debian/changelog (original)
+++ trunk/libjson-xs-perl/debian/changelog Thu Jan 7 16:33:02 2010
@@ -1,8 +1,17 @@
-libjson-xs-perl (2.260-2) UNRELEASED; urgency=low
+libjson-xs-perl (2.270-1) UNRELEASED; urgency=low
+ [ Jonathan Yu ]
+ * New upstream release
+ * Update copyright information to DEP5 format
+ * Add myself to Uploaders and Copyright
+ * Rewrite control description
+ * Install examples in eg/
+ * Add override to fix shebang in example script
+
+ [ Angel Abad ]
* Update my email address
- -- Angel Abad <angelabad at gmail.com> Sun, 18 Oct 2009 02:13:42 +0200
+ -- Jonathan Yu <jawnsy at cpan.org> Thu, 07 Jan 2010 11:24:08 -0500
libjson-xs-perl (2.260-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=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/debian/control (original)
+++ trunk/libjson-xs-perl/debian/control Thu Jan 7 16:33:02 2010
@@ -1,9 +1,9 @@
Source: libjson-xs-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7.0.50), libcommon-sense-perl, perl
+Build-Depends: debhelper (>= 7.0.50), perl, libcommon-sense-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Angel Abad <angelabad at gmail.com>,
+Uploaders: Angel Abad <angelabad at gmail.com>, Jonathan Yu <jawnsy at cpan.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>
@@ -16,15 +16,13 @@
Architecture: any
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
- fast. To reach the latter goal it was written in C.
+Description: module for serializing/deserializing JSON
+ JSON::XS is a Perl module for converting arbitrary Perl data structures to
+ JSON and vice versa. Its primary objectives are to be semantically correct
+ and to run quickly; for the latter goal, the implementation is written in C.
.
- Beginning with version 2.0 of the JSON module, when both JSON and
- JSON::XS are installed, then JSON will fall back on JSON::XS (this can be
- overridden) with no overhead due to emulation (by inheriting constructor
- and methods). If JSON::XS is not available, it will fall back to the
- compatible JSON::PP module as backend, so using JSON instead of JSON::XS
- gives you a portable JSON API that can be fast when you need and doesn't
- require a C compiler when that is a problem.
+ From JSON version 2.0 onward, the JSON module will use JSON::XS to accelerate
+ its work, with no overhead due to emulation (by inheriting the constructor
+ and methods). Using JSON instead of JSON::XS gives you a portable JSON API
+ that can be fast when needed, but doesn't require a C compiler by falling
+ back on a Pure Perl implementation.
Modified: trunk/libjson-xs-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/debian/copyright?rev=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/debian/copyright (original)
+++ trunk/libjson-xs-perl/debian/copyright Thu Jan 7 16:33:02 2010
@@ -1,33 +1,34 @@
-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-Name: JSON-XS
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Maintainer: Marc Lehmann <schmorp at schmorp.de>
+Source: http://search.cpan.org/dist/JSON-XS/
+Name: JSON-XS
Files: *
Copyright: 2007-2009, Marc Lehmann <schmorp at schmorp.de>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
Files: debian/*
-Copyright: 2007, Ivan Kohler <ivan-debian at 420.am>
- 2008, 2009, Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com>
+Copyright: 2010, Jonathan Yu <jawnsy at cpan.org>
+ 2008-2009, Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com>
+ 2009, Ansgar Burchardt <ansgar at 43-1.org>
+ 2009, Ryan Niebur <ryanryan52 at gmail.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+
+ 2007, Ivan Kohler <ivan-debian at 420.am>
+License: Artistic or 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'
+ 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'
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
- 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
- Public License can be found in `/usr/share/common-licenses/GPL'
+ 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
+ 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
+ Public License can be found in `/usr/share/common-licenses/GPL'
Added: trunk/libjson-xs-perl/debian/libjson-xs-perl.examples
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/debian/libjson-xs-perl.examples?rev=50462&op=file
==============================================================================
--- trunk/libjson-xs-perl/debian/libjson-xs-perl.examples (added)
+++ trunk/libjson-xs-perl/debian/libjson-xs-perl.examples Thu Jan 7 16:33:02 2010
@@ -1,0 +1,1 @@
+eg/*
Modified: trunk/libjson-xs-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-xs-perl/debian/rules?rev=50462&op=diff
==============================================================================
--- trunk/libjson-xs-perl/debian/rules (original)
+++ trunk/libjson-xs-perl/debian/rules Thu Jan 7 16:33:02 2010
@@ -1,20 +1,27 @@
#!/usr/bin/make -f
+
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
+ CFLAGS += -O0
else
- ifeq (sparc,$(DEB_HOST_ARCH))
- CFLAGS+="-O1"
- else
- CFLAGS+="-O2"
- endif
+ ifeq (sparc,$(DEB_HOST_ARCH))
+ CFLAGS+="-O1"
+ else
+ CFLAGS+="-O2"
+ endif
endif
+
+%:
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- OPTIMIZE="$(CFLAGS)"
-%:
- dh $@
+override_dh_installexamples:
+ dh_installexamples
+ sed -i '1s|^#!/opt/bin/perl|#!/usr/bin/perl|' $(TMP)/usr/share/doc/$(PACKAGE)/examples/*
More information about the Pkg-perl-cvs-commits
mailing list