changeset 14411:504091aca571 v8.1.0220

patch 8.1.0220: Ruby converts v:true and v:false to a number commit https://github.com/vim/vim/commit/d84b26a03b13cd816d80ff32b61e8de740d499ce Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 28 17:18:09 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Sat, 28 Jul 2018 17:30:06 +0200
parents 52f6ab1e154a
children 6578f440d130
files src/if_ruby.c src/testdir/test_ruby.vim src/version.c
diffstat 3 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    220,
+/**/
     219,
 /**/
     218,