More JSON tweaks

basis/json/json-docs.factor

@@ -0,0 +1,8 @@
+IN: json
+USING: help.markup help.syntax ;
+
+ARTICLE: "json" "JSON serialization"
+{ $subsection "json.reader" }
+{ $subsection "json.writer" } ;
+
+ABOUT: "json"

basis/json/json.factor

@@ -1,3 +1,7 @@
 IN: json
+USE: vocabs.loader
 
 SINGLETON: json-null
+
+"json.reader" require
+"json.writer" require

basis/json/reader/reader-docs.factor

@@ -3,7 +3,7 @@
 USING: help.markup help.syntax ;
 IN: json.reader
 
-HELP: json> ( string -- object )
+HELP: json>
 { $values { "string" "a string in JSON format" } { "object" "a deserialized object" } }
 { $description "Deserializes the JSON formatted string into a Factor object. JSON objects are converted to Factor hashtables. All other JSON objects convert to their obvious Factor equivalents." } ;
 

basis/json/reader/reader.factor

@@ -9,10 +9,8 @@ IN: json.reader
 
 : grammar-list>vector ( seq -- vec ) first2 values swap prefix ;
 
-PRIVATE>
-
 ! Grammar for JSON from RFC 4627
-EBNF: json>
+EBNF: (json>)
 
 ws = (" " | "\r" | "\t" | "\n")*
 
@@ -57,3 +55,7 @@ val = true
 value = ws val:v ws => [[ v ]]
 
 ;EBNF
+
+PRIVATE>
+
+: json> ( string -- object ) (json>) ;