diff options
| author | Florian Frank <flori@ping.de> | 2011-07-31 01:00:36 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-07-31 01:57:19 +0200 |
| commit | 86bd839402eae91a1703fdfe6e1ae8267f39f030 (patch) | |
| tree | 0f20c9c4fb7e0c242308c1920ea483ac09e99e1b /java/src/json/ext/GeneratorState.java | |
| parent | 42db6f6ad04057f6d6cbbfd68652b71815c8fe47 (diff) | |
| parent | 9d0b1ca629f6f5bc558a4b3f887f0f8cf154fe78 (diff) | |
| download | json-86bd839402eae91a1703fdfe6e1ae8267f39f030.tar.gz | |
Merge branch 'quirks-mode-parser' into quirks-mode
Conflicts:
java/src/json/ext/Parser.java
java/src/json/ext/Parser.rl
json.gemspec
json_pure.gemspec
tests/test_json.rb
Diffstat (limited to 'java/src/json/ext/GeneratorState.java')
| -rw-r--r-- | java/src/json/ext/GeneratorState.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/src/json/ext/GeneratorState.java b/java/src/json/ext/GeneratorState.java index a53ff12..0536ac4 100644 --- a/java/src/json/ext/GeneratorState.java +++ b/java/src/json/ext/GeneratorState.java @@ -72,7 +72,8 @@ public class GeneratorState extends RubyObject { private boolean allowNaN = DEFAULT_ALLOW_NAN; static final boolean DEFAULT_ALLOW_NAN = false; /** - * XXX + * If set to <code>true</code> all JSON documents generated do not contain + * any other characters than ASCII characters. */ private boolean asciiOnly = DEFAULT_ASCII_ONLY; static final boolean DEFAULT_ASCII_ONLY = false; @@ -192,7 +193,9 @@ public class GeneratorState extends RubyObject { } /** - * XXX + * Generates a valid JSON document from object <code>obj</code> and returns + * the result. If no valid JSON document can be created this method raises + * a GeneratorError exception. */ @JRubyMethod public IRubyObject generate(ThreadContext context, IRubyObject obj) { |