FlexibleFieldName was never used not set.
DefinitionPosition (file and line number) are recalculated
and never used outside the function. remove the saving of the
data.
Cc: Liming Gao <liming....@intel.com>
Cc: Yonghong Zhu <yonghong....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.car...@intel.com>
---
BaseTools/Source/Python/Workspace/BuildClassObject.py | 7 -------
BaseTools/Source/Python/Workspace/DecBuildData.py | 7 ++++---
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py
b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index e7259b2d3d50..f4ffd05324f4 100644
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -66,7 +66,6 @@ class PcdClassObject(object):
self.DscDefaultValue = Value
self.PcdValueFromComm = ""
self.PcdValueFromFdf = ""
- self.DefinitionPosition = ("","")
## Get the maximum number of bytes
def GetPcdMaxSize(self):
@@ -168,7 +167,6 @@ class StructurePcd(PcdClassObject):
self.DefaultValues = OrderedDict()
self.PcdMode = None
self.SkuOverrideValues = OrderedDict()
- self.FlexibleFieldName = None
self.StructName = None
self.PcdDefineLineNo = 0
self.PkgPath = ""
@@ -200,9 +198,6 @@ class StructurePcd(PcdClassObject):
def SetPcdMode (self, PcdMode):
self.PcdMode = PcdMode
- def SetFlexibleFieldName (self, FlexibleFieldName):
- self.FlexibleFieldName = FlexibleFieldName
-
def copy(self, PcdObject):
self.TokenCName = PcdObject.TokenCName if PcdObject.TokenCName else
self.TokenCName
self.TokenSpaceGuidCName = PcdObject.TokenSpaceGuidCName if
PcdObject.TokenSpaceGuidCName else PcdObject.TokenSpaceGuidCName
@@ -224,7 +219,6 @@ class StructurePcd(PcdClassObject):
self.DscRawValue = PcdObject.DscRawValue if PcdObject.DscRawValue else
self.DscRawValue
self.PcdValueFromComm = PcdObject.PcdValueFromComm if
PcdObject.PcdValueFromComm else self.PcdValueFromComm
self.PcdValueFromFdf = PcdObject.PcdValueFromFdf if
PcdObject.PcdValueFromFdf else self.PcdValueFromFdf
- self.DefinitionPosition = PcdObject.DefinitionPosition if
PcdObject.DefinitionPosition else self.DefinitionPosition
if isinstance(PcdObject, StructurePcd):
self.StructuredPcdIncludeFile = PcdObject.StructuredPcdIncludeFile
if PcdObject.StructuredPcdIncludeFile else self.StructuredPcdIncludeFile
self.PackageDecs = PcdObject.PackageDecs if PcdObject.PackageDecs
else self.PackageDecs
@@ -233,7 +227,6 @@ class StructurePcd(PcdClassObject):
self.DefaultFromDSC=None
self.DefaultValueFromDec = PcdObject.DefaultValueFromDec if
PcdObject.DefaultValueFromDec else self.DefaultValueFromDec
self.SkuOverrideValues = PcdObject.SkuOverrideValues if
PcdObject.SkuOverrideValues else self.SkuOverrideValues
- self.FlexibleFieldName = PcdObject.FlexibleFieldName if
PcdObject.FlexibleFieldName else self.FlexibleFieldName
self.StructName = PcdObject.DatumType if PcdObject.DatumType else
self.StructName
self.PcdDefineLineNo = PcdObject.PcdDefineLineNo if
PcdObject.PcdDefineLineNo else self.PcdDefineLineNo
self.PkgPath = PcdObject.PkgPath if PcdObject.PkgPath else
self.PkgPath
diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py
b/BaseTools/Source/Python/Workspace/DecBuildData.py
index 1f74e898f2ef..31ee13eca91f 100644
--- a/BaseTools/Source/Python/Workspace/DecBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DecBuildData.py
@@ -410,6 +410,7 @@ class DecBuildData(PackageBuildClassObject):
if not (PcdCName, TokenSpaceGuid) in PcdSet:
PcdSet.append((PcdCName, TokenSpaceGuid))
+ DefinitionPosition = {}
for PcdCName, TokenSpaceGuid in PcdSet:
#
# limit the ARCH to self._Arch, if no self._Arch found, tdict
@@ -436,7 +437,7 @@ class DecBuildData(PackageBuildClassObject):
list(validlists),
list(expressions)
)
- PcdObj.DefinitionPosition = (self.MetaFile.File, LineNo)
+ DefinitionPosition[PcdObj] = (self.MetaFile.File, LineNo)
if "." in TokenSpaceGuid:
StrPcdSet.append((PcdObj, LineNo))
else:
@@ -449,10 +450,10 @@ class DecBuildData(PackageBuildClassObject):
for pcd in Pcds.values():
if pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32,
TAB_UINT64, TAB_VOID, "BOOLEAN"]:
if StructPattern.match(pcd.DatumType) is None:
- EdkLogger.error('build', FORMAT_INVALID, "DatumType only
support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.",
pcd.DefinitionPosition[0], pcd.DefinitionPosition[1])
+ EdkLogger.error('build', FORMAT_INVALID, "DatumType only
support BOOLEAN, UINT8, UINT16, UINT32, UINT64, VOID* or a valid struct name.",
DefinitionPosition[pcd][0], DefinitionPosition[pcd][1])
for struct_pcd in Pcds.values():
if isinstance(struct_pcd, StructurePcd) and not
struct_pcd.StructuredPcdIncludeFile:
- EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The
structure Pcd %s.%s header file is not found in %s line %s \n" %
(struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName,
struct_pcd.DefinitionPosition[0], struct_pcd.DefinitionPosition[1] ))
+ EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, "The
structure Pcd %s.%s header file is not found in %s line %s \n" %
(struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName,
DefinitionPosition[struct_pcd][0], DefinitionPosition[struct_pcd][1] ))
return Pcds
--
2.16.2.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
