patch 8.1.0220: Ruby converts v:true and v:false to a number

Problem: Ruby converts v:true and v:false to a number. Solution: Use Qtrue and Qfalse instead. (Masataka Pocke Kuwabara, closes #3259)
vim · Jul 28, 2018 · d84b26a03b13cd816d80ff32b61e8de740d499ce · d84b26a
1 parent 2c8c681
commit d84b26a03b13cd816d80ff32b61e8de740d499ce
Unified Split

Showing with 14 additions and 2 deletions.

+4 −2 src/if_ruby.c

+8 −0 src/testdir/test_ruby.vim

+2 −0 src/version.c
diff --git a/src/if_ruby.c b/src/if_ruby.c
@@ -1085,8 +1085,10 @@ static VALUE vim_to_ruby(typval_T *tv)
    }
    else if (tv->v_type == VAR_SPECIAL)
    {
-	if (tv->vval.v_number <= VVAL_TRUE)
-	    result = INT2NUM(tv->vval.v_number);
+	if (tv->vval.v_number == VVAL_TRUE)
+	    result = Qtrue;
+	else if (tv->vval.v_number == VVAL_FALSE)
+	    result = Qfalse;
    } /* else return Qnil; */

    return result;
diff --git a/src/testdir/test_ruby.vim b/src/testdir/test_ruby.vim
@@ -33,6 +33,14 @@ func Test_ruby_evaluate_dict()
  call assert_equal(['{"a"=>"foo", "b"=>123}'], split(l:out, "\n"))
 endfunc

+func Test_ruby_evaluate_special_var()
+  let l = [v:true, v:false, v:null, v:none]
+  redir => l:out
+  ruby d = Vim.evaluate("l"); print d
+  redir END
+  call assert_equal(['[true, false, nil, nil]'], split(l:out, "\n"))
+endfunc
+
 func Test_rubydo()
  " Check deleting lines does not trigger ml_get error.
  new
diff --git a/src/version.c b/src/version.c
@@ -798,6 +798,8 @@ static char *(features[]) =

 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    220,
 /**/
    219,
 /**/