patch 8.2.0532: cannot use simplify() as a method

Problem:    Cannot use simplify() as a method.
Solution:   Add FEARG_1. (closes #5996)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 3c0a1ae7f9f98869485a94f4ba77a5845985db17..981a358348491125744bc8d0e9a975f100062f74 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -9024,6 +9024,8 @@ simplify({filename})                                      *simplify()*
                directory.  In order to resolve all the involved symbolic
                links before simplifying the path name, use |resolve()|.
 
+               Can also be used as a |method|: >
+                       GetName()->simplify()
 
 sin({expr})                                            *sin()*
                Return the sine of {expr}, measured in radians, as a |Float|.

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 40fb9e96b90743455b424b6ad419e9c2814f3c0b..7170c0e1fe676381234df67071f6f04f3362f9f3 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -837,7 +837,7 @@ static funcentry_T global_functions[] =
     {"sign_undefine",  0, 1, FEARG_1,    ret_number,   SIGN_FUNC(f_sign_undefine)},
     {"sign_unplace",   1, 2, FEARG_1,    ret_number,   SIGN_FUNC(f_sign_unplace)},
     {"sign_unplacelist", 1, 2, FEARG_1,          ret_list_number, SIGN_FUNC(f_sign_unplacelist)},
-    {"simplify",       1, 1, 0,          ret_string,   f_simplify},
+    {"simplify",       1, 1, FEARG_1,    ret_string,   f_simplify},
     {"sin",            1, 1, FEARG_1,    ret_float,    FLOAT_FUNC(f_sin)},
     {"sinh",           1, 1, FEARG_1,    ret_float,    FLOAT_FUNC(f_sinh)},
     {"sort",           1, 3, FEARG_1,    ret_list_any, f_sort},

diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 427e404c874ba0accabf09e8eb27918d63b534d8..2cf90061a8d043c9bf796cf77d2cb48b4a7ff796 100644 (file)
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -450,7 +450,7 @@ func Test_simplify()
   call assert_equal('/',           simplify('/.'))
   call assert_equal('/',           simplify('/..'))
   call assert_equal('/...',        simplify('/...'))
-  call assert_equal('./dir/file',  simplify('./dir/file'))
+  call assert_equal('./dir/file',  './dir/file'->simplify())
   call assert_equal('./dir/file',  simplify('.///dir//file'))
   call assert_equal('./dir/file',  simplify('./dir/./file'))
   call assert_equal('./file',      simplify('./dir/../file'))

diff --git a/src/version.c b/src/version.c
index 63f811c49248cf027874b4f6191febd0bcd5fbc9..99ffd90f7e1f021a0e8426c8be224eff29846bfe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    532,
 /**/
     531,
 /**/