summary refs log tree commit diff stats
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Adam Hankiewicz <gradha@imap.cc>2012-12-14 23:32:11 +0100
committerGrzegorz Adam Hankiewicz <gradha@imap.cc>2012-12-17 20:15:43 +0100
commitacfe55ab906ba2fbe14f3c19f085cabe2cbe25c5 (patch)
treebfe584c2240abb632b305333b7461e444b9fcb32 /lib
parent77492158aca520b6f5192885147953aa35e830b2 (diff)
downloadNim-acfe55ab906ba2fbe14f3c19f085cabe2cbe25c5.tar.gz
Adds macosx dynamic library name for libiconv.
Also adds some verbosity to the implicit test.
Diffstat (limited to 'lib')
-rwxr-xr-xlib/pure/encodings.nim15
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")