@@ -66,11 +66,9 @@ def updatePSPLibdoc(nidEntries, xmlFile, version=None):
66
66
for library in prx .findall ("LIBRARIES/LIBRARY" ):
67
67
libraryName = library .find ("NAME" ).text
68
68
libraryList .append (libraryName )
69
- nidList = []
70
- for (nidtype , funvar ) in [('fun' , x ) for x in library .findall ("FUNCTIONS/FUNCTION" )] + [('var' , x ) for x in library .findall ("VARIABLES/VARIABLE" )]:
69
+ for funvar in library .findall ("FUNCTIONS/FUNCTION" ) + library .findall ("VARIABLES/VARIABLE" ):
71
70
numTotalFunctions = numTotalFunctions + 1
72
71
funvarNID = funvar .find ("NID" ).text .upper ().removeprefix ('0X' )
73
- nidList .append ((nidtype , funvarNID ))
74
72
funvarName = funvar .find ("NAME" ).text
75
73
libDocNidNameUnk = funvarName .upper ().endswith (funvarNID )
76
74
@@ -104,10 +102,17 @@ def updatePSPLibdoc(nidEntries, xmlFile, version=None):
104
102
if entries [nid ].prx == prxFile and entries [nid ].libraryName not in libraryList :
105
103
libs = prx .find ("LIBRARIES" )
106
104
lib = ET .SubElement (libs , "LIBRARY" )
107
- ET .SubElement (lib , "NAME" ).text = nidEntry .libraryName
108
- ET .SubElement (lib , "FLAGS" ).text = nidEntry .libraryFlags
105
+ ET .SubElement (lib , "NAME" ).text = entries [nid ].libraryName
106
+ ET .SubElement (lib , "FLAGS" ).text = entries [nid ].libraryFlags
107
+ libraryList .append (entries [nid ].libraryName )
109
108
110
109
for library in prx .findall ("LIBRARIES/LIBRARY" ):
110
+ libraryName = library .find ("NAME" ).text
111
+ nidList = []
112
+ for (nidtype , funvar ) in [('fun' , x ) for x in library .findall ("FUNCTIONS/FUNCTION" )] + [('var' , x ) for x in library .findall ("VARIABLES/VARIABLE" )]:
113
+ funvarNID = funvar .find ("NID" ).text .upper ().removeprefix ('0X' )
114
+ nidList .append ((nidtype , funvarNID ))
115
+
111
116
for nid in entries :
112
117
if entries [nid ].libraryName == libraryName and entries [nid ].prx == prxFile and (entries [nid ].nidtype , nid ) not in nidList :
113
118
name = "FUNCTION" if entries [nid ].nidtype == 'fun' else "VARIABLE"
0 commit comments