Bug fix found by Xavier re. another empty element of a list; R CMD check for CRAN to clear up compiler warnings; new version

Author: duncantl

.Rbuildignore

@@ -12,7 +12,6 @@ purdy.R
 roebuck.R
 json-asIS-withlevel
 src/Makevars$
-
 Changes.xml
 intName.R
 streaming.R
@@ -21,11 +20,9 @@ tests.R
 testStream.R
 dataframe.R
 leak.R
-utf.*
 jsonText.rda
 foo.html
 Web
 bigFile.R
-stream.R
 experiments
-
+utfTest.*

DESCRIPTION

@@ -1,18 +1,19 @@
 Package: RJSONIO
-Version: 1.2-1
+Version: 1.3-0
 Title: Serialize R objects to JSON, JavaScript Object Notation
 Description: This is a package that allows conversion to and from 
   data in Javascript object notation (JSON) format.
   This allows R objects to be inserted into Javascript/ECMAScript/ActionScript code
   and allows R programmers to read and convert JSON content to R objects.
-  This is an alternative to rjson package. That version was too slow for converting large R objects to JSON
-  and is not extensible, but a very useful prototype.  It is fast for parsing.
-  This package uses methods, vectorized operations and C code and callbacks to R functions
-  for deserializing JSON objects to R. 
-  Verison 0.4 of this package uses a new native parser, implements the transformation code
-  in C and allocates memory efficiently (rather than concatenating because of event driven parsing).
-  The result is a significantly faster parsing of large JSON documents.
-Note: The C code comes from www.json.org and is licensed under essentially the BSD license.
+  This is an alternative to rjson package. Originally, that was too slow for converting large R objects to JSON
+  and was not extensible.  rjson's performance is now similar to this package, and perhaps slightly faster in some cases.
+  This package uses methods and is readily extensible by defining methods for different classes, 
+  vectorized operations, and C code and callbacks to R functions for deserializing JSON objects to R. 
+  The two packages intentionally share the same basic interface. This package (RJSONIO) has many additional
+  options to allow customizing the generation and processing of JSON content.
+  This package uses libjson rather than implementing yet another JSON parser. The aim is to support
+  other general projects by building on their work, providing feedback and benefit from their ongoing development.
+Note: The C code for parsing JSON comes from www.json.org and is licensed under essentially the BSD license.
       See the notice in src/JSON_parser.c
       The libjson code is on sourceforge.net, but does not yet have a license.     
       libjson was written and is maintained and developed by Johnathan Wallace.

R/json.R

@@ -264,7 +264,7 @@ setMethod("toJSON", "matrix",
 setMethod("toJSON", "list",
            function(x, container = isContainer(x, asIs, .level), collapse = "\n", ..., .level = 1L, .withNames = length(x) > 0 && length(names(x)) > 0, .na = "null", .escapeEscapes = TRUE, pretty = FALSE, asIs = NA, .inf = " Infinity") {
                 # Degenerate case.
-#browser()
+browser()
              if(length(x) == 0) {
                           # x = structure(list(), names = character()) gives {}
                 return(if(is.null(names(x))) "[]" else "{}")
@@ -280,7 +280,9 @@ setMethod("toJSON", "list",
              if(!container)
                return(els)
 
-             els = unlist(els)
+#             els = unlist(els)
+   w = sapply(els, length) == 0
+   els[w] = "[]" # or "" or "null"
 
              if(.withNames)
                 paste(sprintf("{%s", collapse),

Web/index.html.in

@@ -42,15 +42,14 @@ string, key, start or end of an array or object) is found
 in the JSON content.
 </p>
 
-<p> This package is motivated by the need to export R objects for use
+<p> This package was motivated by the need to export R objects for use
 in creating dynamic graphics for the Web via SVG and Flash/FLEX.
-Initially, we used Alex Couture-Beil's <a
+Since then, JSON has become a prominent format with many uses.
+Alex Couture-Beil's <a
 href="http://cran.r-project.org/web/packages/rjson/index.html">rjson</a>
-package.  However, that does not use S4/S3 methods and so is not
-readily extensible, but still useful. Unfortunately, it does not used
-vectorized operations and so is too slow for non-trivial
-data. Similarly, for reading JSON data into R, it is somewhat slow and
-so does not scale to large data, should this be an issue.
+package is another mechanism in R for reading and writing JSON
+content.  However, that does not use S4/S3 methods and so is not
+readily extensible, but still useful.
 </p>
 
 <h2>Documentation</h2>
@@ -64,8 +63,8 @@ so does not scale to large data, should this be an issue.
 
 <hr>
 <address><a href="http://www.stat.ucdavis.edu/~duncan">Duncan Temple Lang</a>
-<a href=mailto:[email protected]>&lt;duncan@wald.ucdavis.edu&gt;</a></address>
+<a href=mailto:[email protected]>&lt;duncan@r-project.org&gt;</a></address>
 <!-- hhmts start -->
-Last modified: Sun Aug  9 11:53:44 PDT 2009
+Last modified: Mon May 19 09:26:38 PDT 2014
 <!-- hhmts end -->
 </body> </html>

src/libjson/JSONOptions.h

@@ -117,7 +117,7 @@
  *  your json into a stream, which will automatically hit a callback when full nodes are
  *  completed
  */
-#define JSON_STREAM
+// #define JSON_STREAM
 
 
 /*

src/libjson/Source/JSONDefs/GNU_C.h

@@ -1,5 +1,5 @@
 #ifndef JSON_GNU_C_HEADER
-#define JSON_GUN_C_HEADER
+#define JSON_GNU_C_HEADER
 
 #ifdef __GNUC__
 

src/rlibjson.c

@@ -14,6 +14,13 @@ R_json_parse(SEXP str)
     return(R_MakeExternalPtr(node, Rf_install("JSONNODE"), R_NilValue));
 }
 
+void
+jsonErrorHandler(const json_char *foo)
+{
+    PROBLEM  "json error handler: %s", foo
+      ERROR;
+}
+
 SEXP
 R_fromJSON(SEXP r_str, SEXP simplify, SEXP nullValue, SEXP simplifyWithNames, SEXP encoding,
             SEXP r_stringFun, SEXP r_str_type)
@@ -36,6 +43,11 @@ R_fromJSON(SEXP r_str, SEXP simplify, SEXP nullValue, SEXP simplifyWithNames, SE
     } else 
 	r_stringFun = NULL;
 
+#if 0
+    register_debug_callback(jsonErrorHandler);
+#else
+#pragma message("activate the debug_callback")
+#endif
     node = json_parse(str);
     ans = processJSONNode(node, json_type(node), INTEGER(simplify)[0], nullValue, LOGICAL(simplifyWithNames)[0],
  			  INTEGER(encoding)[0], r_stringFun, str_fun_type);

tests/toJSON.R

@@ -9,3 +9,13 @@ e = new.env(); e$a = 1:10; e$bc = letters[1:3]
 cat(toJSON(e, pretty = TRUE))
 
 
+a = list(x=1, y=character(0))
+fromJSON( toJSON( a ) )
+a = list(x=1, y=character(0), b = 1)
+fromJSON( toJSON( a ) )
+
+
+a = list(x = vector(), y = 123, z = "allo")
+fromJSON(toJSON(a))
+
+