From: Jaben Carsey <jaben.carsey@intel.com>
To: edk2-devel@lists.01.org
Cc: Liming Gao <liming.gao@intel.com>, Yonghong Zhu <yonghong.zhu@intel.com>
Subject: [PATCH v1 03/14] BaseTools: defaultdict(set) allows us to just add to the set
Date: Thu, 5 Apr 2018 16:13:51 -0700 [thread overview]
Message-ID: <5118dff3c392dcc7f3acc63d0f562327ca3c963f.1522969978.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1522969977.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1522969977.git.jaben.carsey@intel.com>
New sets will get created automatically when needed
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>
---
BaseTools/Source/Python/AutoGen/AutoGen.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 3384fdb70b7e..91a0742a33be 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -45,6 +45,7 @@ import InfSectionParser
import datetime
import hashlib
from GenVar import VariableMgr,var_info
+from collections import defaultdict
## Regular expression for splitting Dependency Expression string into tokens
gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)")
@@ -3495,8 +3496,8 @@ class ModuleAutoGen(AutoGen):
if self._BuildTargets is None:
self._IntroBuildTargetList = set()
self._FinalBuildTargetList = set()
- self._BuildTargets = {}
- self._FileTypes = {}
+ self._BuildTargets = defaultdict(set)
+ self._FileTypes = defaultdict(set)
SubDirectory = os.path.join(self.OutputDir, File.SubDir)
if not os.path.exists(SubDirectory):
@@ -3533,8 +3534,6 @@ class ModuleAutoGen(AutoGen):
break
FileType = RuleObject.SourceFileType
- if FileType not in self._FileTypes:
- self._FileTypes[FileType] = set()
self._FileTypes[FileType].add(Source)
# stop at STATIC_LIBRARY for library
@@ -3552,8 +3551,6 @@ class ModuleAutoGen(AutoGen):
# Only do build for target with outputs
self._FinalBuildTargetList.add(Target)
- if FileType not in self._BuildTargets:
- self._BuildTargets[FileType] = set()
self._BuildTargets[FileType].add(Target)
if not Source.IsBinary and Source == File:
@@ -3572,8 +3569,8 @@ class ModuleAutoGen(AutoGen):
if self._BuildTargets is None:
self._IntroBuildTargetList = set()
self._FinalBuildTargetList = set()
- self._BuildTargets = {}
- self._FileTypes = {}
+ self._BuildTargets = defaultdict(set)
+ self._FileTypes = defaultdict(set)
#TRICK: call _GetSourceFileList to apply build rule for source files
if self.SourceFileList:
--
2.16.2.windows.1
next prev parent reply other threads:[~2018-04-05 23:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-05 23:13 [PATCH v1 00/14] BaseTools: refactoring the code for readability and simplicity Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 01/14] BaseTools: remove unused file Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 02/14] BaseTools: remove uncalled functions Jaben Carsey
2018-04-05 23:13 ` Jaben Carsey [this message]
2018-04-05 23:13 ` [PATCH v1 04/14] BaseTools: sets are faster to check via "in" due to hashing Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 05/14] BaseTools: replace a dict with a set Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 06/14] BaseTools: remove unused variables Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 07/14] BaseTools: change list to set Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 08/14] BaseTools: simplify testing for existance and containing data Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 09/14] BaseTools: optimize buildoptions loop Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 10/14] BaseTools: change another list to set Jaben Carsey
2018-04-05 23:13 ` [PATCH v1 11/14] BaseTools: remove unneeded function call Jaben Carsey
2018-04-05 23:14 ` [PATCH v1 12/14] BaseTools: change more list to set Jaben Carsey
2018-04-05 23:14 ` [PATCH v1 13/14] BaseTools: GenC - move content from both parts of if/else Jaben Carsey
2018-04-05 23:14 ` [PATCH v1 14/14] BaseTools: refactor and remove out of date use of .keys() Jaben Carsey
2018-04-10 1:53 ` [PATCH v1 00/14] BaseTools: refactoring the code for readability and simplicity Zhu, Yonghong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5118dff3c392dcc7f3acc63d0f562327ca3c963f.1522969978.git.jaben.carsey@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox