BaseTools: AutoGen - refactor function to remove extra variables

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / ValidCheckingInfoObject.py

diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
index 1328dddf1a10a3fad438298302b98ee80538f0af..92c8fe2df904cd73b582fecfa2dc6896a0c6aecc 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
+++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
@@ -244,16 +244,12 @@ class VAR_CHECK_PCD_VALID_OBJ(object):
         self.Type = 1\r
         self.Length = 0  # Length include this header\r
         self.VarOffset = VarOffset\r
-        self.StorageWidth = 0\r
         self.PcdDataType = PcdDataType.strip()\r
         self.rawdata = data\r
         self.data = set()\r
-        self.ValidData = True\r
-        self.updateStorageWidth()\r
-\r
-    def updateStorageWidth(self):\r
         try:\r
-            self.StorageWidth = int(MAX_SIZE_TYPE[self.PcdDataType])\r
+            self.StorageWidth = MAX_SIZE_TYPE[self.PcdDataType]\r
+            self.ValidData = True\r
         except:\r
             self.StorageWidth = 0\r
             self.ValidData = False\r
@@ -265,11 +261,7 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
     def __init__(self, VarOffset, validlist, PcdDataType):\r
         super(VAR_CHECK_PCD_VALID_LIST, self).__init__(VarOffset, validlist, PcdDataType)\r
         self.Type = 1\r
-        self.update_data()\r
-        self.update_size()\r
-    def update_data(self):\r
         valid_num_list = []\r
-        data_list = []\r
         for item in self.rawdata:\r
             valid_num_list.extend(item.split(','))\r
         \r
@@ -277,14 +269,11 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
             valid_num = valid_num.strip()\r
 \r
             if valid_num.startswith('0x') or valid_num.startswith('0X'):\r
-                data_list.append(int(valid_num, 16))\r
+                self.data.add(int(valid_num, 16))\r
             else:\r
-                data_list.append(int(valid_num))\r
+                self.data.add(int(valid_num))\r
 \r
                 \r
-        self.data = set(data_list)\r
-        \r
-    def update_size(self):\r
         self.Length = 5 + len(self.data) * self.StorageWidth\r
         \r
            \r
@@ -292,11 +281,7 @@ class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):
     def __init__(self, VarOffset, validrange, PcdDataType):\r
         super(VAR_CHECK_PCD_VALID_RANGE, self).__init__(VarOffset, validrange, PcdDataType)\r
         self.Type = 2\r
-        self.update_data()\r
-        self.update_size()\r
-    def update_data(self):\r
         RangeExpr = ""\r
-        data_list = []\r
         i = 0\r
         for item in self.rawdata:\r
             if i == 0:\r
@@ -306,38 +291,14 @@ class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):
         range_result = RangeExpression(RangeExpr, self.PcdDataType)(True)\r
         for rangelist in range_result:\r
             for obj in rangelist.pop():\r
-                data_list.append((obj.start, obj.end))\r
-        self.data = set(data_list)\r
-    \r
-    def update_size(self):\r
+                self.data.add((obj.start, obj.end))\r
         self.Length = 5 + len(self.data) * 2 * self.StorageWidth\r
         \r
 \r
-class VAR_VALID_OBJECT_FACTORY(object):\r
-    def __init__(self):\r
-        pass\r
-    @staticmethod\r
-    def Get_valid_object(PcdClass, VarOffset):\r
-        if PcdClass.validateranges:\r
-            return VAR_CHECK_PCD_VALID_RANGE(VarOffset, PcdClass.validateranges, PcdClass.DatumType)\r
-        if PcdClass.validlists:\r
-            return VAR_CHECK_PCD_VALID_LIST(VarOffset, PcdClass.validlists, PcdClass.DatumType)\r
-        else:\r
-            return None\r
-\r
-if __name__ == "__main__":\r
-    class TestObj(object):\r
-        def __init__(self, number1):\r
-            self.number_1 = number1\r
-        def __eq__(self, testobj):\r
-            if self.number_1 == testobj.number_1:\r
-                return True\r
-            else:\r
-                return False\r
-    test1 = TestObj(1)\r
-    test2 = TestObj(2)\r
-    \r
-    testarr = [test1, test2]\r
-    print TestObj(2) in testarr\r
-    print TestObj(2) == test2\r
-    \r
+def GetValidationObject(PcdClass, VarOffset):\r
+    if PcdClass.validateranges:\r
+        return VAR_CHECK_PCD_VALID_RANGE(VarOffset, PcdClass.validateranges, PcdClass.DatumType)\r
+    if PcdClass.validlists:\r
+        return VAR_CHECK_PCD_VALID_LIST(VarOffset, PcdClass.validlists, PcdClass.DatumType)\r
+    else:\r
+        return None\r