Permalink
Browse files

Meta Data Update

  • Loading branch information...
1 parent 0c328be commit 4b3a69bf7ab66207c67a33b72bc6a0404b5b0e2a @davglass davglass committed Jul 31, 2008
Showing with 19 additions and 1 deletion.
  1. +1 −0 bin/const.py
  2. BIN bin/const.pyc
  3. +4 −0 bin/yuidoc_generate.py
  4. +14 −1 bin/yuidoc_parse.py
View
@@ -59,6 +59,7 @@
SHORTNAME='shortname'
SUBMODULE='submodule'
SUBMODULES='submodules'
+SUBDATA='subdata'
SUPERCLASS='superclass'
SEE='see'
STATIC='static'
View
Binary file not shown.
@@ -308,6 +308,10 @@ def allprop_sort(x, y):
str = 'none'
transferToTemplate(const.SUBMODULES, m, t, str)
+ t.submodules = m[const.SUBMODULES]
+
+ transferToTemplate(const.SUBDATA, m, t, '')
+ t.subdata = m[const.SUBDATA]
moduleprops = []
View
@@ -427,16 +427,24 @@ def parseModule(tokenMap):
log.info("\n\n%s:\n\n%s\n" %("tokenMap", unicode(tokenMap)))
target = None
+ self.subModName = False
if not const.MODULES in self.data: self.data[const.MODULES] = {}
for module in tokenMap[const.MODULE]:
if module not in self.data[const.MODULES]:
- self.data[const.MODULES][module] = { const.NAME: module, const.CLASS_LIST: [], const.FILE_LIST: [], const.SUBMODULES: [] }
+ self.data[const.MODULES][module] = { const.NAME: module, const.CLASS_LIST: [], const.FILE_LIST: [], const.SUBMODULES: [], const.SUBDATA: {} }
target = self.data[const.MODULES][module]
if const.SUBMODULE in tokenMap:
target[const.SUBMODULES].append(tokenMap[const.SUBMODULE][0]);
+ self.subModName = tokenMap[const.SUBMODULE][0];
+ target[const.SUBDATA][self.subModName] = { const.NAME: self.currentClass }
+ if const.DESCRIPTION in tokenMap:
+ target[const.SUBDATA][self.subModName][const.DESCRIPTION] = tokenMap[const.DESCRIPTION][0]
+
+ log.warn('DAV:: ' + self.currentClass);
+
tokenMap.pop(const.SUBMODULE)
if const.DESCRIPTION in tokenMap:
@@ -487,6 +495,11 @@ def parseModule(tokenMap):
if const.MODULE in tokenMap:
target, tokenMap = parseModule(tokenMap)
+
+ if self.subModName:
+ self.data[const.MODULES][self.currentModule][const.SUBDATA][self.subModName][const.NAME] = longName
+ if const.DESCRIPTION in tokenMap:
+ self.data[const.MODULES][self.currentModule][const.SUBDATA][self.subModName][const.DESCRIPTION] = tokenMap[const.DESCRIPTION][0]
if const.GLOBAL in tokenMap:
self.globals[longName] = True

0 comments on commit 4b3a69b

Please sign in to comment.