[tekui-devel] tekui: DirList: class now loads without LuaFileSystem; Slider: d...

[Timm S. Mueller]

details:   http://hg.teklib.org/tekui/rev/80d726d3acb0
changeset: 31:80d726d3acb0
user:      Timm S. Mueller <tmueller at schulze-mueller.de>
date:      Tue Oct 28 23:22:38 2008 +0100
description:
DirList: class now loads without LuaFileSystem; Slider: division-by-zero
conditions fixed

diffs (truncated from 134 to 100 lines):

diff -r cefea66846eb -r 80d726d3acb0 doc/manual.html
--- a/doc/manual.html	Sat Oct 25 21:14:29 2008 +0200
+++ b/doc/manual.html	Tue Oct 28 23:22:38 2008 +0100
@@ -419,7 +419,7 @@
 			</p>
 			<hr />
 		</div>
-		<div class="node"><h2><a name="tek.ui.class.dirlist" id="tek.ui.class.dirlist">DirList (v9.0)</a></h2>
+		<div class="node"><h2><a name="tek.ui.class.dirlist" id="tek.ui.class.dirlist">DirList (v9.1)</a></h2>
 			<div class="definition"><dfn>LINEAGE</dfn>
 				<blockquote>
 					<p>
@@ -2273,7 +2273,7 @@
 				<hr />
 			</div>
 		</div>
-		<div class="node"><h2><a name="tek.ui.class.slider" id="tek.ui.class.slider">Slider (v6.15)</a></h2>
+		<div class="node"><h2><a name="tek.ui.class.slider" id="tek.ui.class.slider">Slider (v6.16)</a></h2>
 			<div class="definition"><dfn>LINEAGE</dfn>
 				<blockquote>
 					<p>
@@ -7256,7 +7256,7 @@ Class.checkDescend(Button, Area)
 </pre>
 		<hr />
 		<p>
-			Document generated on Wed Oct 22 23:42:47 2008
+			Document generated on Tue Oct 28 23:19:33 2008
 		</p>
 	</div>
 	</body>
diff -r cefea66846eb -r 80d726d3acb0 src/exec/Makefile
--- a/src/exec/Makefile	Sat Oct 25 21:14:29 2008 +0200
+++ b/src/exec/Makefile	Tue Oct 28 23:22:38 2008 +0100
@@ -20,9 +20,9 @@ LIBS = $(LIBDIR)/libexec.a
 	$(CC) $(MODCFLAGS) -o $@ $(OBJDIR)/exec_mod.lo -L$(LIBDIR) -ltekc -ltekdebug $(PLATFORM_LIBS)
 
 $(BINDIR)/scanmodules: tests/scanmodules.c
-	$(CC) $(BINCFLAGS) $(BINLFLAGS) -o $@ $? -L$(LIBDIR) -ltekcmain -ltekdebug $(PLATFORM_LIBS)
+	$(CC) $(BINCFLAGS) $(BINLFLAGS) -o $@ $? -L$(LIBDIR) -ltekcmain -ltekdebug -ldl $(PLATFORM_LIBS)
 $(BINDIR)/interval: tests/interval.c
-	$(CC) $(BINCFLAGS) $(BINLFLAGS) -o $@ $? -L$(LIBDIR) -ltekcmain -ltekdebug $(PLATFORM_LIBS)
+	$(CC) $(BINCFLAGS) $(BINLFLAGS) -o $@ $? -L$(LIBDIR) -ltekcmain -ltekdebug -ldl $(PLATFORM_LIBS)
 
 ###############################################################################
 
diff -r cefea66846eb -r 80d726d3acb0 tek/ui/class/dirlist.lua
--- a/tek/ui/class/dirlist.lua	Sat Oct 25 21:14:29 2008 +0200
+++ b/tek/ui/class/dirlist.lua	Tue Oct 28 23:22:38 2008 +0100
@@ -52,8 +52,8 @@
 --
 -------------------------------------------------------------------------------
 
-local lfs = require "lfs"
 local db = require "tek.lib.debug"
+local _, lfs = pcall(require, "lfs")
 local ui = require "tek.ui"
 local List = require "tek.class.list"
 
@@ -62,15 +62,13 @@ local Text = ui.Text
 local Text = ui.Text
 local TextInput = ui.TextInput
 
-local dir = lfs.dir
 local insert = table.insert
 local pairs = pairs
 local pcall = pcall
 local sort = table.sort
-local stat = lfs.attributes
 
 module("tek.ui.class.dirlist", tek.ui.class.group)
-_VERSION = "DirList 9.0"
+_VERSION = "DirList 9.1"
 
 local DirList = _M
 
@@ -81,7 +79,7 @@ local DirList = _M
 -------------------------------------------------------------------------------
 
 function DirList:getDirectoryIterator(path)
-	local success, dir = pcall(dir, path)
+	local success, dir = pcall(lfs.dir, path)
 	if success then
 		return function()
 			local e
@@ -105,7 +103,7 @@ end
 -------------------------------------------------------------------------------
 
 function DirList:getFileStat(path, name, attr, idx)
-	return stat(path .. "/" .. name, attr)
+	return lfs.attributes(path .. "/" .. name, attr)
 end
 
 -------------------------------------------------------------------------------
diff -r cefea66846eb -r 80d726d3acb0 tek/ui/class/slider.lua
--- a/tek/ui/class/slider.lua	Sat Oct 25 21:14:29 2008 +0200
+++ b/tek/ui/class/slider.lua	Tue Oct 28 23:22:38 2008 +0100
@@ -71,7 +71,7 @@ local min = math.min
 local min = math.min
 
 module("tek.ui.class.slider", tek.ui.class.numeric)