Fixed key names.

sq/lib_glue.c

@@ -39,16 +39,20 @@ SQRESULT register_lib(HSQUIRRELVM v, const SQChar *lib_name, const SQRegFunction
 
 // Key glue data
 #define GLUE_KEY(x) &KEY_NSPIRE_ ## x,
+#define GLUE_NUMBER_KEY(x) &KEY_NSPIRE_ ## x,
 static const t_key const * key_array[] = {
 	#include "n2dlib_keys.xmacro"
 };
 #undef GLUE_KEY
+#undef GLUE_NUMBER_KEY
 
-#define GLUE_KEY(x) "NK_"#x ,
+#define GLUE_KEY(x) #x ,
+#define GLUE_NUMBER_KEY(x) "K_"#x ,
 static const char * key_array_names[] = {
 	#include "n2dlib_keys.xmacro"
 };
 #undef GLUE_KEY
+#undef GLUE_NUMBER_KEY
 // Utilities
 
 SQInteger n2d_itofix (HSQUIRRELVM v)

sq/n2dlib_keys.xmacro

@@ -5,17 +5,17 @@ GLUE_KEY(NEGATIVE)
 GLUE_KEY(Z)
 GLUE_KEY(PERIOD)
 GLUE_KEY(Y)
-GLUE_KEY(0)
+GLUE_NUMBER_KEY(0)
 GLUE_KEY(X)
 GLUE_KEY(THETA)
 GLUE_KEY(COMMA)
 GLUE_KEY(PLUS)
 GLUE_KEY(W)
-GLUE_KEY(3)
+GLUE_NUMBER_KEY(3)
 GLUE_KEY(V)
-GLUE_KEY(2)
+GLUE_NUMBER_KEY(2)
 GLUE_KEY(U)
-GLUE_KEY(1)
+GLUE_NUMBER_KEY(1)
 GLUE_KEY(T)
 GLUE_KEY(eEXP)
 GLUE_KEY(PI)
@@ -23,23 +23,23 @@ GLUE_KEY(QUES)
 GLUE_KEY(QUESEXCL)
 GLUE_KEY(MINUS)
 GLUE_KEY(S)
-GLUE_KEY(6)
+GLUE_NUMBER_KEY(6)
 GLUE_KEY(R)
-GLUE_KEY(5)
+GLUE_NUMBER_KEY(5)
 GLUE_KEY(Q)
-GLUE_KEY(4)
+GLUE_NUMBER_KEY(4)
 GLUE_KEY(P)
 GLUE_KEY(TENX)
 GLUE_KEY(EE)
 GLUE_KEY(COLON)
 GLUE_KEY(MULTIPLY)
 GLUE_KEY(O)
-GLUE_KEY(9)
+GLUE_NUMBER_KEY(9)
 GLUE_KEY(N)
-GLUE_KEY(8)
 GLUE_KEY(M)
-GLUE_KEY(7)
+GLUE_NUMBER_KEY(8)
 GLUE_KEY(L)
+GLUE_NUMBER_KEY(7)
 GLUE_KEY(SQU)
 GLUE_KEY(II)
 GLUE_KEY(QUOTE)
@@ -88,4 +88,4 @@ GLUE_KEY(SHIFT)
 GLUE_KEY(CTRL)
 GLUE_KEY(DOC)
 GLUE_KEY(TRIG)
-GLUE_KEY(SCRATCHPAD)
+GLUE_KEY(SCRATCHPAD)