BaseTools: AutoGen - refactor out functions only called in __init__

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben
2018-04-28 06:32:33 +08:00
committed by Yonghong Zhu
parent 5565a8c4d2
commit def89ed025

View File

@ -244,16 +244,12 @@ class VAR_CHECK_PCD_VALID_OBJ(object):
self.Type = 1 self.Type = 1
self.Length = 0 # Length include this header self.Length = 0 # Length include this header
self.VarOffset = VarOffset self.VarOffset = VarOffset
self.StorageWidth = 0
self.PcdDataType = PcdDataType.strip() self.PcdDataType = PcdDataType.strip()
self.rawdata = data self.rawdata = data
self.data = set() self.data = set()
self.ValidData = True
self.updateStorageWidth()
def updateStorageWidth(self):
try: try:
self.StorageWidth = MAX_SIZE_TYPE[self.PcdDataType] self.StorageWidth = MAX_SIZE_TYPE[self.PcdDataType]
self.ValidData = True
except: except:
self.StorageWidth = 0 self.StorageWidth = 0
self.ValidData = False self.ValidData = False
@ -265,9 +261,6 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
def __init__(self, VarOffset, validlist, PcdDataType): def __init__(self, VarOffset, validlist, PcdDataType):
super(VAR_CHECK_PCD_VALID_LIST, self).__init__(VarOffset, validlist, PcdDataType) super(VAR_CHECK_PCD_VALID_LIST, self).__init__(VarOffset, validlist, PcdDataType)
self.Type = 1 self.Type = 1
self.update_data()
self.update_size()
def update_data(self):
valid_num_list = [] valid_num_list = []
data_list = [] data_list = []
for item in self.rawdata: for item in self.rawdata:
@ -283,8 +276,6 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
self.data = set(data_list) self.data = set(data_list)
def update_size(self):
self.Length = 5 + len(self.data) * self.StorageWidth self.Length = 5 + len(self.data) * self.StorageWidth
@ -292,9 +283,6 @@ class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):
def __init__(self, VarOffset, validrange, PcdDataType): def __init__(self, VarOffset, validrange, PcdDataType):
super(VAR_CHECK_PCD_VALID_RANGE, self).__init__(VarOffset, validrange, PcdDataType) super(VAR_CHECK_PCD_VALID_RANGE, self).__init__(VarOffset, validrange, PcdDataType)
self.Type = 2 self.Type = 2
self.update_data()
self.update_size()
def update_data(self):
RangeExpr = "" RangeExpr = ""
data_list = [] data_list = []
i = 0 i = 0
@ -308,8 +296,6 @@ class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):
for obj in rangelist.pop(): for obj in rangelist.pop():
data_list.append((obj.start, obj.end)) data_list.append((obj.start, obj.end))
self.data = set(data_list) self.data = set(data_list)
def update_size(self):
self.Length = 5 + len(self.data) * 2 * self.StorageWidth self.Length = 5 + len(self.data) * 2 * self.StorageWidth