BaseTool: Error handling for PCD datumtype.

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / BuildClassObject.py

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 6150557cfbfd2a052057da963267422b1a0876c6..a306dc0b23049132a09e8123bb0d6297cd6f25e5 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -16,6 +16,7 @@ import Common.LongFilePathOs as os
 from Common.Misc import sdict\r
 from Common.Misc import RealPath2\r
 from Common.BuildToolError import *\r
+from Common.DataType import *\r
 import collections\r
 \r
 ## PcdClassObject\r
@@ -64,9 +65,12 @@ class PcdClassObject(object):
         self.validlists = validlists\r
         self.expressions = expressions\r
         self.DscDefaultValue = None\r
+        self.DscRawValue = None\r
         if IsDsc:\r
             self.DscDefaultValue = Value\r
-        \r
+        self.PcdValueFromComm = ""\r
+        self.DefinitionPosition = ("","")\r
+\r
     ## Convert the class to a string\r
     #\r
     #  Convert each member of the class to string\r
@@ -108,16 +112,26 @@ class PcdClassObject(object):
         return hash((self.TokenCName, self.TokenSpaceGuidCName))\r
 \r
 class StructurePcd(PcdClassObject):\r
-    def __init__(self, StructuredPcdIncludeFile="", Packages=None, Name=None, Guid=None, Type=None, DatumType=None, Value=None, Token=None, MaxDatumSize=None, SkuInfoList={}, IsOverrided=False, GuidValue=None, validateranges=[], validlists=[], expressions=[]):\r
+    def __init__(self, StructuredPcdIncludeFile=None, Packages=None, Name=None, Guid=None, Type=None, DatumType=None, Value=None, Token=None, MaxDatumSize=None, SkuInfoList=None, IsOverrided=False, GuidValue=None, validateranges=None, validlists=None, expressions=None,default_store = TAB_DEFAULT_STORES_DEFAULT):\r
+        if SkuInfoList is None: SkuInfoList={}\r
+        if validateranges is None: validateranges=[]\r
+        if validlists is None: validlists=[]\r
+        if expressions is None : expressions=[]\r
+        if Packages is None : Packages = []\r
         super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions)\r
-        self.StructuredPcdIncludeFile = StructuredPcdIncludeFile\r
+        self.StructuredPcdIncludeFile = [] if StructuredPcdIncludeFile is None else StructuredPcdIncludeFile\r
         self.PackageDecs = Packages\r
-        self.DefaultStoreName = ['STANDARD']\r
+        self.DefaultStoreName = [default_store]\r
         self.DefaultValues = collections.OrderedDict({})\r
         self.PcdMode = None\r
         self.SkuOverrideValues = collections.OrderedDict({})\r
         self.FlexibleFieldName = None\r
-\r
+        self.StructName = None\r
+        self.PcdDefineLineNo = 0\r
+        self.PkgPath = ""\r
+        self.DefaultValueFromDec = ""\r
+        self.ValueChain = dict()\r
+        self.PcdFieldValueFromComm = collections.OrderedDict({})\r
     def __repr__(self):\r
         return self.TypeName\r
 \r
@@ -127,13 +141,17 @@ class StructurePcd(PcdClassObject):
         self.DefaultValues[FieldName] = [Value.strip(), FileName, LineNo]\r
         return self.DefaultValues[FieldName]\r
 \r
-    def AddOverrideValue (self, FieldName, Value, SkuName, FileName="", LineNo=0):\r
+    def SetDecDefaultValue(self,DefaultValue):\r
+        self.DefaultValueFromDec = DefaultValue\r
+    def AddOverrideValue (self, FieldName, Value, SkuName, DefaultStoreName, FileName="", LineNo=0):\r
         if SkuName not in self.SkuOverrideValues:\r
             self.SkuOverrideValues[SkuName] = collections.OrderedDict({})\r
-        if FieldName in self.SkuOverrideValues[SkuName]:\r
-            del self.SkuOverrideValues[SkuName][FieldName]\r
-        self.SkuOverrideValues[SkuName][FieldName] = [Value.strip(), FileName, LineNo]\r
-        return self.SkuOverrideValues[SkuName][FieldName]\r
+        if DefaultStoreName not in self.SkuOverrideValues[SkuName]:\r
+            self.SkuOverrideValues[SkuName][DefaultStoreName] = collections.OrderedDict({})\r
+        if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreName]:\r
+            del self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName]\r
+        self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName] = [Value.strip(), FileName, LineNo]\r
+        return self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName]\r
 \r
     def SetPcdMode (self, PcdMode):\r
         self.PcdMode = PcdMode\r
@@ -159,14 +177,23 @@ class StructurePcd(PcdClassObject):
         self.validateranges = PcdObject.validateranges if PcdObject.validateranges else self.validateranges\r
         self.validlists = PcdObject.validlists if PcdObject.validlists else self.validlists\r
         self.expressions = PcdObject.expressions if PcdObject.expressions else self.expressions\r
+        self.DscRawValue = PcdObject.DscRawValue if PcdObject.DscRawValue else self.DscRawValue\r
+        self.PcdValueFromComm = PcdObject.PcdValueFromComm if PcdObject.PcdValueFromComm else self.PcdValueFromComm\r
+        self.DefinitionPosition = PcdObject.DefinitionPosition if PcdObject.DefinitionPosition else self.DefinitionPosition\r
         if type(PcdObject) is StructurePcd:\r
             self.StructuredPcdIncludeFile = PcdObject.StructuredPcdIncludeFile if PcdObject.StructuredPcdIncludeFile else self.StructuredPcdIncludeFile\r
             self.PackageDecs = PcdObject.PackageDecs if PcdObject.PackageDecs else self.PackageDecs\r
             self.DefaultValues = PcdObject.DefaultValues if PcdObject.DefaultValues else self.DefaultValues\r
             self.PcdMode = PcdObject.PcdMode if PcdObject.PcdMode else self.PcdMode\r
             self.DefaultFromDSC=None\r
-            self.OverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
+            self.DefaultValueFromDec = PcdObject.DefaultValueFromDec if PcdObject.DefaultValueFromDec else self.DefaultValueFromDec\r
+            self.SkuOverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
             self.FlexibleFieldName = PcdObject.FlexibleFieldName if PcdObject.FlexibleFieldName else self.FlexibleFieldName\r
+            self.StructName = PcdObject.DatumType if PcdObject.DatumType else self.StructName\r
+            self.PcdDefineLineNo = PcdObject.PcdDefineLineNo if PcdObject.PcdDefineLineNo else self.PcdDefineLineNo\r
+            self.PkgPath = PcdObject.PkgPath if PcdObject.PkgPath else self.PkgPath\r
+            self.ValueChain = PcdObject.ValueChain if PcdObject.ValueChain else self.ValueChain\r
+            self.PcdFieldValueFromComm = PcdObject.PcdFieldValueFromComm if PcdObject.PcdFieldValueFromComm else self.PcdFieldValueFromComm\r
 \r
 ## LibraryClassObject\r
 #\r
@@ -433,4 +460,3 @@ class PlatformBuildClassObject(object):
     #\r
     def __hash__(self):\r
         return hash(self.MetaFile)\r
-\r