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

Comparing JSON-XS/XS.pm (file contents):
Revision 1.140 by root, Thu Jun 27 11:45:17 2013 UTC vs.
Revision 1.144 by root, Mon Oct 28 23:19:54 2013 UTC

 use common::sense;
 our $VERSION = 2.34;
 our @ISA = qw(Exporter);
-our @EXPORT = qw(encode_json decode_json to_json from_json);
+our @EXPORT = qw(encode_json decode_json);
-sub to_json($) {
-   require Carp;
-   Carp::croak ("JSON::XS::to_json has been renamed to encode_json, either downgrade to pre-2.0 versions of JSON::XS or rename the call");
-}
-sub from_json($) {
-   require Carp;
-   Carp::croak ("JSON::XS::from_json has been renamed to decode_json, either downgrade to pre-2.0 versions of JSON::XS or rename the call");
-}
 use Exporter;
 use XSLoader;
+use Types::Serialiser ();
 =head1 FUNCTIONAL INTERFACE
 The following convenience methods are provided by this module. They are
 exported by default:
 This function call is functionally identical to:
    $perl_scalar = JSON::XS->new->utf8->decode ($json_text)
 Except being faster.
-=item $is_boolean = JSON::XS::is_bool $scalar
-Returns true if the passed scalar represents either JSON::XS::true or
-JSON::XS::false, two constants that act like C<1> and C<0>, respectively
-and are used to represent JSON C<true> and C<false> values in Perl.
-See MAPPING, below, for more information on how JSON values are mapped to
-Perl.
 =back
 =head1 A FEW NOTES ON UNICODE AND PERL
 See SECURITY CONSIDERATIONS, below, for more info on why this is useful.
 =item $json_text = $json->encode ($perl_scalar)
-Converts the given Perl data structure (a simple scalar or a reference
+Converts the given Perl value or data structure to its JSON
-to a hash or array) to its JSON representation. Simple scalars will be
+representation. Croaks on error.
-converted into JSON string or number sequences, while references to arrays
-become JSON arrays and references to hashes become JSON objects. Undefined
-Perl values (e.g. C<undef>) become JSON C<null> values. Neither C<true>
-nor C<false> values will be generated.
 =item $perl_scalar = $json->decode ($json_text)
 The opposite of C<encode>: expects a JSON text and tries to parse it,
 returning the resulting simple scalar or reference. Croaks on error.
-JSON numbers and strings become simple Perl scalars. JSON arrays become
-Perl arrayrefs and JSON objects become Perl hashrefs. C<true> becomes
-C<1>, C<false> becomes C<0> and C<null> becomes C<undef>.
 =item ($perl_scalar, $characters) = $json->decode_prefix ($json_text)
 This works like the C<decode> method, but instead of raising an exception
 when there is trailing garbage after the first JSON object, it will
 silently stop parsing there and return the number of characters consumed
 so far.
 This is useful if your JSON texts are not delimited by an outer protocol
-(which is not the brightest thing to do in the first place) and you need
-to know where the JSON text ends.
+and you need to know where the JSON text ends.
    JSON::XS->new->decode_prefix ("[1] the tail")
    => ([], 3)
 =back
 =back
 =head2 LIMITATIONS
 All options that affect decoding are supported, except
-C<allow_nonref>. The reason for this is that it cannot be made to
+C<allow_nonref>. The reason for this is that it cannot be made to work
-work sensibly: JSON objects and arrays are self-delimited, i.e. you can concatenate
+sensibly: JSON objects and arrays are self-delimited, i.e. you can
-them back to back and still decode them perfectly. This does not hold true
+concatenate them back to back and still decode them perfectly. This does
-for JSON numbers, however.
+not hold true for JSON numbers, however.
 For example, is the string C<1> a single JSON number, or is it simply the
 start of C<12>? Or is C<12> a single JSON number, or the concatenation
 of C<1> and C<2>? In neither case you can tell, and this is why JSON::XS
 takes the conservative route and disallows this case.
 floating point, JSON::XS only guarantees precision up to but not including
 the least significant bit.
 =item true, false
-These JSON atoms become C<JSON::XS::true> and C<JSON::XS::false>,
+These JSON atoms become C<Types::Serialiser::true> and
-respectively. They are overloaded to act almost exactly like the numbers
+C<Types::Serialiser::false>, respectively. They are overloaded to act
-C<1> and C<0>. You can check whether a scalar is a JSON boolean by using
+almost exactly like the numbers C<1> and C<0>. You can check whether
-the C<JSON::XS::is_bool> function.
+a scalar is a JSON boolean by using the C<Types::Serialiser::is_bool>
+function (after C<use Types::Serialier>, of course).
 =item null
 A JSON null atom becomes C<undef> in Perl.
 =over 4
 =item hash references
-Perl hash references become JSON objects. As there is no inherent ordering
+Perl hash references become JSON objects. As there is no inherent
-in hash keys (or JSON objects), they will usually be encoded in a
+ordering in hash keys (or JSON objects), they will usually be encoded
-pseudo-random order that can change between runs of the same program but
+in a pseudo-random order. JSON::XS can optionally sort the hash keys
-stays generally the same within a single run of a program. JSON::XS can
+(determined by the I<canonical> flag), so the same datastructure will
-optionally sort the hash keys (determined by the I<canonical> flag), so
+serialise to the same JSON text (given same settings and version of
-the same datastructure will serialise to the same JSON text (given same
+JSON::XS), but this incurs a runtime overhead and is only rarely useful,
-settings and version of JSON::XS), but this incurs a runtime overhead
+e.g. when you want to compare some JSON text against another for equality.
-and is only rarely useful, e.g. when you want to compare some JSON text
-against another for equality.
 =item array references
 Perl array references become JSON arrays.
 =item other references
 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
+C<1>, which get turned into C<false> and C<true> atoms in JSON.
-also use C<JSON::XS::false> and C<JSON::XS::true> to improve readability.
+Since C<JSON::XS> uses the boolean model from L<Types::Serialiser>, you
+can also C<use Types::Serialiser> and then use C<Types::Serialiser::false>
+and C<Types::Serialiser::true> to improve readability.
+   use Types::Serialiser;
-   encode_json [\0, JSON::XS::true]      # yields [false,true]
+   encode_json [\0, Types::Serialiser::true]      # yields [false,true]
-=item JSON::XS::true, JSON::XS::false
+=item Types::Serialiser::true, Types::Serialiser::false
-These special values become JSON true and JSON false values,
+These special values from the L<Types::Serialiser> module become JSON true
-respectively. You can also use C<\1> and C<\0> directly if you want.
+and JSON false values, respectively. You can also use C<\1> and C<\0>
+directly if you want.
 =item blessed objects
 Blessed objects are not directly representable in JSON. See the
 C<allow_blessed> and C<convert_blessed> methods on various options on
 are browser design bugs, but it is still you who will have to deal with
 it, as major browser developers care only for features, not about getting
 security right).
+=head1 INTEROPERABILITY WITH OTHER MODULES
+C<JSON::XS> uses the L<Types::Serialiser> module to provide boolean
+constants. That means that the JSON true and false values will be
+comaptible to true and false values of iother modules that do the same,
+such as L<JSON::PP> and L<CBOR::XS>.
 =head1 THREADS
 This module is I<not> guaranteed to be thread safe and there are no
 plans to change this until Perl gets thread support (as opposed to the
 horribly slow so-called "threads" which are simply slow and bloated
 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
-our $true  = do { bless \(my $dummy = 1), "JSON::XS::Boolean" };
+BEGIN {
-our $false = do { bless \(my $dummy = 0), "JSON::XS::Boolean" };
+   *true    = \$Types::Serialiser::true;
+   *true    = \&Types::Serialiser::true;
+   *false   = \$Types::Serialiser::false;
+   *false   = \&Types::Serialiser::false;
+   *is_bool = \&Types::Serialiser::is_bool;
-sub true()  { $true  }
+   *JSON::XS::Boolean:: = *Types::Serialiser::Boolean::;
-sub false() { $false }
-sub is_bool($) {
-   UNIVERSAL::isa $_[0], "JSON::XS::Boolean"
-#      or UNIVERSAL::isa $_[0], "JSON::Literal"
 }
 XSLoader::load "JSON::XS", $VERSION;
-package JSON::XS::Boolean;
-use overload
-   "0+"     => sub { ${$_[0]} },
-   "++"     => sub { $_[0] = ${$_[0]} + 1 },
-   "--"     => sub { $_[0] = ${$_[0]} - 1 },
-   fallback => 1;
-1;
 =head1 SEE ALSO
 The F<json_xs> command line utility for quick experiments.
  Marc Lehmann <schmorp@schmorp.de>
  http://home.schmorp.de/
 =cut
+1

Diff Legend

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

Comparing JSON-XS/XS.pm (file contents): Revision 1.140 by root, Thu Jun 27 11:45:17 2013 UTC vs. Revision 1.144 by root, Mon Oct 28 23:19:54 2013 UTC

Diff Legend

Comparing JSON-XS/XS.pm (file contents):
Revision 1.140 by root, Thu Jun 27 11:45:17 2013 UTC vs.
Revision 1.144 by root, Mon Oct 28 23:19:54 2013 UTC