summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-18 14:22:23 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-18 14:22:23 +0000
commit524817bb0b9e149faccc8020f6c4160e9e0bd8cc (patch)
tree97acdfc2d72cdc6fdd9298bfd2e0bab2dd146c5b
parent55a9667de3dfd78ad771756352158e7b3ee9765c (diff)
* vm_eval.c (eval_string_with_cref): Unify to use NIL_P.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm_eval.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 93258c0686..d7c563bdce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 18 23:20:12 2014 Shota Fukumori <her@sorah.jp>
+
+ * vm_eval.c (eval_string_with_cref): Unify to use NIL_P.
+
Tue Mar 18 22:03:41 2014 Shota Fukumori <her@sorah.jp>
* vm_eval.c (eval_string_with_cref): Use file path even if scope is
diff --git a/vm_eval.c b/vm_eval.c
index 5ae3e78b92..7b11e38d84 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1223,7 +1223,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *const cref_arg,
bind = Check_TypedStruct(scope, &ruby_binding_data_type);
{
envval = bind->env;
- if (absolute_path == Qnil && !NIL_P(bind->path)) {
+ if (NIL_P(absolute_path) && !NIL_P(bind->path)) {
file = bind->path;
line = bind->first_lineno;
absolute_path = rb_current_realfilepath();