Fix #75 - support char and char* #defines

nimterop/getters.nim

@@ -203,11 +203,14 @@ proc getPtrType*(str: string): string =
       str
 
 proc getLit*(str: string): string =
+  # Used to convert #define literals into const
   let
     str = str.replace(re"/[/*].*?(?:\*/)?$", "").strip()
 
-  if str.contains(re"^[\-]?[\d]*[.]?[\d]+$") or
+  if str.contains(re"^[\-]?[\d]*[.]?[\d]+$") or # decimal
-    str.contains(re"^0x[\da-fA-F]+$"):
+    str.contains(re"^0x[\da-fA-F]+$") or        # hexadecimal
+    str.contains(re"^'[[:ascii:]]'$") or        # char
+    str.contains(re"""^"[[:ascii:]]+"$"""):     # char *
     return str
 
 proc getNodeVal*(nimState: NimState, node: TSNode): string =

tests/include/test.h

@@ -9,6 +9,8 @@ extern "C" {
 #define TEST_INT 512
 #define TEST_FLOAT 5.12
 #define TEST_HEX 0x512
+#define TEST_CHAR 'a'
+#define TEST_STR "hello world"
 
 #ifdef __APPLE__
 #define OSDEF 10

tests/lzma.nim

@@ -8,6 +8,11 @@ const
 
 static:
   cDebug()
+  cSkipSymbol(@[
+    "PRIX8", "PRIX16", "PRIX32",
+    "PRIXLEAST8", "PRIXLEAST16", "PRIXLEAST32",
+    "PRIXFAST8"
+  ])
 
 when defined(envTest):
   setDefines(@["lzmaStd"])

tests/tnimterop_c.nim

@@ -46,6 +46,8 @@ cImport cSearchPath "test.h"
 check TEST_INT == 512
 check TEST_FLOAT == 5.12
 check TEST_HEX == 0x512
+check TEST_CHAR == 'a'
+check TEST_STR == "hello world"
 
 when defined(osx):
   check OSDEF == 10