diff options
| author | Etiene Dalcol <Etiene@users.noreply.github.com> | 2017-09-26 13:07:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 13:07:58 +0100 |
| commit | b48176ea59c485056b07bd6f01aad5c6407c27d9 (patch) | |
| tree | a583321f2e160c1c5e89bb612dc1ea2c3865fdf3 | |
| parent | faadfbd2a948ec053d1c705b3bc8cd3d990c9f51 (diff) | |
| parent | 28b2fc636d658daaf1a64f57e137b78d4330b2b6 (diff) | |
| download | valua-b48176ea59c485056b07bd6f01aad5c6407c27d9.tar.gz valua-b48176ea59c485056b07bd6f01aad5c6407c27d9.tar.bz2 valua-b48176ea59c485056b07bd6f01aad5c6407c27d9.zip | |
Merge pull request #18 from fperrad/noconv
Fix with Lua 5.3 no-conversion
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | valua-test.lua | 2 | ||||
| -rw-r--r-- | valua.lua | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 3cd431f..fdc86fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ env: - LUA="lua 5.2" COMPAT=none - LUA="lua 5.3" COMPAT=default - LUA="lua 5.3" COMPAT=none + - LUA="lua 5.3" COMPAT=default CFLAGS="-DLUA_NOCVTN2S -DLUA_NOCVTS2N" - LUA="luajit 2.0" COMPAT=none - LUA="luajit 2.0" COMPAT=all - LUA="luajit 2.1" COMPAT=none @@ -14,7 +15,7 @@ env: before_install: - pip install hererocks - - hererocks HERE --$LUA --compat $COMPAT --no-readline --luarocks latest --verbose + - hererocks HERE --$LUA --compat $COMPAT --cflags="$CFLAGS" --no-readline --luarocks latest --verbose - hererocks HERE --show - source HERE/bin/activate diff --git a/valua-test.lua b/valua-test.lua index a4cb0dd..c12a1a4 100644 --- a/valua-test.lua +++ b/valua-test.lua @@ -3,7 +3,7 @@ local passing = true local function check(val_test, test_value, expected, n) local res,err = val_test(test_value) - local msg = "Validation "..n.." " + local msg = "Validation "..tostring(n).." " if res == expected then msg = msg.. "succeeded" @@ -19,7 +19,8 @@ -- reusable_validation("test!") -- true -- -local tinsert,setmetatable,len,match,tonumber = table.insert,setmetatable,string.len,string.match,tonumber +local tinsert,setmetatable,len,match = table.insert,setmetatable,string.len,string.match +local tonumber,tostring = tonumber,tostring local next,type,floor,ipairs = next,type,math.floor, ipairs local unpack = unpack or table.unpack local pack = table.pack or function(...) return { n = select('#', ...), ... } end @@ -86,7 +87,7 @@ end -- String function valua._len(value,min,max) local l = len(value or '') - if l < min or l > max then return false,"should have "..min.."-"..max.." characters" end + if l < min or l > max then return false,"should have "..tostring(min).."-"..tostring(max).." characters" end return true end @@ -125,12 +126,12 @@ end -- Numbers function valua._min(value,n) - if not empty(value) and value < n then return false,"must be greater than "..n end + if not empty(value) and value < n then return false,"must be greater than "..tostring(n) end return true end function valua._max(value,n) - if not empty(value) and value > n then return false,"must not be greater than "..n end + if not empty(value) and value > n then return false,"must not be greater than "..tostring(n) end return true end |