From: Jaben Carsey <jaben.carsey@intel.com>
To: edk2-devel@lists.01.org
Cc: Yonghong Zhu <yonghong.zhu@intel.com>, Liming Gao <liming.gao@intel.com>
Subject: [PATCH v1 9/9] BaseTools: remove local hex number regular expression
Date: Fri, 16 Mar 2018 16:27:46 -0700 [thread overview]
Message-ID: <e9e02852a1b52eeef267948444fd08d01ced1942.1521242771.git.jaben.carsey@intel.com> (raw)
In-Reply-To: <cover.1521242771.git.jaben.carsey@intel.com>
In-Reply-To: <cover.1521242771.git.jaben.carsey@intel.com>
Change to using the new shared hex number regular expression
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
---
BaseTools/Source/Python/Common/Expression.py | 3 +--
BaseTools/Source/Python/Common/RangeExpression.py | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index c69c3cb1e84a..43ef586050e7 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -219,7 +219,6 @@ class ValueExpression(object):
NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':']
PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
- HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')
SymbolPattern = re.compile("("
"\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+\.\w+|"
@@ -671,7 +670,7 @@ class ValueExpression(object):
self._LiteralToken.endswith('}'):
return True
- if self.HexPattern.match(self._LiteralToken):
+ if gHexPattern.match(self._LiteralToken):
Token = self._LiteralToken[2:]
if not Token:
self._LiteralToken = '0x0'
diff --git a/BaseTools/Source/Python/Common/RangeExpression.py b/BaseTools/Source/Python/Common/RangeExpression.py
index bbcbd6b767e0..2fdb99688557 100644
--- a/BaseTools/Source/Python/Common/RangeExpression.py
+++ b/BaseTools/Source/Python/Common/RangeExpression.py
@@ -210,7 +210,6 @@ class RangeExpression(object):
NonLetterOpLst = ['+', '-', '&', '|', '^', '!', '=', '>', '<']
PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
- HexPattern = re.compile(r'0[xX][0-9a-fA-F]+')
SymbolPattern = re.compile("("
"\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+\.\w+|"
@@ -226,7 +225,7 @@ class RangeExpression(object):
# convert interval to object index. ex. 1 - 10 to a GUID
expr = expr.strip()
NumberDict = {}
- for HexNumber in self.HexPattern.findall(expr):
+ for HexNumber in gHexPattern.findall(expr):
Number = str(int(HexNumber, 16))
NumberDict[HexNumber] = Number
for HexNum in NumberDict:
@@ -631,7 +630,7 @@ class RangeExpression(object):
self._LiteralToken.endswith('}'):
return True
- if self.HexPattern.match(self._LiteralToken):
+ if gHexPattern.match(self._LiteralToken):
Token = self._LiteralToken[2:]
Token = Token.lstrip('0')
if not Token:
--
2.16.2.windows.1
prev parent reply other threads:[~2018-03-16 23:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-16 23:27 [PATCH v1 0/9] BaseTools: refactor variables and regular expressions Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 1/9] BaseTools: FdfParser and FdfParserLite share reg exp Jaben Carsey
2018-03-28 13:05 ` Zhu, Yonghong
2018-03-16 23:27 ` [PATCH v1 2/9] BaseTools: GlobalData share same MACRO name definition Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 3/9] BaseTools: add GUID pattern to global data Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 4/9] BaseTools: use new shared GUID regular expressions Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 5/9] BaseTools: Regular Expressions refactor out the hex char for later reuse Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 6/9] BaseTools: Add new RegExp for future use Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 7/9] BaseTools: Use precompiled RegExp Jaben Carsey
2018-03-16 23:27 ` [PATCH v1 8/9] BaseTools: GlobalData Add a regular expression for a hex number Jaben Carsey
2018-03-16 23:27 ` Jaben Carsey [this message]
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=e9e02852a1b52eeef267948444fd08d01ced1942.1521242771.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