library-mirrors/moonscript
1
0
Fork 0
mirror of https://github.com/leafo/moonscript.git synced 2025-01-09 00:04:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix grammar in watch mode

Browse Source
This commit is contained in:
leaf corcoran 2011-10-09 14:52:50 -07:00
parent aa514ebae9
commit 9c8828e8fa
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
moonc
View File

@ -244,6 +244,14 @@ function get_sleep_func()
return sleep return sleep
end end
function plural(count, word)
if count ~= 1 then
word = word .. "s"
end
return table.concat({count, word}, " ")
end
-- returns an iterator that returns files that have been updated -- returns an iterator that returns files that have been updated
function create_watcher(files) function create_watcher(files)
local msg = "Starting watch loop, Ctrl-C to exit" local msg = "Starting watch loop, Ctrl-C to exit"
@ -261,7 +269,7 @@ function create_watcher(files)
dirs = remove_dups(dirs) dirs = remove_dups(dirs)
return coroutine.wrap(function() return coroutine.wrap(function()
print(("%s with inotify [%d dirs]"):format(msg, #dirs)) print(("%s with inotify [%s]"):format(msg, plural(#dirs, "dir")))
local wd_table = {} local wd_table = {}
local handle = inotify:init() local handle = inotify:init()
@ -271,12 +279,7 @@ function create_watcher(files)
end end
while true do while true do
local success, events = pcall(handle.read, handle) local events = handle:read()
if not success then
print "break in handler"
break
end
if events then if events then
for _, ev in ipairs(events) do for _, ev in ipairs(events) do
local fname = wd_table[ev.wd]..ev.name local fname = wd_table[ev.wd]..ev.name
@ -293,7 +296,7 @@ function create_watcher(files)
-- poll the filesystem instead -- poll the filesystem instead
local sleep = get_sleep_func() local sleep = get_sleep_func()
return coroutine.wrap(function() return coroutine.wrap(function()
print(("%s with polling [%d files]"):format(msg, #files)) print(("%s with polling [%s]"):format(msg, plural(#files, "file")))
local mod_time = {} local mod_time = {}
while true do while true do