Changeset 261

Timestamp:

Feb 6, 2011 6:58:11 PM (14 years ago)

Author:

jemian

Message:

writes analyses to XML file, needs improvement

File:

• topdoc/src/TopDoc/CmdReader.py (modified) (8 diffs)

topdoc/src/TopDoc/CmdReader.py ¶

@@ -22 +22 @@
 import pprint
 import CommandTable
+import xml.etree.ElementTree as ET
 
 
@@ -40 +41 @@
     '''
 
-    def __init__(self, filename, symbol, env, commands):
+    def __init__(self, filename, symbol, env, commands, includeFiles):
         '''
         start the process
@@ -53 +54 @@
         self.commands = commands
         self.filename = filename
+        self.includeFiles = includeFiles
         self.os_path, self.os_filename = os.path.split(os.path.join(os.getcwd(), filename))
         self.analysis = self.tokenAnalysis(filename)
@@ -65 +67 @@
         self.os_filename = None     # discovered name of file
         self.includes = []          # any command files included from filename
-        self.lines = {}             # token list
+        #self.lines = {}             # token list
         self.analysis = {}
         self.symbol = None
@@ -95 +97 @@
                 if line['tokens'][0]['tokStr'] == '<':
                     incFile = os.path.join( cwd, line['readline'].strip()[1:].split()[0] )
+                    self.includeFiles.assign(incFile, None, self.filename, lineNumber)
                     self.includes.append( 
                       {
                          'lineNumber': lineNumber,
                          'filename': incFile,
-                         'reader': CmdReader(incFile, self.symbol, self.env, self.commands)
+                         'reader': CmdReader(incFile, self.symbol, self.env, self.commands, self.includeFiles)
                        }
                     )
@@ -109 +112 @@
                     self.symbol.assign(var, arg, self.filename, lineNumber)
                 elif line['tokens'][0]['tokStr'] == 'putenv':
+                    # arguments might not be in token[1] if using parentheses!
                     var, arg = line['tokens'][1]['tokStr'].strip('"').split('=')
                     self.env.assign(var, arg, self.filename, lineNumber)
+                #elif line['tokens'][0]['tokStr'] == 'epicsEnvSet':
+                #    var, arg = line['tokens'][1]['tokStr'].strip('"').split('=')
+                #    self.env.assign(var, arg, self.filename, lineNumber)
                 elif line['tokens'][0]['tokStr'] == 'cd':
                     arg = line['tokens'][1]['tokStr']
@@ -125 +132 @@
                     self.commands.record(cmd, arg, self.filename, lineNumber)
 
+    def __xmlNode_Dict(self, parent, tag, name, dict):
+        '''
+        write dictionary as subnode to XML file
+        @param parent: parent XML node
+        @param tag: name for this XML node
+        @param name: attribute of tag
+        @param dict: dictionary to write
+        @return: XML node
+        @note: Move this routine to another class, it is not recursive
+        '''
+        node = ET.SubElement(parent, tag)
+        node.attrib["name"] = name
+        for k, v in dict.items():
+            self.__xmlNode_NameValue(node, k, None, str( v ))
+        return node
+
+    def __xmlNode_NameValue(self, parent, tag, name, value):
+        '''
+        write name/value pair as subnode to XML file
+        @param parent: parent XML node
+        @param tag: name for this XML node
+        @param name: attribute of tag
+        @param value: value to write
+        @return: XML node
+        @note: Move this routine to another class, it is not recursive
+        '''
+        node = ET.SubElement(parent, tag)
+        if name != None:
+            node.attrib["name"] = name
+        if value != None:
+            node.text = str( value )
+        return node
+
+    def toXml(self, xmlFile):
+        '''
+        write class data to XML file
+        '''
+        root = ET.Element("CmdReader")
+        
+        lists = {
+                    "env": self.env, 
+                    "symbol": self.symbol, 
+                    "commands": self.commands,
+                    "includeFiles": self.includeFiles
+                 }
+        for k, v in lists.items():
+            node = ET.SubElement(root, "list")
+            node.attrib["name"] = k
+            item = 0
+            for dict in v.list:
+                item += 1
+                self.__xmlNode_Dict(node, k, str(item), dict)
+
+        # this only gets the first file!
+        node = ET.SubElement(root, "analysis")
+        node.attrib["name"] = self.filename
+        for lineNumber in self.analysis['numbers']:
+            dict = self.analysis[lineNumber]
+            line = ET.SubElement(node, "line")
+            line.attrib["number"] = str(lineNumber)
+            for item in "pattern readline".split():
+                self.__xmlNode_NameValue(line, item, None, dict[item].strip())
+            tokenNodes = ET.SubElement(line, "tokens")
+            count = 0
+            for token in dict['tokens']:
+                count += 1
+                tokenNode = ET.SubElement(tokenNodes, "token")
+                tokenNode.attrib['number'] = str(count)
+                for item in "tokName tokType start end tokStr".split():
+                    self.__xmlNode_NameValue(tokenNode, item, None, str(token[item]).strip())
+        
+        # wrap it in an ElementTree instance, and save as XML
+        tree = ET.ElementTree(root)
+        tree.write(xmlFile)
+
 
 if __name__ == '__main__':
@@ -136 +218 @@
     env = SymbolTable.Symbols()
     commands = CommandTable.Commands()
-    cr = CmdReader( dict['cmdFile'], symbols, env, commands)
+    includeFiles = SymbolTable.Symbols()
+    cr = CmdReader( dict['cmdFile'], symbols, env, commands, includeFiles)
 
     os.chdir( pwd )
-
-    print "\n\n Environment variables:"
-    for dict in env.list:
-        print '<%s,%d> %s = %s' % (dict['file'], dict['line'], dict['name'], dict['value'])
-
-    print "\n\n Global symbol table:"
-    for dict in symbols.list:
-        print '<%s,%d> %s = %s' % (dict['file'], dict['line'], dict['name'], dict['value'])
-
-    print "\n\n Global command list:"
-    for dict in commands.list:
-        print '<%s,%d> %s %s' % (dict['file'], dict['line'], dict['command'], dict['args'])
+    cr.toXml("myTestXmlFile.xml")