Commit 11318986 authored by Sophie Wenzel-Teuber's avatar Sophie Wenzel-Teuber
Browse files

Fix bug in doxygen xml parser

parent abb0b971
......@@ -152,8 +152,12 @@ class Member(Compound):
super().fill(node, memberName)
type = ""
type = parse_description.parseParaRecursive\
(node.find('type'), type, self.references, None)
if(node.find('type') is not None):
type = parse_description.parseParaRecursive\
(node.find('type'), type, self.references, None)
else:
logging.warning("Member.fill: Node 'type' not found in " + memberName)
self.variableType = type
if self.kind == "function" and type != "":
self.parameters.setReturnParameter(type)
......
......@@ -17,6 +17,9 @@ def checkForTemplateBrackets(text):
return text
def replaceNodesWithMarkdown(node):
if(node == None):
return node
nodeAsString = ET.tostring(node, encoding='unicode')
codeRegex = r"(<computeroutput>\s*)"
......@@ -130,6 +133,8 @@ def parseULink(ulinkNode, description):
def parseParaRecursive(paraNode, description, references, parameterList):
if(paraNode == None):
return ""
paraNode = replaceNodesWithMarkdown(paraNode)
if paraNode.text:
......
......@@ -11,6 +11,10 @@ build_dir="${source_dir}/build/fiphoboserver"
mkdir ${build_dir}
cd ${build_dir}
cmake -DCMAKE_PREFIX_PATH="$source_dir/build/install" -DCUSTOM_DOCU_PATH="$source_dir/external/doxygen-xml-parser/src" ${fiphoboserver_source_dir}
cmake \
-DFIPHOBOSERVER_BUILD_TESTS=ON \
-DCMAKE_PREFIX_PATH="$source_dir/build/install" \
-DCUSTOM_DOCU_PATH="$source_dir/external/doxygen-xml-parser/src" \
${fiphoboserver_source_dir}
make clean
make
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment