Merge branch 'develop'

This commit is contained in:
alisdair sullivan 2012-03-29 21:48:57 -07:00
commit c80c1f7d40
7 changed files with 842 additions and 155 deletions

View file

@ -127,6 +127,10 @@ javascript interpreters treat the codepoints `u+2028` and `u+2029` as significan
json has no official comments but some parsers allow c style comments. this flag allows comments (both `// ...` and `/* ... */` style) anywhere whitespace is allowed
#### `json_escape` ####
by default, both the encoder and decoder return strings as utf8 binaries appropriate for use in erlang. escape sequences that were present in decoded terms are converted into the appropriate codepoint and encoded terms are unaltered. this flag escapes strings for output in json, removing control codes and replacing them with the appropriate escapes
### <a name="incompletes">incomplete input</a> ###