[ViewVC] Diff of: cvs/JSON-XS/XS.pm

Comparing JSON-XS/XS.pm (file contents):
Revision 1.95 by root, Tue Mar 25 16:56:09 2008 UTC vs.
Revision 1.104 by root, Thu May 8 15:33:06 2008 UTC

 =head1 NAME
+JSON::XS - JSON serialising/deserialising, done correctly and fast
 =encoding utf-8
-JSON::XS - JSON serialising/deserialising, done correctly and fast
 JSON::XS - 正しくて高速な JSON シリアライザ/デシリアライザ
            (http://fleur.hio.jp/perldoc/mix/lib/JSON/XS.html)
 =head1 SYNOPSIS
 package JSON::XS;
 use strict;
-our $VERSION = '2.1';
+our $VERSION = '2.2';
 our @ISA = qw(Exporter);
 our @EXPORT = qw(encode_json decode_json to_json from_json);
 sub to_json($) {
 Example, encode a Perl scalar as JSON value with enabled C<allow_nonref>,
 resulting in an invalid JSON text:
    JSON::XS->new->allow_nonref->encode ("Hello, World!")
    => "Hello, World!"
+=item $json = $json->allow_unknown ([$enable])
+=item $enabled = $json->get_allow_unknown
+If C<$enable> is true (or missing), then C<encode> will I<not> throw an
+exception when it encounters values it cannot represent in JSON (for
+example, filehandles) but instead will encode a JSON C<null> value. Note
+that blessed objects are not included here and are handled separately by
+c<allow_nonref>.
+If C<$enable> is false (the default), then C<encode> will throw an
+exception when it encounters anything it cannot encode as JSON.
+This option does not affect C<decode> in any way, and it is recommended to
+leave it off unless you know your communications partner.
 =item $json = $json->allow_blessed ([$enable])
 =item $enabled = $json->get_allow_blessed
 =item $json = $json->max_depth ([$maximum_nesting_depth])
 =item $max_depth = $json->get_max_depth
 Sets the maximum nesting level (default C<512>) accepted while encoding
-or decoding. If the JSON text or Perl data structure has an equal or
+or decoding. If a higher nesting level is detected in JSON text or a Perl
-higher nesting level then this limit, then the encoder and decoder will
+data structure, then the encoder and decoder will stop and croak at that
-stop and croak at that point.
+point.
 Nesting level is defined by number of hash- or arrayrefs that the encoder
 needs to traverse to reach a given point or the number of C<{> or C<[>
 characters without their matching closing parenthesis crossed to reach a
 given character in a string.
 Setting the maximum depth to one disallows any nesting, so that ensures
 that the object is only a single hash/object or array.
-The argument to C<max_depth> will be rounded up to the next highest power
-of two. If no argument is given, the highest possible setting will be
+If no argument is given, the highest possible setting will be used, which
-used, which is rarely useful.
+is rarely useful.
+Note that nesting is implemented by recursion in C. The default value has
+been chosen to be as large as typical operating systems allow without
+crashing.
 See SECURITY CONSIDERATIONS, below, for more info on why this is useful.
 =item $json = $json->max_size ([$maximum_string_size])
 =item $max_size = $json->get_max_size
 Set the maximum length a JSON text may have (in bytes) where decoding is
 being attempted. The default is C<0>, meaning no limit. When C<decode>
-is called on a string longer then this number of characters it will not
+is called on a string that is longer then this many bytes, it will not
 attempt to decode the string but throw an exception. This setting has no
 effect on C<encode> (yet).
-The argument to C<max_size> will be rounded up to the next B<highest>
+If no argument is given, the limit check will be deactivated (same as when
-power of two (so may be more than requested). If no argument is given, the
+C<0> is specified).
-limit check will be deactivated (same as when C<0> is specified).
 See SECURITY CONSIDERATIONS, below, for more info on why this is useful.
 =item $json_text = $json->encode ($perl_scalar)
 =back
 =head1 INCREMENTAL PARSING
-[This section is still EXPERIMENTAL]
+[This section and the API it details is still EXPERIMENTAL]
 In some cases, there is the need for incremental parsing of JSON
 texts. While this module always has to keep both JSON text and resulting
 Perl data structure in memory at one time, it does allow you to parse a
 JSON stream incrementally. It does so by accumulating text until it has
 return without doing anything further. This can be used to add more text
 in as many chunks as you want.
 If the method is called in scalar context, then it will try to extract
 exactly I<one> JSON object. If that is successful, it will return this
-object, otherwise it will return C<undef>. This is the most common way of
+object, otherwise it will return C<undef>. If there is a parse error,
+this method will croak just as C<decode> would do (one can then use
+C<incr_skip> to skip the errornous part). This is the most common way of
 using the method.
 And finally, in list context, it will try to extract as many objects
 from the stream as it can find and return them, or the empty list
 otherwise. For this to work, there must be no separators between the JSON
-objects or arrays, instead they must be concatenated back-to-back.
+objects or arrays, instead they must be concatenated back-to-back. If
+an error occurs, an exception will be raised as in the scalar context
+case. Note that in this case, any previously-parsed JSON texts will be
+lost.
 =item $lvalue_string = $json->incr_text
 This method returns the currently stored JSON fragment as an lvalue, that
 is, you can manipulate it. This I<only> works when a preceding call to
 method before having parsed anything.
 This function is useful in two cases: a) finding the trailing text after a
 JSON object or b) parsing multiple JSON objects separated by non-JSON text
 (such as commas).
+=item $json->incr_skip
+This will reset the state of the incremental parser and will remove the
+parsed text from the input buffer. This is useful after C<incr_parse>
+died, in which case the input buffer and incremental parser state is left
+unchanged, to skip the text parsed so far and to reset the parse state.
 =back
 =head2 LIMITATIONS
 Other unblessed references are generally not allowed and will cause an
 exception to be thrown, except for references to the integers C<0> and
 C<1>, which get turned into C<false> and C<true> atoms in JSON. You can
 also use C<JSON::XS::false> and C<JSON::XS::true> to improve readability.
-   encode_json [\0,JSON::XS::true]      # yields [false,true]
+   encode_json [\0, JSON::XS::true]      # yields [false,true]
 =item JSON::XS::true, JSON::XS::false
 These special values become JSON true and JSON false values,
 respectively. You can also use C<\1> and C<\0> directly if you want.
 First comes a comparison between various modules using
 a very short single-line JSON string (also available at
 L<http://dist.schmorp.de/misc/json/short.json>).
-   {"method": "handleMessage", "params": ["user1", "we were just talking"], \
+   {"method": "handleMessage", "params": ["user1",
-   "id": null, "array":[1,11,234,-5,1e5,1e7, true,  false]}
+   "we were just talking"], "id": null, "array":[1,11,234,-5,1e5,1e7,
+   true,  false]}
 It shows the number of encodes/decodes per second (JSON::XS uses
 the functional interface, while JSON::XS/2 uses the OO interface
 with pretty-printing and hashkey sorting enabled, JSON::XS/3 enables
 shrink). Higher is better:
 =head1 BUGS
 While the goal of this module is to be correct, that unfortunately does
-not mean it's bug-free, only that I think its design is bug-free. It is
+not mean it's bug-free, only that I think its design is bug-free. If you
-still relatively early in its development. If you keep reporting bugs they
+keep reporting bugs they will be fixed swiftly, though.
-will be fixed swiftly, though.
 Please refrain from using rt.cpan.org or any other bug reporting
 service. I put the contact address into my modules for a reason.
 =cut

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing JSON-XS/XS.pm (file contents): Revision 1.95 by root, Tue Mar 25 16:56:09 2008 UTC vs. Revision 1.104 by root, Thu May 8 15:33:06 2008 UTC

Diff Legend

Comparing JSON-XS/XS.pm (file contents):
Revision 1.95 by root, Tue Mar 25 16:56:09 2008 UTC vs.
Revision 1.104 by root, Thu May 8 15:33:06 2008 UTC