from Common.DataType import *\r
from Common.Misc import *\r
from types import *\r
+from collections import OrderedDict\r
\r
from Workspace.BuildClassObject import PackageBuildClassObject, StructurePcd, PcdClassObject\r
\r
\r
## Get current effective macros\r
def _GetMacros(self):\r
- if self.__Macros == None:\r
+ if self.__Macros is None:\r
self.__Macros = {}\r
self.__Macros.update(GlobalData.gGlobalDefines)\r
return self.__Macros\r
\r
## Retrieve package name\r
def _GetPackageName(self):\r
- if self._PackageName == None:\r
- if self._Header == None:\r
+ if self._PackageName is None:\r
+ if self._Header is None:\r
self._GetHeaderInfo()\r
- if self._PackageName == None:\r
+ if self._PackageName is None:\r
EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "No PACKAGE_NAME", File=self.MetaFile)\r
return self._PackageName\r
\r
## Retrieve file guid\r
def _GetFileGuid(self):\r
- if self._Guid == None:\r
- if self._Header == None:\r
+ if self._Guid is None:\r
+ if self._Header is None:\r
self._GetHeaderInfo()\r
- if self._Guid == None:\r
+ if self._Guid is None:\r
EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "No PACKAGE_GUID", File=self.MetaFile)\r
return self._Guid\r
\r
## Retrieve package version\r
def _GetVersion(self):\r
- if self._Version == None:\r
- if self._Header == None:\r
+ if self._Version is None:\r
+ if self._Header is None:\r
self._GetHeaderInfo()\r
- if self._Version == None:\r
+ if self._Version is None:\r
self._Version = ''\r
return self._Version\r
\r
## Retrieve protocol definitions (name/value pairs)\r
def _GetProtocol(self):\r
- if self._Protocols == None:\r
+ if self._Protocols is None:\r
#\r
# tdict is a special kind of dict, used for selecting correct\r
# protocol defition for given ARCH\r
if Name not in NameList:\r
NameList.append(Name)\r
ProtocolDict[Arch, Name] = Guid\r
- # use sdict to keep the order\r
- self._Protocols = sdict()\r
- self._PrivateProtocols = sdict()\r
+ # use OrderedDict to keep the order\r
+ self._Protocols = OrderedDict()\r
+ self._PrivateProtocols = OrderedDict()\r
for Name in NameList:\r
#\r
# limit the ARCH to self._Arch, if no self._Arch found, tdict\r
\r
## Retrieve PPI definitions (name/value pairs)\r
def _GetPpi(self):\r
- if self._Ppis == None:\r
+ if self._Ppis is None:\r
#\r
# tdict is a special kind of dict, used for selecting correct\r
# PPI defition for given ARCH\r
if Name not in NameList:\r
NameList.append(Name)\r
PpiDict[Arch, Name] = Guid\r
- # use sdict to keep the order\r
- self._Ppis = sdict()\r
- self._PrivatePpis = sdict()\r
+ # use OrderedDict to keep the order\r
+ self._Ppis = OrderedDict()\r
+ self._PrivatePpis = OrderedDict()\r
for Name in NameList:\r
#\r
# limit the ARCH to self._Arch, if no self._Arch found, tdict\r
\r
## Retrieve GUID definitions (name/value pairs)\r
def _GetGuid(self):\r
- if self._Guids == None:\r
+ if self._Guids is None:\r
#\r
# tdict is a special kind of dict, used for selecting correct\r
# GUID defition for given ARCH\r
if Name not in NameList:\r
NameList.append(Name)\r
GuidDict[Arch, Name] = Guid\r
- # use sdict to keep the order\r
- self._Guids = sdict()\r
- self._PrivateGuids = sdict()\r
+ # use OrderedDict to keep the order\r
+ self._Guids = OrderedDict()\r
+ self._PrivateGuids = OrderedDict()\r
for Name in NameList:\r
#\r
# limit the ARCH to self._Arch, if no self._Arch found, tdict\r
\r
## Retrieve public include paths declared in this package\r
def _GetInclude(self):\r
- if self._Includes == None or self._CommonIncludes is None:\r
+ if self._Includes is None or self._CommonIncludes is None:\r
self._CommonIncludes = []\r
self._Includes = []\r
self._PrivateIncludes = []\r
\r
## Retrieve library class declarations (not used in build at present)\r
def _GetLibraryClass(self):\r
- if self._LibraryClasses == None:\r
+ if self._LibraryClasses is None:\r
#\r
# tdict is a special kind of dict, used for selecting correct\r
# library class declaration for given ARCH\r
EdkLogger.error('build', ErrorCode, ExtraData=ErrorInfo, File=self.MetaFile, Line=LineNo)\r
LibraryClassSet.add(LibraryClass)\r
LibraryClassDict[Arch, LibraryClass] = File\r
- self._LibraryClasses = sdict()\r
+ self._LibraryClasses = OrderedDict()\r
for LibraryClass in LibraryClassSet:\r
self._LibraryClasses[LibraryClass] = LibraryClassDict[self._Arch, LibraryClass]\r
return self._LibraryClasses\r
\r
## Retrieve PCD declarations\r
def _GetPcds(self):\r
- if self._Pcds == None:\r
- self._Pcds = sdict()\r
+ if self._Pcds is None:\r
+ self._Pcds = OrderedDict()\r
self._Pcds.update(self._GetPcd(MODEL_PCD_FIXED_AT_BUILD))\r
self._Pcds.update(self._GetPcd(MODEL_PCD_PATCHABLE_IN_MODULE))\r
self._Pcds.update(self._GetPcd(MODEL_PCD_FEATURE_FLAG))\r
\r
\r
def ProcessStructurePcd(self, StructurePcdRawDataSet):\r
- s_pcd_set = dict()\r
+ s_pcd_set = OrderedDict()\r
for s_pcd,LineNo in StructurePcdRawDataSet:\r
if s_pcd.TokenSpaceGuidCName not in s_pcd_set:\r
s_pcd_set[s_pcd.TokenSpaceGuidCName] = []\r
struct_pcd.AddDefaultValue(item.TokenCName, item.DefaultValue,self.MetaFile.File,LineNo)\r
\r
struct_pcd.PackageDecs = dep_pkgs\r
- if not struct_pcd.StructuredPcdIncludeFile:\r
- 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,self.MetaFile.File,LineNo ))\r
-\r
str_pcd_set.append(struct_pcd)\r
-\r
return str_pcd_set\r
\r
## Retrieve PCD declarations for given type\r
def _GetPcd(self, Type):\r
- Pcds = sdict()\r
+ Pcds = OrderedDict()\r
#\r
# tdict is a special kind of dict, used for selecting correct\r
# PCD declaration for given ARCH\r
# will automatically turn to 'common' ARCH and try again\r
#\r
Setting,LineNo = PcdDict[self._Arch, PcdCName, TokenSpaceGuid]\r
- if Setting == None:\r
+ if Setting is None:\r
continue\r
\r
DefaultValue, DatumType, TokenNumber = AnalyzePcdData(Setting)\r
list(validlists),\r
list(expressions)\r
)\r
+ PcdObj.DefinitionPosition = (self.MetaFile.File,LineNo)\r
if "." in TokenSpaceGuid:\r
StrPcdSet.append((PcdObj,LineNo))\r
else:\r
StructurePcds = self.ProcessStructurePcd(StrPcdSet)\r
for pcd in StructurePcds:\r
Pcds[pcd.TokenCName, pcd.TokenSpaceGuidCName, self._PCD_TYPE_STRING_[Type]] = pcd\r
+ StructPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*$')\r
+ for pcd in Pcds.values():\r
+ if pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
+ if StructPattern.match(pcd.DatumType) is None:\r
+ 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])\r
+ for struct_pcd in Pcds.values():\r
+ if isinstance(struct_pcd,StructurePcd) and not struct_pcd.StructuredPcdIncludeFile:\r
+ 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] ))\r
\r
return Pcds\r
@property\r