--- JSON-XS/XS.pm	2007/03/24 02:23:51	1.16
+++ JSON-XS/XS.pm	2007/03/25 02:37:00	1.22
@@ -6,12 +6,17 @@
 
  use JSON::XS;
 
- # exported functions, croak on error
+ # exported functions, they croak on error
+ # and expect/generate UTF-8
 
  $utf8_encoded_json_text = to_json $perl_hash_or_arrayref;
  $perl_hash_or_arrayref  = from_json $utf8_encoded_json_text;
 
- # oo-interface
+ # objToJson and jsonToObj aliases to to_json and from_json
+ # are exported for compatibility to the JSON module,
+ # but should not be used in new code.
+
+ # OO-interface
 
  $coder = JSON::XS->new->ascii->pretty->allow_nonref;
  $pretty_printed_unencoded = $coder->encode ($perl_scalar);
@@ -38,7 +43,7 @@
 
 =over 4
 
-=item * correct handling of unicode issues
+=item * correct unicode handling
 
 This module knows how to handle Unicode, and even documents how and when
 it does so.
@@ -47,7 +52,8 @@
 
 When you serialise a perl data structure using only datatypes supported
 by JSON, the deserialised data structure is identical on the Perl level.
-(e.g. the string "2.0" doesn't suddenly become "2").
+(e.g. the string "2.0" doesn't suddenly become "2" just because it looks
+like a number).
 
 =item * strict checking of JSON correctness
 
@@ -68,10 +74,10 @@
 =item * reasonably versatile output formats
 
 You can choose between the most compact guarenteed single-line format
-possible (nice for simple line-based protocols), a pure-ascii format (for
-when your transport is not 8-bit clean), or a pretty-printed format (for
-when you want to read that stuff). Or you can combine those features in
-whatever way you like.
+possible (nice for simple line-based protocols), a pure-ascii format
+(for when your transport is not 8-bit clean, still supports the whole
+unicode range), or a pretty-printed format (for when you want to read that
+stuff). Or you can combine those features in whatever way you like.
 
 =back
 
@@ -79,11 +85,13 @@
 
 package JSON::XS;
 
+use strict;
+
 BEGIN {
-   $VERSION = '0.31';
-   @ISA = qw(Exporter);
+   our $VERSION = '0.8';
+   our @ISA = qw(Exporter);
 
-   @EXPORT = qw(to_json from_json);
+   our @EXPORT = qw(to_json from_json objToJson jsonToObj);
    require Exporter;
 
    require XSLoader;
@@ -529,45 +537,48 @@
 system.
 
 First comes a comparison between various modules using a very short JSON
-string (83 bytes), showing the number of encodes/decodes per second
-(JSON::XS is the functional interface, while JSON::XS/2 is the OO
-interface with pretty-printing and hashkey sorting enabled). Higher is
-better:
+string:
+
+   {"method": "handleMessage", "params": ["user1", "we were just talking"], "id": null}
+
+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). Higher is better:
 
    module     |     encode |     decode |
    -----------|------------|------------|
-   JSON       |      14006 |       6820 |
-   JSON::DWIW |     200937 |     120386 |
-   JSON::PC   |      85065 |     129366 |
-   JSON::Syck |      59898 |      44232 |
-   JSON::XS   |    1171478 |     342435 |
-   JSON::XS/2 |     730760 |     328714 |
+   JSON       |  11488.516 |   7823.035 |
+   JSON::DWIW |  94708.054 | 129094.260 |
+   JSON::PC   |  63884.157 | 128528.212 |
+   JSON::Syck |  34898.677 |  42096.911 |
+   JSON::XS   | 654027.064 | 396423.669 |
+   JSON::XS/2 | 371564.190 | 371725.613 |
    -----------+------------+------------+
 
-That is, JSON::XS is 6 times faster than than JSON::DWIW and about 80
-times faster than JSON, even with pretty-printing and key sorting.
+That is, JSON::XS is more than six times faster than JSON::DWIW on
+encoding, more than three times faster on decoding, and about thirty times
+faster than JSON, even with pretty-printing and key sorting.
 
 Using a longer test string (roughly 18KB, generated from Yahoo! Locals
 search API (http://nanoref.com/yahooapis/mgPdGg):
 
    module     |     encode |     decode |
    -----------|------------|------------|
-   JSON       |        673 |         38 |
-   JSON::DWIW |       5271 |        770 |
-   JSON::PC   |       9901 |       2491 |
-   JSON::Syck |       2360 |        786 |
-   JSON::XS   |      37398 |       3202 |
-   JSON::XS/2 |      13765 |       3153 |
+   JSON       |    273.023 |     44.674 |
+   JSON::DWIW |   1089.383 |   1145.704 |
+   JSON::PC   |   3097.419 |   2393.921 |
+   JSON::Syck |    514.060 |    843.053 |
+   JSON::XS   |   6479.668 |   3636.364 |
+   JSON::XS/2 |   3774.221 |   3599.124 |
    -----------+------------+------------+
 
-Again, JSON::XS leads by far in the encoding case, while still beating
-every other module in the decoding case.
+Again, JSON::XS leads by far.
 
-On large strings containing lots of unicode characters, some modules
-(such as JSON::PC) decode faster than JSON::XS, but the result will be
-broken due to missing unicode handling. Others refuse to decode or encode
-properly, so it was impossible to prepare a fair comparison table for that
-case.
+On large strings containing lots of high unicode characters, some modules
+(such as JSON::PC) seem to decode faster than JSON::XS, but the result
+will be broken due to missing (or wrong) unicode handling. Others refuse
+to decode or encode properly, so it was impossible to prepare a fair
+comparison table for that case.
 
 =head1 RESOURCE LIMITS