Changes in tools/xstruct.py [cc1a727:5749372] in mainline

File:

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

tools/xstruct.py

@@ -1 +1 @@
 #
 # Copyright (c) 2008 Martin Decky
-# Copyright (c) 2011 Martin Sucha
 # All rights reserved.
 #
@@ -32 +31 @@
 
 import struct
-import types
-
-ranges = {
-        'B': ((int, long), 0x00, 0xff),
-        'H': ((int, long), 0x0000, 0xffff),
-        'L': ((int, long), 0x00000000, 0xffffffff),
-        'Q': ((int, long), 0x0000000000000000, 0xffffffffffffffff),
-        'b': ((int, long), -0x80, 0x7f),
-        'h': ((int, long), -0x8000, 0x7fff),
-        'l': ((int, long), -0x80000000, 0x7fffffff) ,
-        'q': ((int, long), -0x8000000000000000, 0x7fffffffffffffff),
-}
-
-def check_range(varname, fmt, value):
-        if value == None:
-                raise ValueError('Variable "%s" not set' % varname)
-        if not fmt in ranges:
-                return
-        vartype, varmin, varmax = ranges[fmt]
-        if not isinstance(value, vartype):
-                raise ValueError('Variable "%s" is %s but should be %s' %
-                                 (varname, str(type(value)), str(vartype)))
-        if value < varmin or value > varmax:
-                raise ValueError('Variable "%s" value %s out of range %s..%s' % 
-                                 (varname, repr(value), repr(varmin), repr(varmax)))
 
 class Struct:
@@ -64 +38 @@
         def pack(self):
                 args = []
-                for variable, fmt, length in self._args_:
-                        value = self.__dict__[variable]
-                        if isinstance(value, list):
-                                if length != None and length != len(value):
-                                        raise ValueError('Variable "%s" length %u does not match %u' %
-                                                      (variable, len(value), length))
-                                for index, item in enumerate(value):
-                                        check_range(variable + '[' + repr(index) + ']', fmt, item)
+                for variable in self._args_:
+                        if (isinstance(self.__dict__[variable], list)):
+                                for item in self.__dict__[variable]:
                                         args.append(item)
                         else:
-                                check_range(variable, fmt, value)
-                                args.append(value)              
+                                args.append(self.__dict__[variable])
+                
                 return struct.pack(self._format_, *args)
-        
-        def unpack(self, data):
-                values = struct.unpack(self._format_, data)
-                i = 0
-                for variable, fmt, length in self._args_:
-                        self.__dict__[variable] = values[i]
-                        i += 1
 
 def create(definition):
@@ -115 +77 @@
                         subtokens = token.split("[")
                         
-                        length = None
                         if (len(subtokens) > 1):
-                                length = int(subtokens[1].split("]")[0])
-                                format += "%d" % length
+                                format += "%d" % int(subtokens[1].split("]")[0])
                         
                         format += variable
                         
                         inst.__dict__[subtokens[0]] = None
-                        args.append((subtokens[0], variable, length))
+                        args.append(subtokens[0])
                         
                         variable = None