patch 9.1.1024: blob2str/str2blob() do not support list of strings
Problem: blob2str/str2blob() do not support list of strings
(after v9.1.1016)
Solution: Add support for using a list of strings (Yegappan Lakshmanan)
closes: #16459
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 9fc954c..5e0fd7d 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -4262,23 +4262,32 @@
" Tests for the str2blob() function
func Test_str2blob()
let lines =<< trim END
- call assert_equal(0z, str2blob(""))
- call assert_fails("call str2blob([])", 'E1174: String required for argument 1')
- call assert_equal(0z6162, str2blob("ab"))
- call assert_equal(0zC2ABC2BB, str2blob("«»"))
- call assert_equal(0zC59DC59F, str2blob("ŝş"))
- call assert_equal(0zE0AE85E0.AE87, str2blob("அஇ"))
- call assert_equal(0zF09F81B0.F09F81B3, str2blob("🁰🁳"))
- call assert_equal(0z616263, str2blob('abc', {}))
- call assert_equal(0zABBB, str2blob('«»', {'encoding': 'latin1'}))
- call assert_equal(0zC2ABC2BB, str2blob('«»', {'encoding': 'utf8'}))
+ call assert_equal(0z, str2blob([""]))
+ call assert_equal(0z, str2blob([]))
+ call assert_equal(0z, str2blob(test_null_list()))
+ call assert_equal(0z, str2blob([test_null_string(), test_null_string()]))
+ call assert_fails("call str2blob('')", 'E1211: List required for argument 1')
+ call assert_equal(0z61, str2blob(["a"]))
+ call assert_equal(0z6162, str2blob(["ab"]))
+ call assert_equal(0z610062, str2blob(["a\nb"]))
+ call assert_equal(0z61620A6364, str2blob(["ab", "cd"]))
+ call assert_equal(0z0A, str2blob(["", ""]))
- call assert_fails("call str2blob('abc', [])", 'E1206: Dictionary required for argument 2')
- call assert_fails("call str2blob('abc', {'encoding': []})", 'E730: Using a List as a String')
- call assert_fails("call str2blob('abc', {'encoding': 'ab12xy'})", 'E1515: Unable to convert to ''ab12xy'' encoding')
- call assert_fails("call str2blob('ŝş', {'encoding': 'latin1'})", 'E1515: Unable to convert to ''latin1'' encoding')
- call assert_fails("call str2blob('அஇ', {'encoding': 'latin1'})", 'E1515: Unable to convert to ''latin1'' encoding')
- call assert_fails("call str2blob('🁰🁳', {'encoding': 'latin1'})", 'E1515: Unable to convert to ''latin1'' encoding')
+ call assert_equal(0zC2ABC2BB, str2blob(["«»"]))
+ call assert_equal(0zC59DC59F, str2blob(["ŝş"]))
+ call assert_equal(0zE0AE85E0.AE87, str2blob(["அஇ"]))
+ call assert_equal(0zF09F81B0.F09F81B3, str2blob(["🁰🁳"]))
+ call assert_equal(0z616263, str2blob(['abc'], {}))
+ call assert_equal(0zABBB, str2blob(['«»'], {'encoding': 'latin1'}))
+ call assert_equal(0zABBB0AABBB, str2blob(['«»', '«»'], {'encoding': 'latin1'}))
+ call assert_equal(0zC2ABC2BB, str2blob(['«»'], {'encoding': 'utf8'}))
+
+ call assert_fails("call str2blob(['abc'], [])", 'E1206: Dictionary required for argument 2')
+ call assert_fails("call str2blob(['abc'], {'encoding': []})", 'E730: Using a List as a String')
+ call assert_fails("call str2blob(['abc'], {'encoding': 'ab12xy'})", 'E1515: Unable to convert to ''ab12xy'' encoding')
+ call assert_fails("call str2blob(['ŝş'], {'encoding': 'latin1'})", 'E1515: Unable to convert to ''latin1'' encoding')
+ call assert_fails("call str2blob(['அஇ'], {'encoding': 'latin1'})", 'E1515: Unable to convert to ''latin1'' encoding')
+ call assert_fails("call str2blob(['🁰🁳'], {'encoding': 'latin1'})", 'E1515: Unable to convert to ''latin1'' encoding')
END
call v9.CheckLegacyAndVim9Success(lines)
endfunc
@@ -4286,18 +4295,23 @@
" Tests for the blob2str() function
func Test_blob2str()
let lines =<< trim END
- call assert_equal("", blob2str(0z))
+ call assert_equal([], blob2str(0z))
+ call assert_equal([], blob2str(test_null_blob()))
call assert_fails("call blob2str([])", 'E1238: Blob required for argument 1')
- call assert_equal("ab", blob2str(0z6162))
- call assert_equal("«»", blob2str(0zC2ABC2BB))
- call assert_equal("ŝş", blob2str(0zC59DC59F))
- call assert_equal("அஇ", blob2str(0zE0AE85E0.AE87))
- call assert_equal("🁰🁳", blob2str(0zF09F81B0.F09F81B3))
- call assert_equal('«»', blob2str(0zABBB, {'encoding': 'latin1'}))
- call assert_equal('«»', blob2str(0zC2ABC2BB, {'encoding': 'utf8'}))
+ call assert_equal(["ab"], blob2str(0z6162))
+ call assert_equal(["a\nb"], blob2str(0z610062))
+ call assert_equal(["ab", "cd"], blob2str(0z61620A6364))
+
+ call assert_equal(["«»"], blob2str(0zC2ABC2BB))
+ call assert_equal(["ŝş"], blob2str(0zC59DC59F))
+ call assert_equal(["அஇ"], blob2str(0zE0AE85E0.AE87))
+ call assert_equal(["🁰🁳"], blob2str(0zF09F81B0.F09F81B3))
+ call assert_equal(['«»'], blob2str(0zABBB, {'encoding': 'latin1'}))
+ call assert_equal(['«»'], blob2str(0zC2ABC2BB, {'encoding': 'utf8'}))
#" Invalid encoding
call assert_fails("call blob2str(0z80)", "E1515: Unable to convert from 'utf-8' encoding")
+ call assert_fails("call blob2str(0z610A80)", "E1515: Unable to convert from 'utf-8' encoding")
call assert_fails("call blob2str(0zC0)", "E1515: Unable to convert from 'utf-8' encoding")
call assert_fails("call blob2str(0zE0)", "E1515: Unable to convert from 'utf-8' encoding")
call assert_fails("call blob2str(0zF0)", "E1515: Unable to convert from 'utf-8' encoding")