diff -ruN luadoc.orig/analyze.lua luadoc/analyze.lua --- luadoc.orig/analyze.lua 2005-06-29 10:11:23.000000000 +0200 +++ luadoc/analyze.lua 2005-06-29 10:15:19.000000000 +0200 @@ -20,10 +20,10 @@ function Gappend (field) return function (value) - local t = global_table[%field] + local t = global_table[field] if type(t) ~= "table" then t = { n = 0 } - global_table[%field] = t + global_table[field] = t end tinsert (t, filter (value)) end @@ -41,10 +41,10 @@ function Gappend_pair (field) return function (index, value) - local t = global_table[%field] + local t = global_table[field] if type(t) ~= "table" then t = { n = 0 } - global_table[%field] = t + global_table[field] = t end tinsert (t, { index, filter (value) }) end @@ -63,10 +63,10 @@ function Ginsert (field) return function (index, value) - local t = global_table[%field] + local t = global_table[field] if type (t) ~= "table" then t = { n = 0 } - global_table[%field] = t + global_table[field] = t end t[index] = filter (value) end @@ -94,7 +94,7 @@ -- @see Tappend. function Tcreate (field) - return function (value) current_table[%field] = filter (value) end + return function (value) current_table[field] = filter (value) end end ----------------------------------------------------------------- @@ -109,10 +109,10 @@ function Tappend (field) return function (value) - local t = current_table[%field] + local t = current_table[field] if type(t) ~= "table" then t = { n = 0 } - current_table[%field] = t + current_table[field] = t end tinsert (t, filter (value)) end @@ -131,10 +131,10 @@ function Tinsert (field) return function (index, value) - local t = current_table[%field] + local t = current_table[field] if type (t) ~= "table" then t = { n = 0 } - current_table[%field] = t + current_table[field] = t end t[index] = filter (value) end @@ -151,7 +151,7 @@ function Treturn (field) return function () - current_table.parent[%field] = current_table + current_table.parent[field] = current_table end end @@ -167,7 +167,7 @@ -- @see Tappend. function Ucreate (field) - return function (value) current_table.parent[%field] = filter (value) end + return function (value) current_table.parent[field] = filter (value) end end ----------------------------------------------------------------- @@ -183,10 +183,10 @@ function Uappend (field) return function (value) - local t = current_table.parent[%field] + local t = current_table.parent[field] if type(t) ~= "table" then t = { n = 0 } - current_table.parent[%field] = t + current_table.parent[field] = t end tinsert (t, filter (value)) end @@ -231,7 +231,7 @@ local tr = type (rep) if tr == "table" then source = gsub (source, find, function (new_source) - return apply (new_source, %rep, Tson (current_table)) + return apply (new_source, rep, Tson (current_table)) end) else source = gsub (source, find, rep) @@ -271,7 +271,7 @@ function analyze (in_file, desc_file, out_file) -- load substitutions file. - assert (dofile (desc_file)) + dofile (desc_file) -- load source string. readfrom (in_file) local source = read ("*a") diff -ruN luadoc.orig/cmp.lua luadoc/cmp.lua --- luadoc.orig/cmp.lua 2005-06-29 10:11:23.000000000 +0200 +++ luadoc/cmp.lua 2005-06-29 10:15:19.000000000 +0200 @@ -11,6 +11,9 @@ table = 1, ["function"] = 1, ["nil"] = 1, + boolean = 1,userdata = 1, + NULL = 1, + tabela = 1, numero = 1, @@ -27,13 +30,13 @@ -- string. function first_rest (str) - local t = %types + local t = types t.first = nil t.rest = nil local _ = gsub (str, "^(%S+)(.*)$", function (f,r) - if %t[strlower (f)] then - %t.first = f - %t.rest = r + if t[strlower (f)] then + t.first = f + t.rest = r end end) if _ then @@ -72,20 +75,20 @@ function anchor (f) return function (field_value) - return ''..%f (field_value)..'' + return ''..f (field_value)..'' end end function link_rel (f) return function (field_value) - return ''..%f (field_value)..'' + return ''..f (field_value)..'' end end function link_abs (f) return function (field_value) field_value = gsub (field_value, "^.*/([^/]+)$", "%1") - return ''..%f (field_value)..'' + return ''..f (field_value)..'' end end @@ -97,7 +100,7 @@ function link_abs_2 (f) return function (field_value) field_value = gsub (field_value, "^.*/([^/]+)$", "%1") - return %f (field_value)..'' + return f (field_value)..'' end end @@ -115,8 +118,8 @@ -- @param source Table with source data. function MakeTitle (source) - if source.class and CMP.section_name ~= %section_names[source.class] then - CMP.section_name = %section_names[source.class] + if source.class and CMP.section_name ~= section_names[source.class] then + CMP.section_name = section_names[source.class] CMP.write ("

\n"..CMP.section_name.."\n

") end end @@ -157,7 +160,7 @@ end end end - return "
"..%label.."\n"..s + return "
"..label.."\n"..s end end @@ -179,7 +182,7 @@ end end end - return "
"..%label.."\n"..s.."
\n" + return "
"..label.."\n"..s.."
\n" end end @@ -191,14 +194,14 @@ local t = { f = "", n = v, } if strfind (v, "#", 1, 1) then gsub (v, "^([^#]+)#([^#]+)$", function (file, name) - %t.f = file..".html" - %t.n = name + t.f = file..".html" + t.n = name end) end s = s..'
'..t.n..'\n' end end - return "
"..%label.."\n"..s + return "
"..label.."\n"..s end end @@ -211,13 +214,13 @@ e = e.."" end return function (field_value) - return %b..field_value..%e.."\n" + return b..field_value..e.."\n" end end function Citemize (label, linebreak) return function (field_value) - return ""..%label..": "..field_value..%linebreak.."\n" + return ""..label..": "..field_value..linebreak.."\n" end end @@ -225,10 +228,10 @@ return function (field_value) local first, rest = first_rest (field_value) if first then - return ""..%label.." "..first..""..rest.. - %linebreak.."\n" + return ""..label.." "..first..""..rest.. + linebreak.."\n" else - return ""..%label.." "..field_value..%linebreak.."\n" + return ""..label.." "..field_value..linebreak.."\n" end end end @@ -249,7 +252,7 @@ { "param_list", Ctags ("code") }, { "value", Citemize_first ("=", "
") }, "