--- deliantra/server/lib/cf.pm	2007/03/14 04:12:29	1.226
+++ deliantra/server/lib/cf.pm	2007/03/23 18:32:48	1.227
@@ -23,22 +23,25 @@
 use Data::Dumper;
 use Digest::MD5;
 use Fcntl;
-use IO::AIO 2.32 ();
 use YAML::Syck ();
+use IO::AIO 2.32 ();
 use Time::HiRes;
 use Compress::LZF;
 
+# configure various modules to our taste
+#
 Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
-$Event::Eval = 1; # no idea why this is required, but it is
 
-sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
+$Event::Eval = 1; # no idea why this is required, but it is
 
 # work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
 $YAML::Syck::ImplicitUnicode = 1;
 
 $Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
 
+sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
+
 our %COMMAND      = ();
 our %COMMAND_TIME = ();
 
@@ -207,30 +210,16 @@
    } || "[unable to dump $_[0]: '$@']";
 }
 
-use JSON::Syck (); # TODO# replace by JSON::PC once working
+use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
 
 =item $ref = cf::from_json $json
 
 Converts a JSON string into the corresponding perl data structure.
 
-=cut
-
-sub from_json($) {
-   $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
-   JSON::Syck::Load $_[0]
-}
-
 =item $json = cf::to_json $ref
 
 Converts a perl data structure into its JSON representation.
 
-=cut
-
-sub to_json($) {
-   $JSON::Syck::ImplicitUnicode = 0;  # work around JSON::Syck bugs
-   JSON::Syck::Dump $_[0]
-}
-
 =item cf::lock_wait $string
 
 Wait until the given lock is available. See cf::lock_acquire.