summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2011-06-17 17:15:29 +0200
committerFlorian Frank <flori@ping.de>2011-06-20 12:04:34 +0200
commita297194cbaf482b32c2e777a4069163d67d48233 (patch)
tree8461e3e96798cf83934941f94cc670181fee49d5 /ext
parent9e41c1997c096330634e5596db8265eb7e7072f9 (diff)
downloadjson-a297194cbaf482b32c2e777a4069163d67d48233.tar.gz
Alias State#configure method as State#merge
This increases duck type synonymy with Hash
Diffstat (limited to 'ext')
-rw-r--r--ext/json/ext/generator/generator.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
index 5b65408..ccd6017 100644
--- a/ext/json/ext/generator/generator.c
+++ b/ext/json/ext/generator/generator.c
@@ -1353,6 +1353,7 @@ void Init_generator()
rb_define_method(cState, "depth", cState_depth, 0);
rb_define_method(cState, "depth=", cState_depth_set, 1);
rb_define_method(cState, "configure", cState_configure, 1);
+ rb_define_alias(cState, "merge", "configure");
rb_define_method(cState, "to_h", cState_to_h, 0);
rb_define_method(cState, "[]", cState_aref, 1);
rb_define_method(cState, "generate", cState_generate, 1);