Changeset 40

Timestamp:

05/01/2011 11:41:27 PM (2 years ago)

Author:

reyalP

Message:

allow strings for single rlib names, comments

File:

• trunk/lua/chdku.lua (modified) (12 diffs)

trunk/lua/chdku.lua

@@ -51 +51 @@
         libs={},
 }
-
 --[[
 register{
         name='libname'
-        depend={'lib1','lib2'...}, -- already registered rlibs this one requires (cyclic deps not allowed)
+        depend='lib'|{'lib1','lib2'...}, -- already registered rlibs this one requires (cyclic deps not allowed)
         code='', -- main lib code.
 }
 ]]
 function rlibs:register(t)
-        if type(t.depend) == 'nil' then
+        -- for convenience, single lib may be given as string
+        if type(t.depend) == 'string' then
+                t.depend = {t.depend}
+        elseif type(t.depend) == 'nil' then
                 t.depend = {}
         elseif type(t.depend) ~= 'table' then
-                error('expected dependency table')
+                error('expected dependency table or string')
         end
         if type(t.code) ~= 'string' then
@@ -108 +110 @@
 --[[
 return a list of rlibs in dependency order
+t=rlibs:build_list('name'|{'name1','name2',...})
 ]]
 function rlibs:build_list(libnames)
+        -- single can be given as string
+        if type(libnames) == 'string' then
+                libnames={libnames}
+        elseif type(libnames) ~= 'table' then
+                error('rlibs:build_list expected string or table for libnames')
+        end
         local build={
                 list={},
@@ -121 +130 @@
 --[[
 return a string containing all the required rlib code
+code=rlibs:build('name'|{'name1','name2',...})
 ]]
 function rlibs:build(names)
@@ -187 +197 @@
         end
 end
-
 serialize_defaults = {
         maxdepth=10,
@@ -194 +203 @@
         pretty=false,
 }
-
 function serialize(v,opts)
         if opts then
@@ -212 +220 @@
 {
         name='serialize_msgs',
-        depend={'serialize'},
+        depend='serialize',
         code=[[
         usb_msg_table_to_string=serialize
@@ -258 +266 @@
 {
         name='msg_batcher',
-        depend={'serialize_msgs'},
+        depend='serialize_msgs',
         code=[[
 function msg_batcher(opts_in)
@@ -299 +307 @@
 {
         name='ls_simple',
-        depend={'msg_batcher'},
+        depend='msg_batcher',
         code=[[
 function ls_simple(path)
@@ -347 +355 @@
 {
         name='ls',
-        depend={'serialize_msgs'},
+        depend='serialize_msgs',
         code=[[
 function ls(path,opts_in)
@@ -418 +426 @@
                 {
                         wait=true,
-                        libs={'ls'},
+                        libs='ls',
                         msgs=function(msg)
                                 if msg.subtype ~= 'table' then
@@ -482 +490 @@
                 -- syntax error, try to fetch the error message
                 if err == 'syntax' then
+                        -- TODO extract error line and match with code
                         local msg = chdku.get_error_msg()
                         if msg then
@@ -531 +540 @@
                                 else
                                         -- if serialize_msgs is not selected, table return values will be strings
+                                        -- TODO not updated for new rlib yet
                                         if msg.subtype == 'table' and in_table(opts.libs,'serialize_msgs') then
                                                 results[i] = unserialize(msg.value)