Use BasicState for code reducing

diff --git a/pyderasn.py b/pyderasn.py
index ced46ddeb0f4fde4ca6f9be75120e9d1d421e1c2..39d2f2f3fe4260193b5f96959b9c47325b828318 100755 (executable)
--- a/pyderasn.py
+++ b/pyderasn.py
@@ -1077,6 +1077,21 @@ class AutoAddSlots(type):
         return type.__new__(cls, name, bases, _dict)
 
 
+BasicState = namedtuple("BasicState", (
+    "version",
+    "tag",
+    "expl",
+    "default",
+    "optional",
+    "offset",
+    "llen",
+    "vlen",
+    "expl_lenindef",
+    "lenindef",
+    "ber_encoded",
+), **NAMEDTUPLE_KWARGS)
+
+
 @add_metaclass(AutoAddSlots)
 class Obj(object):
     """Common ASN.1 object class
@@ -1149,17 +1164,16 @@ class Obj(object):
     def __setstate__(self, state):
         if state.version != __version__:
             raise ValueError("data is pickled by different PyDERASN version")
-        self.tag = self.tag_default
-        self._value = None
-        self._expl = None
-        self.default = None
-        self.optional = False
-        self.offset = 0
-        self.llen = 0
-        self.vlen = 0
-        self.expl_lenindef = False
-        self.lenindef = False
-        self.ber_encoded = False
+        self.tag = state.tag
+        self._expl = state.expl
+        self.default = state.default
+        self.optional = state.optional
+        self.offset = state.offset
+        self.llen = state.llen
+        self.vlen = state.vlen
+        self.expl_lenindef = state.expl_lenindef
+        self.lenindef = state.lenindef
+        self.ber_encoded = state.ber_encoded
 
     @property
     def tlen(self):
@@ -1749,20 +1763,11 @@ def pprint(
 # ASN.1 primitive types
 ########################################################################
 
-BooleanState = namedtuple("BooleanState", (
-    "version",
-    "value",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-), **NAMEDTUPLE_KWARGS)
+BooleanState = namedtuple(
+    "BooleanState",
+    BasicState._fields + ("value",),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class Boolean(Obj):
@@ -1822,7 +1827,6 @@ class Boolean(Obj):
     def __getstate__(self):
         return BooleanState(
             __version__,
-            self._value,
             self.tag,
             self._expl,
             self.default,
@@ -1833,21 +1837,12 @@ class Boolean(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self._value,
         )
 
     def __setstate__(self, state):
         super(Boolean, self).__setstate__(state)
         self._value = state.value
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
 
     def __nonzero__(self):
         self._assert_ready()
@@ -1990,23 +1985,11 @@ class Boolean(Obj):
             yield pp
 
 
-IntegerState = namedtuple("IntegerState", (
-    "version",
-    "specs",
-    "value",
-    "bound_min",
-    "bound_max",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-), **NAMEDTUPLE_KWARGS)
+IntegerState = namedtuple(
+    "IntegerState",
+    BasicState._fields + ("specs", "value", "bound_min", "bound_max"),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class Integer(Obj):
@@ -2113,10 +2096,6 @@ class Integer(Obj):
     def __getstate__(self):
         return IntegerState(
             __version__,
-            self.specs,
-            self._value,
-            self._bound_min,
-            self._bound_max,
             self.tag,
             self._expl,
             self.default,
@@ -2127,6 +2106,10 @@ class Integer(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self.specs,
+            self._value,
+            self._bound_min,
+            self._bound_max,
         )
 
     def __setstate__(self, state):
@@ -2135,16 +2118,6 @@ class Integer(Obj):
         self._value = state.value
         self._bound_min = state.bound_min
         self._bound_max = state.bound_max
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
 
     def __int__(self):
         self._assert_ready()
@@ -2359,23 +2332,11 @@ class Integer(Obj):
             yield pp
 
 
-BitStringState = namedtuple("BitStringState", (
-    "version",
-    "specs",
-    "value",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-    "tag_constructed",
-    "defined",
-), **NAMEDTUPLE_KWARGS)
+BitStringState = namedtuple(
+    "BitStringState",
+    BasicState._fields + ("specs", "value", "tag_constructed", "defined"),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class BitString(Obj):
@@ -2533,8 +2494,6 @@ class BitString(Obj):
     def __getstate__(self):
         return BitStringState(
             __version__,
-            self.specs,
-            self._value,
             self.tag,
             self._expl,
             self.default,
@@ -2545,6 +2504,8 @@ class BitString(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self.specs,
+            self._value,
             self.tag_constructed,
             self.defined,
         )
@@ -2553,16 +2514,6 @@ class BitString(Obj):
         super(BitString, self).__setstate__(state)
         self.specs = state.specs
         self._value = state.value
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
         self.tag_constructed = state.tag_constructed
         self.defined = state.defined
 
@@ -2866,24 +2817,17 @@ class BitString(Obj):
             yield pp
 
 
-OctetStringState = namedtuple("OctetStringState", (
-    "version",
-    "value",
-    "bound_min",
-    "bound_max",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-    "tag_constructed",
-    "defined",
-), **NAMEDTUPLE_KWARGS)
+OctetStringState = namedtuple(
+    "OctetStringState",
+    BasicState._fields + (
+        "value",
+        "bound_min",
+        "bound_max",
+        "tag_constructed",
+        "defined",
+    ),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class OctetString(Obj):
@@ -2979,9 +2923,6 @@ class OctetString(Obj):
     def __getstate__(self):
         return OctetStringState(
             __version__,
-            self._value,
-            self._bound_min,
-            self._bound_max,
             self.tag,
             self._expl,
             self.default,
@@ -2992,6 +2933,9 @@ class OctetString(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self._value,
+            self._bound_min,
+            self._bound_max,
             self.tag_constructed,
             self.defined,
         )
@@ -3001,16 +2945,6 @@ class OctetString(Obj):
         self._value = state.value
         self._bound_min = state.bound_min
         self._bound_max = state.bound_max
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
         self.tag_constructed = state.tag_constructed
         self.defined = state.defined
 
@@ -3256,19 +3190,7 @@ class OctetString(Obj):
             yield pp
 
 
-NullState = namedtuple("NullState", (
-    "version",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-), **NAMEDTUPLE_KWARGS)
+NullState = namedtuple("NullState", BasicState._fields, **NAMEDTUPLE_KWARGS)
 
 
 class Null(Obj):
@@ -3318,19 +3240,6 @@ class Null(Obj):
             self.ber_encoded,
         )
 
-    def __setstate__(self, state):
-        super(Null, self).__setstate__(state)
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
-
     def __eq__(self, their):
         if not issubclass(their.__class__, Null):
             return False
@@ -3424,21 +3333,11 @@ class Null(Obj):
             yield pp
 
 
-ObjectIdentifierState = namedtuple("ObjectIdentifierState", (
-    "version",
-    "value",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-    "defines",
-), **NAMEDTUPLE_KWARGS)
+ObjectIdentifierState = namedtuple(
+    "ObjectIdentifierState",
+    BasicState._fields + ("value", "defines"),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class ObjectIdentifier(Obj):
@@ -3544,7 +3443,6 @@ class ObjectIdentifier(Obj):
     def __getstate__(self):
         return ObjectIdentifierState(
             __version__,
-            self._value,
             self.tag,
             self._expl,
             self.default,
@@ -3555,22 +3453,13 @@ class ObjectIdentifier(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self._value,
             self.defines,
         )
 
     def __setstate__(self, state):
         super(ObjectIdentifier, self).__setstate__(state)
         self._value = state.value
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
         self.defines = state.defines
 
     def __iter__(self):
@@ -4575,21 +4464,11 @@ class BMPString(CommonString):
     asn1_type_name = "BMPString"
 
 
-ChoiceState = namedtuple("ChoiceState", (
-    "version",
-    "specs",
-    "value",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-), **NAMEDTUPLE_KWARGS)
+ChoiceState = namedtuple(
+    "ChoiceState",
+    BasicState._fields + ("specs", "value",),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class Choice(Obj):
@@ -4694,8 +4573,6 @@ class Choice(Obj):
     def __getstate__(self):
         return ChoiceState(
             __version__,
-            self.specs,
-            copy(self._value),
             self.tag,
             self._expl,
             self.default,
@@ -4706,21 +4583,14 @@ class Choice(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self.specs,
+            copy(self._value),
         )
 
     def __setstate__(self, state):
         super(Choice, self).__setstate__(state)
         self.specs = state.specs
         self._value = state.value
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
 
     def __eq__(self, their):
         if (their.__class__ == tuple) and len(their) == 2:
@@ -4894,20 +4764,11 @@ class PrimitiveTypes(Choice):
     ))
 
 
-AnyState = namedtuple("AnyState", (
-    "version",
-    "value",
-    "tag",
-    "expl",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-    "defined",
-), **NAMEDTUPLE_KWARGS)
+AnyState = namedtuple(
+    "AnyState",
+    BasicState._fields + ("value", "defined"),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class Any(Obj):
@@ -4967,9 +4828,9 @@ class Any(Obj):
     def __getstate__(self):
         return AnyState(
             __version__,
-            self._value,
             self.tag,
             self._expl,
+            None,
             self.optional,
             self.offset,
             self.llen,
@@ -4977,21 +4838,13 @@ class Any(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self._value,
             self.defined,
         )
 
     def __setstate__(self, state):
         super(Any, self).__setstate__(state)
         self._value = state.value
-        self.tag = state.tag
-        self._expl = state.expl
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
         self.defined = state.defined
 
     def __eq__(self, their):
@@ -5172,21 +5025,11 @@ def abs_decode_path(decode_path, rel_path):
     return decode_path + rel_path
 
 
-SequenceState = namedtuple("SequenceState", (
-    "version",
-    "specs",
-    "value",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-), **NAMEDTUPLE_KWARGS)
+SequenceState = namedtuple(
+    "SequenceState",
+    BasicState._fields + ("specs", "value",),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class Sequence(Obj):
@@ -5341,8 +5184,6 @@ class Sequence(Obj):
     def __getstate__(self):
         return SequenceState(
             __version__,
-            self.specs,
-            {k: copy(v) for k, v in iteritems(self._value)},
             self.tag,
             self._expl,
             self.default,
@@ -5353,22 +5194,14 @@ class Sequence(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self.specs,
+            {k: copy(v) for k, v in iteritems(self._value)},
         )
 
     def __setstate__(self, state):
         super(Sequence, self).__setstate__(state)
         self.specs = state.specs
         self._value = state.value
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
 
     def __eq__(self, their):
         if not isinstance(their, self.__class__):
@@ -5834,23 +5667,11 @@ class Set(Sequence):
         return obj, tail
 
 
-SequenceOfState = namedtuple("SequenceOfState", (
-    "version",
-    "spec",
-    "value",
-    "bound_min",
-    "bound_max",
-    "tag",
-    "expl",
-    "default",
-    "optional",
-    "offset",
-    "llen",
-    "vlen",
-    "expl_lenindef",
-    "lenindef",
-    "ber_encoded",
-), **NAMEDTUPLE_KWARGS)
+SequenceOfState = namedtuple(
+    "SequenceOfState",
+    BasicState._fields + ("spec", "value", "bound_min", "bound_max"),
+    **NAMEDTUPLE_KWARGS
+)
 
 
 class SequenceOf(Obj):
@@ -5951,10 +5772,6 @@ class SequenceOf(Obj):
     def __getstate__(self):
         return SequenceOfState(
             __version__,
-            self.spec,
-            [copy(v) for v in self._value],
-            self._bound_min,
-            self._bound_max,
             self.tag,
             self._expl,
             self.default,
@@ -5965,6 +5782,10 @@ class SequenceOf(Obj):
             self.expl_lenindef,
             self.lenindef,
             self.ber_encoded,
+            self.spec,
+            [copy(v) for v in self._value],
+            self._bound_min,
+            self._bound_max,
         )
 
     def __setstate__(self, state):
@@ -5973,16 +5794,6 @@ class SequenceOf(Obj):
         self._value = state.value
         self._bound_min = state.bound_min
         self._bound_max = state.bound_max
-        self.tag = state.tag
-        self._expl = state.expl
-        self.default = state.default
-        self.optional = state.optional
-        self.offset = state.offset
-        self.llen = state.llen
-        self.vlen = state.vlen
-        self.expl_lenindef = state.expl_lenindef
-        self.lenindef = state.lenindef
-        self.ber_encoded = state.ber_encoded
 
     def __eq__(self, their):
         if isinstance(their, self.__class__):