Fix. Version on Lua 5.3

5 files changed, 24 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 4e65b9b..6b389e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ install:
 
 script: 
   - cd test
+  - lua test_version.lua
   - lua test_table_copy.lua
   - lua test_threads.lua 10
   - lua test_llthreads.lua
diff --git a/LICENSE b/LICENSE
index 484264b..54690c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Alexey Melnichuk
+Copyright (c) 2013-2015 Alexey Melnichuk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/lakefile b/lakefile
index 9df24ac..960dd77 100644
--- a/lakefile
+++ b/lakefile
@@ -27,6 +27,7 @@ install = target('install', {
 

 target('test', install, function()

   -- run_test('test_register_llthreads.lua')

+  run_test('test_version.lua')

   run_test('test_join_timeout.lua')

   run_test('test_llthreads.lua')

   run_test('test_table_copy.lua')

diff --git a/src/llthread.c b/src/llthread.c
index 74784ae..c2831eb 100644
--- a/src/llthread.c
+++ b/src/llthread.c
@@ -4,8 +4,8 @@
 
 #define LLTHREAD_VERSION_MAJOR 0
 #define LLTHREAD_VERSION_MINOR 1
-#define LLTHREAD_VERSION_PATCH 3
-// #define LLTHREAD_VERSION_COMMENT "dev"
+#define LLTHREAD_VERSION_PATCH 4
+#define LLTHREAD_VERSION_COMMENT "dev"
 
 #ifndef USE_PTHREAD
 #  include <windows.h>
@@ -705,9 +705,9 @@ static const struct luaL_Reg l_llthread_meth[] = {
 //{ version
 
 static int l_llthread_version(lua_State *L){
-  lua_pushnumber(L, LLTHREAD_VERSION_MAJOR);
-  lua_pushnumber(L, LLTHREAD_VERSION_MINOR);
-  lua_pushnumber(L, LLTHREAD_VERSION_PATCH);
+  lua_pushinteger(L, LLTHREAD_VERSION_MAJOR);
+  lua_pushinteger(L, LLTHREAD_VERSION_MINOR);
+  lua_pushinteger(L, LLTHREAD_VERSION_PATCH);
 #ifdef LLTHREAD_VERSION_COMMENT
   if(LLTHREAD_VERSION_COMMENT[0]){
     lua_pushliteral(L, LLTHREAD_VERSION_COMMENT);
@@ -718,11 +718,11 @@ static int l_llthread_version(lua_State *L){
 }
 
 static int l_llthread_push_version(lua_State *L){
-  lua_pushnumber(L, LLTHREAD_VERSION_MAJOR);
+  lua_pushinteger(L, LLTHREAD_VERSION_MAJOR);
   lua_pushliteral(L, ".");
-  lua_pushnumber(L, LLTHREAD_VERSION_MINOR);
+  lua_pushinteger(L, LLTHREAD_VERSION_MINOR);
   lua_pushliteral(L, ".");
-  lua_pushnumber(L, LLTHREAD_VERSION_PATCH);
+  lua_pushinteger(L, LLTHREAD_VERSION_PATCH);
 #ifdef LLTHREAD_VERSION_COMMENT
   if(LLTHREAD_VERSION_COMMENT[0]){
     lua_pushliteral(L, "-"LLTHREAD_VERSION_COMMENT);
diff --git a/test/test_version.lua b/test/test_version.lua
new file mode 100644
index 0000000..2101900
--- /dev/null
+++ b/test/test_version.lua
@@ -0,0 +1,13 @@
+local llthreads = require"llthreads"
+
+local a,b,c,d = llthreads.version()
+
+local str = ("%d.%d.%d"):format(a,b,c)
+if d then str = str .. "-" .. d end
+
+assert(str == llthreads._VERSION,
+  tostring(str) .. " is not eaqual to " .. tostring(llthreads._VERSION)
+)
+
+print("Done!")
+