aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Melnichuk <mimir@newmail.ru>2015-01-19 13:15:10 +0400
committerAlexey Melnichuk <mimir@newmail.ru>2015-01-19 13:16:13 +0400
commit0b5ddda597e3cab29d04918319b52673695ee2d2 (patch)
tree7cda73ce075552215b2f7759bf4563f041c2f540
parent7b05a0a79a6da66d85ec78e140fa425eb01d6ba0 (diff)
downloadlua-llthreads2-0b5ddda597e3cab29d04918319b52673695ee2d2.tar.gz
lua-llthreads2-0b5ddda597e3cab29d04918319b52673695ee2d2.tar.bz2
lua-llthreads2-0b5ddda597e3cab29d04918319b52673695ee2d2.zip
Fix. Version on Lua 5.3
-rw-r--r--.travis.yml1
-rw-r--r--LICENSE2
-rw-r--r--lakefile1
-rw-r--r--src/llthread.c16
-rw-r--r--test/test_version.lua13
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:
22 22
23script: 23script:
24 - cd test 24 - cd test
25 - lua test_version.lua
25 - lua test_table_copy.lua 26 - lua test_table_copy.lua
26 - lua test_threads.lua 10 27 - lua test_threads.lua 10
27 - lua test_llthreads.lua 28 - lua test_llthreads.lua
diff --git a/LICENSE b/LICENSE
index 484264b..54690c7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
1The MIT License (MIT) 1The MIT License (MIT)
2 2
3Copyright (c) 2013 Alexey Melnichuk 3Copyright (c) 2013-2015 Alexey Melnichuk
4 4
5Permission is hereby granted, free of charge, to any person obtaining a copy of 5Permission is hereby granted, free of charge, to any person obtaining a copy of
6this software and associated documentation files (the "Software"), to deal in 6this 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', {
27 27
28target('test', install, function() 28target('test', install, function()
29 -- run_test('test_register_llthreads.lua') 29 -- run_test('test_register_llthreads.lua')
30 run_test('test_version.lua')
30 run_test('test_join_timeout.lua') 31 run_test('test_join_timeout.lua')
31 run_test('test_llthreads.lua') 32 run_test('test_llthreads.lua')
32 run_test('test_table_copy.lua') 33 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 @@
4 4
5#define LLTHREAD_VERSION_MAJOR 0 5#define LLTHREAD_VERSION_MAJOR 0
6#define LLTHREAD_VERSION_MINOR 1 6#define LLTHREAD_VERSION_MINOR 1
7#define LLTHREAD_VERSION_PATCH 3 7#define LLTHREAD_VERSION_PATCH 4
8// #define LLTHREAD_VERSION_COMMENT "dev" 8#define LLTHREAD_VERSION_COMMENT "dev"
9 9
10#ifndef USE_PTHREAD 10#ifndef USE_PTHREAD
11# include <windows.h> 11# include <windows.h>
@@ -705,9 +705,9 @@ static const struct luaL_Reg l_llthread_meth[] = {
705//{ version 705//{ version
706 706
707static int l_llthread_version(lua_State *L){ 707static int l_llthread_version(lua_State *L){
708 lua_pushnumber(L, LLTHREAD_VERSION_MAJOR); 708 lua_pushinteger(L, LLTHREAD_VERSION_MAJOR);
709 lua_pushnumber(L, LLTHREAD_VERSION_MINOR); 709 lua_pushinteger(L, LLTHREAD_VERSION_MINOR);
710 lua_pushnumber(L, LLTHREAD_VERSION_PATCH); 710 lua_pushinteger(L, LLTHREAD_VERSION_PATCH);
711#ifdef LLTHREAD_VERSION_COMMENT 711#ifdef LLTHREAD_VERSION_COMMENT
712 if(LLTHREAD_VERSION_COMMENT[0]){ 712 if(LLTHREAD_VERSION_COMMENT[0]){
713 lua_pushliteral(L, LLTHREAD_VERSION_COMMENT); 713 lua_pushliteral(L, LLTHREAD_VERSION_COMMENT);
@@ -718,11 +718,11 @@ static int l_llthread_version(lua_State *L){
718} 718}
719 719
720static int l_llthread_push_version(lua_State *L){ 720static int l_llthread_push_version(lua_State *L){
721 lua_pushnumber(L, LLTHREAD_VERSION_MAJOR); 721 lua_pushinteger(L, LLTHREAD_VERSION_MAJOR);
722 lua_pushliteral(L, "."); 722 lua_pushliteral(L, ".");
723 lua_pushnumber(L, LLTHREAD_VERSION_MINOR); 723 lua_pushinteger(L, LLTHREAD_VERSION_MINOR);
724 lua_pushliteral(L, "."); 724 lua_pushliteral(L, ".");
725 lua_pushnumber(L, LLTHREAD_VERSION_PATCH); 725 lua_pushinteger(L, LLTHREAD_VERSION_PATCH);
726#ifdef LLTHREAD_VERSION_COMMENT 726#ifdef LLTHREAD_VERSION_COMMENT
727 if(LLTHREAD_VERSION_COMMENT[0]){ 727 if(LLTHREAD_VERSION_COMMENT[0]){
728 lua_pushliteral(L, "-"LLTHREAD_VERSION_COMMENT); 728 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 @@
1local llthreads = require"llthreads"
2
3local a,b,c,d = llthreads.version()
4
5local str = ("%d.%d.%d"):format(a,b,c)
6if d then str = str .. "-" .. d end
7
8assert(str == llthreads._VERSION,
9 tostring(str) .. " is not eaqual to " .. tostring(llthreads._VERSION)
10)
11
12print("Done!")
13