Changeset 0516fd7 in mainline for tools/xstruct.py

Timestamp:

2008-08-09T23:46:00Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8f2a852

Parents:

838e14e2

Message:

structure objects: variable names, comments

File:

• tools/xstruct.py (modified) (3 diffs)

tools/xstruct.py

@@ -27 +27 @@
 #
 """
-Convert descriptive structure definitions to struct formats
+Convert descriptive structure definitions to structure object
 """
 
 import struct
 
-def convert(definition):
-        "Convert structure defition to struct format"
+class Struct:
+        def size(self):
+                return struct.calcsize(self._format_)
+        
+        def pack(self):
+                list = []
+                for variable in self._list_:
+                        list.append(self.__dict__[variable])
+                
+                return struct.pack(self._format_, *list)
+
+def create(definition):
+        "Create structure object"
         
         tokens = definition.split(None)
         
         # Initial byte order tag
-        struct = {
+        format = {
                 "little:":  lambda: "<",
                 "big:":     lambda: ">",
                 "network:": lambda: "!"
         }[tokens[0]]()
+        inst = Struct()
+        list = []
         
         # Member tags
-        
         comment = False
+        variable = False
         for token in tokens[1:]:
                 if (comment):
@@ -53 +66 @@
                         continue
                 
+                if (variable):
+                        inst.__dict__[token] = None
+                        list.append(token)
+                        variable = False
+                        continue
+                
                 if (token == "/*"):
                         comment = True
+                elif (token[0:8] == "padding["):
+                        size = token[8:].split("]")[0]
+                        format += "%dx" % int(size)
                 elif (token[0:5] == "char["):
                         size = token[5:].split("]")[0]
-                        struct += ("%d" % int(size)) + "s"
+                        format += "%ds" % int(size)
+                        variable = True
                 else:
-                        struct += {
+                        format += {
                                 "uint8_t":  lambda: "B",
                                 "uint16_t": lambda: "H",
@@ -70 +93 @@
                                 "int64_t":  lambda: "q"
                         }[token]()
+                        variable = True
         
-        return struct
-
-def little_string(string):
-        return struct.pack("<" + ("%d" % len(string)) + "s", string)
-
-def little_padding(length):
-        return struct.pack("<" + ("%d" % length) + "x")
+        inst.__dict__['_format_'] = format
+        inst.__dict__['_list_'] = list
+        return inst