Allow mika to use "-" as an identifier

3 files changed, 69 insertions, 30 deletions

diff --git a/src/h_lua_common.c b/src/h_lua_common.c
index 11a598e..6526c3c 100644
--- a/src/h_lua_common.c
+++ b/src/h_lua_common.c
@@ -51,7 +51,7 @@ lua_common_putenv (char *str)
   value = index (str, '=');
   if (value)
     {
-      *value = (char) NULL;
+      *value = (char) '\0';
       value++;
     }
   else
diff --git a/src/haserl_lualib.inc b/src/haserl_lualib.inc
index 608c57f..e533384 100644
--- a/src/haserl_lualib.inc
+++ b/src/haserl_lualib.inc
@@ -1,8 +1,9 @@
-/* This file was automatically generated from foo. DO NOT EDIT */
+/* This file was automatically generated from haserl_lualib.lua. DO NOT EDIT */
 
 static const unsigned char haserl_lualib[] = { 
-   27, 76,117, 97, 81,  0,  1,  4,  4,  4,  8,  0,  3,  0,  0,  0,
-   61, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  3, 16,
+   27, 76,117, 97, 81,  0,  1,  4,  4,  4,  8,  0, 19,  0,  0,  0,
+   64,104, 97,115,101,114,108, 95,108,117, 97,108,105, 98, 46,108,
+  117, 97,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  3, 16,
     0,  0,  0, 10,  0,  0,  0, 74,  0,  0,  0,138,  0,  0,  0,135,
   128,  0,  0, 71, 64,  0,  0,  7,  0,  0,  0,  5,  0,  0,  0,100,
     0,  0,  0,  9, 64,128,129,  5,  0,  0,  0,100, 64,  0,  0,  9,
@@ -23,29 +24,67 @@ static const unsigned char haserl_lualib[] = {
   225,128,  0,  0, 22,128,250,127, 30,  0,128,  0,  6,  0,  0,  0,
     4,  3,  0,  0,  0, 95, 71,  0,  4,  7,  0,  0,  0,115,116,114,
   105,110,103,  0,  4,  6,  0,  0,  0,103,102,105,110,100,  0,  4,
-   13,  0,  0,  0, 40, 91, 37,119, 95, 93, 43, 41, 40, 46, 63, 41,
-    0,  4,  9,  0,  0,  0,116,111,110,117,109, 98,101,114,  0,  4,
-    2,  0,  0,  0, 46,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39,  0,  0,  0, 45,  0,
-    0,  0,  0,  1,  0,  8, 12,  0,  0,  0, 69,  0,  0,  0,133, 64,
-    0,  0,134,128, 64,  1,192,  0,  0,  0,  1,193,  0,  0,156,  0,
-  129,  1, 22,  0,  0,128, 70, 64,129,  0,161, 64,  0,  0, 22,  0,
-  255,127, 94,  0,  0,  1, 30,  0,128,  0,  4,  0,  0,  0,  4,  3,
-    0,  0,  0, 95, 71,  0,  4,  7,  0,  0,  0,115,116,114,105,110,
-  103,  0,  4,  6,  0,  0,  0,103,102,105,110,100,  0,  4,  7,  0,
-    0,  0, 91, 37,119, 95, 93, 43,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,  0,  0,
-    0, 53,  0,  0,  0,  0,  2,  0,  6, 20,  0,  0,  0,133,  0,  0,
-    0,134, 64, 64,  1,192,  0,  0,  0,  1,129,  0,  0, 65,193,  0,
-    0,156,128,  0,  2,  0,  0,  0,  1,133,  0,  0,  0,134, 64, 64,
-    1,192,  0,  0,  0,  1,  1,  1,  0, 65,193,  0,  0,156,128,  0,
-    2,  0,  0,  0,  1,133, 64,  1,  0,134,128, 65,  1,192,  0,  0,
-    0,  0,  1,128,  0,156, 64,128,  1, 30,  0,128,  0,  7,  0,  0,
-    0,  4,  7,  0,  0,  0,115,116,114,105,110,103,  0,  4,  5,  0,
-    0,  0,103,115,117, 98,  0,  4,  7,  0,  0,  0, 91, 92, 93, 92,
-   91, 93,  0,  4,  2,  0,  0,  0, 46,  0,  4,  6,  0,  0,  0, 91,
-   92, 46, 93, 43,  0,  4,  7,  0,  0,  0,104, 97,115,101,114,108,
-    0,  4,  9,  0,  0,  0,115,101,116,102,105,101,108,100,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+   15,  0,  0,  0, 40, 91, 37,119, 95, 37, 45, 93, 43, 41, 40, 46,
+   63, 41,  0,  4,  9,  0,  0,  0,116,111,110,117,109, 98,101,114,
+    0,  4,  2,  0,  0,  0, 46,  0,  0,  0,  0,  0, 29,  0,  0,  0,
+   25,  0,  0,  0, 26,  0,  0,  0, 26,  0,  0,  0, 26,  0,  0,  0,
+   26,  0,  0,  0, 26,  0,  0,  0, 26,  0,  0,  0, 27,  0,  0,  0,
+   27,  0,  0,  0, 27,  0,  0,  0, 27,  0,  0,  0, 27,  0,  0,  0,
+   28,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0, 28,  0,  0,  0,
+   30,  0,  0,  0, 30,  0,  0,  0, 31,  0,  0,  0, 31,  0,  0,  0,
+   31,  0,  0,  0, 31,  0,  0,  0, 31,  0,  0,  0, 32,  0,  0,  0,
+   32,  0,  0,  0, 34,  0,  0,  0, 26,  0,  0,  0, 35,  0,  0,  0,
+   37,  0,  0,  0,  8,  0,  0,  0,  2,  0,  0,  0,102,  0,  0,  0,
+    0,  0, 28,  0,  0,  0,  2,  0,  0,  0,118,  0,  0,  0,  0,  0,
+   28,  0,  0,  0,  2,  0,  0,  0,116,  0,  1,  0,  0,  0, 28,  0,
+    0,  0, 16,  0,  0,  0, 40,102,111,114, 32,103,101,110,101,114,
+   97,116,111,114, 41,  0,  6,  0,  0,  0, 28,  0,  0,  0, 12,  0,
+    0,  0, 40,102,111,114, 32,115,116, 97,116,101, 41,  0,  6,  0,
+    0,  0, 28,  0,  0,  0, 14,  0,  0,  0, 40,102,111,114, 32, 99,
+  111,110,116,114,111,108, 41,  0,  6,  0,  0,  0, 28,  0,  0,  0,
+    2,  0,  0,  0,119,  0,  7,  0,  0,  0, 26,  0,  0,  0,  2,  0,
+    0,  0,100,  0,  7,  0,  0,  0, 26,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 39,  0,  0,  0, 45,  0,  0,  0,  0,  1,  0,  8,
+   12,  0,  0,  0, 69,  0,  0,  0,133, 64,  0,  0,134,128, 64,  1,
+  192,  0,  0,  0,  1,193,  0,  0,156,  0,129,  1, 22,  0,  0,128,
+   70, 64,129,  0,161, 64,  0,  0, 22,  0,255,127, 94,  0,  0,  1,
+   30,  0,128,  0,  4,  0,  0,  0,  4,  3,  0,  0,  0, 95, 71,  0,
+    4,  7,  0,  0,  0,115,116,114,105,110,103,  0,  4,  6,  0,  0,
+    0,103,102,105,110,100,  0,  4,  7,  0,  0,  0, 91, 37,119, 95,
+   93, 43,  0,  0,  0,  0,  0, 12,  0,  0,  0, 40,  0,  0,  0, 41,
+    0,  0,  0, 41,  0,  0,  0, 41,  0,  0,  0, 41,  0,  0,  0, 41,
+    0,  0,  0, 41,  0,  0,  0, 42,  0,  0,  0, 41,  0,  0,  0, 42,
+    0,  0,  0, 44,  0,  0,  0, 45,  0,  0,  0,  6,  0,  0,  0,  2,
+    0,  0,  0,102,  0,  0,  0,  0,  0, 11,  0,  0,  0,  2,  0,  0,
+    0,118,  0,  1,  0,  0,  0, 11,  0,  0,  0, 16,  0,  0,  0, 40,
+  102,111,114, 32,103,101,110,101,114, 97,116,111,114, 41,  0,  6,
+    0,  0,  0, 10,  0,  0,  0, 12,  0,  0,  0, 40,102,111,114, 32,
+  115,116, 97,116,101, 41,  0,  6,  0,  0,  0, 10,  0,  0,  0, 14,
+    0,  0,  0, 40,102,111,114, 32, 99,111,110,116,114,111,108, 41,
+    0,  6,  0,  0,  0, 10,  0,  0,  0,  2,  0,  0,  0,119,  0,  7,
+    0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 47,
+    0,  0,  0, 53,  0,  0,  0,  0,  2,  0,  6, 20,  0,  0,  0,133,
+    0,  0,  0,134, 64, 64,  1,192,  0,  0,  0,  1,129,  0,  0, 65,
+  193,  0,  0,156,128,  0,  2,  0,  0,  0,  1,133,  0,  0,  0,134,
+   64, 64,  1,192,  0,  0,  0,  1,  1,  1,  0, 65,193,  0,  0,156,
+  128,  0,  2,  0,  0,  0,  1,133, 64,  1,  0,134,128, 65,  1,192,
+    0,  0,  0,  0,  1,128,  0,156, 64,128,  1, 30,  0,128,  0,  7,
+    0,  0,  0,  4,  7,  0,  0,  0,115,116,114,105,110,103,  0,  4,
+    5,  0,  0,  0,103,115,117, 98,  0,  4,  7,  0,  0,  0, 91, 92,
+   93, 92, 91, 93,  0,  4,  2,  0,  0,  0, 46,  0,  4,  6,  0,  0,
+    0, 91, 92, 46, 93, 43,  0,  4,  7,  0,  0,  0,104, 97,115,101,
+  114,108,  0,  4,  9,  0,  0,  0,115,101,116,102,105,101,108,100,
+    0,  0,  0,  0,  0, 20,  0,  0,  0, 49,  0,  0,  0, 49,  0,  0,
+    0, 49,  0,  0,  0, 49,  0,  0,  0, 49,  0,  0,  0, 49,  0,  0,
+    0, 49,  0,  0,  0, 50,  0,  0,  0, 50,  0,  0,  0, 50,  0,  0,
+    0, 50,  0,  0,  0, 50,  0,  0,  0, 50,  0,  0,  0, 50,  0,  0,
+    0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,  0,  0, 52,  0,  0,
+    0, 52,  0,  0,  0, 53,  0,  0,  0,  2,  0,  0,  0,  4,  0,  0,
+    0,107,101,121,  0,  0,  0,  0,  0, 19,  0,  0,  0,  6,  0,  0,
+    0,118, 97,108,117,101,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,
+    0,  0,  0, 16,  0,  0,  0, 21,  0,  0,  0, 21,  0,  0,  0, 21,
+    0,  0,  0, 21,  0,  0,  0, 21,  0,  0,  0, 21,  0,  0,  0, 23,
+    0,  0,  0, 37,  0,  0,  0, 23,  0,  0,  0, 39,  0,  0,  0, 45,
+    0,  0,  0, 39,  0,  0,  0, 47,  0,  0,  0, 53,  0,  0,  0, 47,
+    0,  0,  0, 53,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
 };
diff --git a/src/haserl_lualib.lua b/src/haserl_lualib.lua
index 045dbd3..94e0e43 100644
--- a/src/haserl_lualib.lua
+++ b/src/haserl_lualib.lua
@@ -23,7 +23,7 @@ haserl, FORM, ENV = {}, {}, {}
 function haserl.setfield (f, v)
 						-- From programming in Lua 1st Ed.
 	local t = _G    			-- start with the table of globals
-	for w, d in string.gfind(f, '([%w_]+)(.?)') do
+	for w, d in string.gfind(f, '([%w_%-]+)(.?)') do
 		if (tonumber(w)) then
 			w = tonumber(w)
 		end