diff options
author | Araq <rumpf_a@web.de> | 2012-12-18 17:27:29 -0800 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2012-12-18 17:27:29 -0800 |
commit | 3e514cd5dc1f95561be4fa39bf4881fb40be9529 (patch) | |
tree | 78f001d1bdcadd0c9f20497a07b46af4a402818b /lib | |
parent | 0abc135fd7a121f82e9b2fb689049f8fd38553db (diff) | |
parent | acfe55ab906ba2fbe14f3c19f085cabe2cbe25c5 (diff) | |
download | Nim-3e514cd5dc1f95561be4fa39bf4881fb40be9529.tar.gz |
Merge pull request #276 from gradha/pr_adds_macosx_libiconv_name
Adds macosx dynamic library name for libiconv.
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/pure/encodings.nim | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/pure/encodings.nim b/lib/pure/encodings.nim index 6421b6f44..ce4238409 100755 --- a/lib/pure/encodings.nim +++ b/lib/pure/encodings.nim @@ -254,6 +254,8 @@ when defined(windows): else: when defined(haiku): const iconvDll = "(libc.so.6|libiconv.so|libtextencoding.so)" + elif defined(macosx): + const iconvDll = "libiconv.dylib" else: const iconvDll = "(libc.so.6|libiconv.so)" @@ -449,8 +451,13 @@ proc convert*(s: string, destEncoding = "UTF-8", close(c) when IsMainModule: - var orig = "öäüß" - var crap = convert(orig, "CP1252", "UTF-8") - echo convert(crap, "ibm850", "CP1252") - echo getCurrentEncoding() + let + orig = "öäüß" + cp1252 = convert(orig, "CP1252", "UTF-8") + ibm850 = convert(cp1252, "ibm850", "CP1252") + current = getCurrentEncoding() + echo "Original string from source code: ", orig + echo "Forced ibm850 encoding: ", ibm850 + echo "Current encoding: ", current + echo "From ibm850 to current: ", convert(ibm850, current, "ibm850") |