diff options
author | Emil Renner Berthing <esmil@mailme.dk> | 2012-08-20 09:57:50 +0200 |
---|---|---|
committer | Emil Renner Berthing <esmil@mailme.dk> | 2012-10-15 11:42:50 +0200 |
commit | 368d7c45ff77ae508b502ef714aac9d40ba16a58 (patch) | |
tree | 5a262843140ad789f6036eb0caac86b0bc2b0808 | |
parent | 1307fdea5c26abc67a9c8f569dc6ed9ccf67a4f6 (diff) | |
download | lem-368d7c45ff77ae508b502ef714aac9d40ba16a58.tar.gz lem-368d7c45ff77ae508b502ef714aac9d40ba16a58.tar.xz lem-368d7c45ff77ae508b502ef714aac9d40ba16a58.zip |
utils: rename utils.sleeper() to utils.newsleeper()
-rw-r--r-- | README.markdown | 2 | ||||
-rw-r--r-- | lem/utils.c | 2 | ||||
-rwxr-xr-x | test/ctest.lua | 2 | ||||
-rwxr-xr-x | test/multiplexing.lua | 2 | ||||
-rwxr-xr-x | test/sleep.lua | 4 | ||||
-rwxr-xr-x | test/stest.lua | 2 | ||||
-rwxr-xr-x | test/test.lua | 2 | ||||
-rwxr-xr-x | test/test2.lua | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/README.markdown b/README.markdown index 93b057a..f671f2d 100644 --- a/README.markdown +++ b/README.markdown @@ -116,7 +116,7 @@ This sets `utils` to a table with the following functions. Return the number of seconds since the epoch (1970-01-01 UTC). -* __utils.sleeper()__ +* __utils.newsleeper()__ This function returns a new sleeper object. diff --git a/lem/utils.c b/lem/utils.c index bdef8f9..d74b24f 100644 --- a/lem/utils.c +++ b/lem/utils.c @@ -228,7 +228,7 @@ luaopen_lem_utils(lua_State *L) lua_setfield(L, -2, "sleep"); /* set sleeper function */ lua_pushcclosure(L, sleeper_new, 1); - lua_setfield(L, -2, "sleeper"); + lua_setfield(L, -2, "newsleeper"); /* set spawn function */ lua_pushcfunction(L, utils_spawn); diff --git a/test/ctest.lua b/test/ctest.lua index e0bb6c0..c848ee0 100755 --- a/test/ctest.lua +++ b/test/ctest.lua @@ -22,7 +22,7 @@ print('Entered ' .. arg[0]) local utils = require 'lem.utils' local streams = require 'lem.streams' -local sleeper = utils.sleeper() +local sleeper = utils.newsleeper() local iconn, oconn = assert(streams.tcp_connect('127.0.0.1', arg[1] or 8080)) for i = 1, 10 do diff --git a/test/multiplexing.lua b/test/multiplexing.lua index 8265e4c..b294767 100755 --- a/test/multiplexing.lua +++ b/test/multiplexing.lua @@ -22,7 +22,7 @@ local streams = require 'lem.streams' local queue = require 'lem.streams.queue' local exit = false -local ticker = utils.sleeper() +local ticker = utils.newsleeper() local stdout = queue.wrap(streams.stdout) do diff --git a/test/sleep.lua b/test/sleep.lua index 41f7fe5..ae1ee49 100755 --- a/test/sleep.lua +++ b/test/sleep.lua @@ -20,10 +20,10 @@ local utils = require 'lem.utils' local sum, coros, n = 0, 0, 0 -local done = utils.sleeper() +local done = utils.newsleeper() local function test(t) - local sleeper = utils.sleeper() + local sleeper = utils.newsleeper() local diff = utils.now() sleeper:sleep(t) diff = utils.now() - diff diff --git a/test/stest.lua b/test/stest.lua index f54a415..4fdd42d 100755 --- a/test/stest.lua +++ b/test/stest.lua @@ -32,7 +32,7 @@ end) local ok, err = server:autospawn(function(i, o) print 'Accepted a connection' - local sleeper = utils.sleeper() + local sleeper = utils.newsleeper() while true do local line, err = i:read('*l') diff --git a/test/test.lua b/test/test.lua index 8402e05..c2457e9 100755 --- a/test/test.lua +++ b/test/test.lua @@ -20,7 +20,7 @@ local utils = require 'lem.utils' local function sleep(n) - utils.sleeper():sleep(n) + utils.newsleeper():sleep(n) end local function timer(n, f, ...) diff --git a/test/test2.lua b/test/test2.lua index 4988a0b..29d30f5 100755 --- a/test/test2.lua +++ b/test/test2.lua @@ -22,7 +22,7 @@ print 'Entered test.lua' local utils = require 'lem.utils' local function sleep(n) - utils.sleeper():sleep(n) + utils.newsleeper():sleep(n) end print 'Saying "Fee!" in 1 second' |