From c9de2578664b0170c41eb61fff526be7120969ed Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 31 Aug 2011 07:02:52 +0000
Subject: merge revision(s) 33142:

	* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/json/parser/parser.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ext/json/parser')

diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index 4ea663c721..d1d14c79ca 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -1618,6 +1618,9 @@ static VALUE convert_encoding(VALUE source)
  *   defaults to true.
  * * *object_class*: Defaults to Hash
  * * *array_class*: Defaults to Array
+ * * *quirks_mode*: Enables quirks_mode for parser, that is for example
+ *   parsing single JSON values instead of documents is possible.
+ *
  */
 static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 {
-- 
cgit v1.2.3