summaryrefslogtreecommitdiff
path: root/ext/json/generator
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-28 22:29:11 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-28 22:29:11 +0000
commit4a481ad400a88e704d07c68aa8112c2a28bdf2c9 (patch)
treef0d67488a812a3c77be765c08484368bacf79e52 /ext/json/generator
parent5547719573c6b37566480eaadf0c17bd0c5529bd (diff)
* ext/json, test/json: merge JSON HEAD(17fe8e7)
https://github.com/flori/json/compare/v1.8.1...17fe8e7 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json/generator')
-rw-r--r--ext/json/generator/generator.c20
-rw-r--r--ext/json/generator/generator.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 1b7f036a5d5..aee385e08be 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -676,7 +676,7 @@ static VALUE cState_to_h(VALUE self)
/*
* call-seq: [](name)
*
-* Return the value returned by method +name+.
+* Returns the value returned by method +name+.
*/
static VALUE cState_aref(VALUE self, VALUE name)
{
@@ -691,7 +691,7 @@ static VALUE cState_aref(VALUE self, VALUE name)
/*
* call-seq: []=(name, value)
*
-* Set the attribute name to value.
+* Sets the attribute name to value.
*/
static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
{
@@ -988,7 +988,7 @@ static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
/*
* call-seq: initialize_copy(orig)
*
- * Initializes this object from orig if it to be duplicated/cloned and returns
+ * Initializes this object from orig if it can be duplicated/cloned and returns
* it.
*/
static VALUE cState_init_copy(VALUE obj, VALUE orig)
@@ -1036,7 +1036,7 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
/*
* call-seq: indent()
*
- * This string is used to indent levels in the JSON text.
+ * Returns the string that is used to indent levels in the JSON text.
*/
static VALUE cState_indent(VALUE self)
{
@@ -1047,7 +1047,7 @@ static VALUE cState_indent(VALUE self)
/*
* call-seq: indent=(indent)
*
- * This string is used to indent levels in the JSON text.
+ * Sets the string that is used to indent levels in the JSON text.
*/
static VALUE cState_indent_set(VALUE self, VALUE indent)
{
@@ -1072,7 +1072,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
/*
* call-seq: space()
*
- * This string is used to insert a space between the tokens in a JSON
+ * Returns the string that is used to insert a space between the tokens in a JSON
* string.
*/
static VALUE cState_space(VALUE self)
@@ -1084,7 +1084,7 @@ static VALUE cState_space(VALUE self)
/*
* call-seq: space=(space)
*
- * This string is used to insert a space between the tokens in a JSON
+ * Sets _space_ to the string that is used to insert a space between the tokens in a JSON
* string.
*/
static VALUE cState_space_set(VALUE self, VALUE space)
@@ -1110,7 +1110,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
/*
* call-seq: space_before()
*
- * This string is used to insert a space before the ':' in JSON objects.
+ * Returns the string that is used to insert a space before the ':' in JSON objects.
*/
static VALUE cState_space_before(VALUE self)
{
@@ -1121,7 +1121,7 @@ static VALUE cState_space_before(VALUE self)
/*
* call-seq: space_before=(space_before)
*
- * This string is used to insert a space before the ':' in JSON objects.
+ * Sets the string that is used to insert a space before the ':' in JSON objects.
*/
static VALUE cState_space_before_set(VALUE self, VALUE space_before)
{
@@ -1328,7 +1328,7 @@ static VALUE cState_depth_set(VALUE self, VALUE depth)
/*
* call-seq: buffer_initial_length
*
- * This integer returns the current inital length of the buffer.
+ * This integer returns the current initial length of the buffer.
*/
static VALUE cState_buffer_initial_length(VALUE self)
{
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index a583971d9f4..b2d2f0a17cc 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -23,7 +23,7 @@
#define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
-/* unicode defintions */
+/* unicode definitions */
#define UNI_STRICT_CONVERSION 1