Menu
▾
▴
[Wxlua-commit] wxLua/bindings genidocs.lua,1.1,1.2
|
From: John L. <jr...@us...> - 2006-05-17 05:02:08
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/bindings Modified Files: genidocs.lua Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** genidocs.lua 16 May 2006 03:32:28 -0000 1.1 --- genidocs.lua 17 May 2006 05:02:04 -0000 1.2 *************** *** 8,12 **** ------------------------------------------------------------------------------- ! wxClassRef = {} typeDefs = {} -- filled from the data cache files --- 8,12 ---- ------------------------------------------------------------------------------- ! wxWidgetsClassRefTable = {} -- a list of wx classes from the alphabetical class list typeDefs = {} -- filled from the data cache files *************** *** 15,25 **** classColour = "AA0000" ! enumColour = "008800" ! defineColour = "0000EE" ! eventColour = "AA00AA" ! propColour = "000088" ! memberColour = "008888" ! renameColour = "FF0000" ! overrideColour = "AA8800" --<a name="papers">Papers</a> --- 15,44 ---- classColour = "AA0000" ! propColour = "000077" ! memberColour = "005577" ! renameColour = "CC0033" ! overrideColour = "CC3300" ! overloadColour = "CC3333" ! operatorColour = "550077" ! ! enumColour = "007700" ! defineColour = "007755" ! eventColour = "557700" ! ! function GenerateTestColours(fileTable) ! table.insert(fileTable, "<h2>Colours used to denote types</h2>") ! ! table.insert(fileTable, MakeColour("Enums - %enum", enumColour).."<br>") ! table.insert(fileTable, MakeColour("Defines - %define [%string] [%object]", defineColour).."<br>") ! table.insert(fileTable, MakeColour("Events - %define %event", eventColour).."<br>") ! ! table.insert(fileTable, MakeColour("Classes - %class", classColour).."<br>") ! table.insert(fileTable, MakeColour("Class Properties - %property", propColour).."<br>") ! table.insert(fileTable, MakeColour("Class Members - %member", memberColour).."<br>") ! table.insert(fileTable, MakeColour("Renamed Functions - %rename", renameColour).."<br>") ! table.insert(fileTable, MakeColour("Overridden Functions - %override", overrideColour).."<br>") ! table.insert(fileTable, MakeColour("Overloaded Functions - %overload", overloadColour).."<br>") ! table.insert(fileTable, MakeColour("Operator Functions - %operator", operatorColour).."<br>") ! end --<a name="papers">Papers</a> *************** *** 71,80 **** local allClasses = {} ! for k, v in pairs(wxClassRef) do allClasses[k] = false -- wxWidgets classes end for k, v in pairs(dataTypes) do if v.DefType == "class" then ! allClasses[k] = true -- the ones we wrap end end --- 90,99 ---- local allClasses = {} ! for k, v in pairs(wxWidgetsClassRefTable) do allClasses[k] = false -- wxWidgets classes end for k, v in pairs(dataTypes) do if v.DefType == "class" then ! allClasses[k] = true -- the ones we wrap end end *************** *** 85,92 **** table.sort(names) for n = 1, #names do ! if allClasses[names[n]] then ! table.insert(fileTable, MakeLink(names[n]).."<br>") else ! table.insert(fileTable, names[n].." - NOT WRAPPED<br>") end end --- 104,117 ---- table.sort(names) for n = 1, #names do ! local cname = names[n] ! ! if allClasses[cname] then ! if wxWidgetsClassRefTable[cname] then ! table.insert(fileTable, MakeLink(cname).."<br>") ! else ! table.insert(fileTable, MakeLink(cname).." - NOT IN WX REF MANUAL<br>") ! end else ! table.insert(fileTable, cname.." - NOT WRAPPED<br>") end end *************** *** 135,138 **** --- 160,172 ---- end + -- if the tag in the txt is before the ifbefore_pos then return true + function TagIsBefore(txt, tag, ifbefore_pos) + local pos = string.find(txt, tag, 1, 1) + if pos and ((ifbefore_pos == nil) or (pos < ifbefore_pos)) then + return true + end + return false + end + function ReadInterfaceFiles(fileTable) *************** *** 178,217 **** -- priortize the colouring so we don't have to check for every single case ! local endclass_pos = string.find(line, "%endclass", 1, 1) ! local endenum_pos = string.find(line, "%endenum", 1, 1) ! if (endclass_pos and endclass_pos < comment_pos) or (endenum_pos and endenum_pos < comment_pos) then ! if endclass_pos then out_line = MakeColour(out_line, classColour) end ! if endenum_pos then out_line = out_line.."</font>" end end_block = true ! else ! local prop_pos = string.find(line, "%property", 1, 1) ! if (prop_pos and prop_pos < comment_pos) then ! out_line = MakeColour(out_line, propColour) ! else ! local member_pos = string.find(line, "%member", 1, 1) ! if (member_pos and member_pos < comment_pos) then ! out_line = MakeColour(out_line, memberColour) ! else ! local rename_pos = string.find(line, "%rename", 1, 1) ! if (rename_pos and rename_pos < comment_pos) then ! out_line = MakeColour(out_line, renameColour) ! else ! local override_pos = string.find(line, "%override", 1, 1) ! if override_pos then -- always commented in the .i files ! out_line = MakeColour(out_line, overrideColour) ! else ! local event_pos = string.find(line, "%event", 1, 1) ! if (event_pos and event_pos < comment_pos) then ! out_line = MakeColour(out_line, eventColour) ! else ! local define_pos = string.find(line, "%define", 1, 1) ! if define_pos then ! out_line = MakeColour(out_line, defineColour) ! end ! end ! end ! end ! end ! end end end --- 212,235 ---- -- priortize the colouring so we don't have to check for every single case ! if TagIsBefore(line, "%endclass", comment_pos) then ! out_line = MakeColour(out_line, classColour) end_block = true ! elseif TagIsBefore(line, "%endenum", comment_pos) then ! out_line = out_line.."</font>" ! end_block = true ! elseif TagIsBefore(line, "%property", comment_pos) then ! out_line = MakeColour(out_line, propColour) ! elseif TagIsBefore(line, "%member", comment_pos) then ! out_line = MakeColour(out_line, memberColour) ! elseif TagIsBefore(line, "%overload", comment_pos) then ! out_line = MakeColour(out_line, overloadColour) ! elseif TagIsBefore(line, "%rename", comment_pos) then ! out_line = MakeColour(out_line, renameColour) ! elseif TagIsBefore(line, "%override", 1E6) then ! out_line = MakeColour(out_line, overrideColour) ! elseif TagIsBefore(line, "%event", comment_pos) then ! out_line = MakeColour(out_line, eventColour) ! elseif TagIsBefore(line, "%define", comment_pos) then ! out_line = MakeColour(out_line, defineColour) end end *************** *** 263,267 **** for line in io.lines(interface_filepath.."/".."wxclassref.txt") do for w in string.gmatch(line, "([%w_]+)") do ! wxClassRef[w] = true end end --- 281,285 ---- for line in io.lines(interface_filepath.."/".."wxclassref.txt") do for w in string.gmatch(line, "([%w_]+)") do ! wxWidgetsClassRefTable[w] = true end end *************** *** 281,284 **** --- 299,305 ---- end + -- FIXME - hack to add wxSTC + table.insert(interface_fileTable, "../wxstc/stc.i") + local datatypes_file = loadfile(interface_filepath.."/"..datatypes_cache_output_filename) if datatypes_file then *************** *** 305,309 **** --- 326,334 ---- GenerateHeader(fileTable) GenerateClassReference(fileTable) + table.insert(fileTable, "<HR>") GenerateEnumReference(fileTable) + table.insert(fileTable, "<HR>") + GenerateTestColours(fileTable) + table.insert(fileTable, "<HR>") ReadInterfaceFiles(fileTable) GenerateFooter(fileTable) |
