Allow rb_hash_lookup2 to returna a default value of Qundef

aardvark179 · aardvark179 · commit d562b7fc223c · 2019-05-07T18:59:13.000+01:00
diff --git a/src/main/c/cext/ruby.c b/src/main/c/cext/ruby.c
@@ -1655,7 +1655,11 @@ VALUE rb_hash_lookup(VALUE hash, VALUE key) {
 }
 
 VALUE rb_hash_lookup2(VALUE hash, VALUE key, VALUE default_value) {
-  return RUBY_INVOKE(hash, "fetch", key, default_value);
+  VALUE result = RUBY_INVOKE(hash, "_get_or_undefined", key);
+  if (result == Qundef) {
+    result = default_value;
+  }
+  return result;
 }
 
 VALUE rb_hash_set_ifnone(VALUE hash, VALUE if_none) {

Original file line number	Diff line number	Diff line change
`@@ -1655,7 +1655,11 @@ VALUE rb_hash_lookup(VALUE hash, VALUE key) {`
`1655`	`1655`	`}`
`1656`	`1656`
`1657`	`1657`	`VALUE rb_hash_lookup2(VALUE hash, VALUE key, VALUE default_value) {`
`1658`		`- return RUBY_INVOKE(hash, "fetch", key, default_value);`
	`1658`	`+ VALUE result = RUBY_INVOKE(hash, "_get_or_undefined", key);`
	`1659`	`+ if (result == Qundef) {`
	`1660`	`+ result = default_value;`
	`1661`	`+ }`
	`1662`	`+ return result;`
`1659`	`1663`	`}`
`1660`	`1664`
`1661`	`1665`	`VALUE rb_hash_set_ifnone(VALUE hash, VALUE if_none) {`