[Patch] BaseTools: Add the support for character '<' and '>' in the map file

[Patch] BaseTools: Add the support for character '<' and '>' in the map file

[Yonghong Zhu]

Current the regex for the symbol in the map file doesn't support the '<'
and '>' character, while user use Lambda Expression (C++11 feature), it
would generate the something like @V<lambda_xxx>@ in the map file which
cause build fail to parse the symbol in map file.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
index 59bc7c4..f4fd51a 100644
--- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
+++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
@@ -3,11 +3,11 @@
 #    The Patch PCD table like:
 #    
 #    PCD Name    Offset in binary
 #    ========    ================
 #
-# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
 #
@@ -35,11 +35,11 @@ __copyright__ = "Copyright (c) 2008 - 2010, Intel Corporation. All rights reserv
 
 #======================================  Internal Libraries ========================================
 
 #============================================== Code ===============================================
 secRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\da-fA-F]+)[Hh]? +([.\w\$]+) +(\w+)', re.UNICODE)
-symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$]+) +([\da-fA-F]+)', re.UNICODE)
+symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$<>]+) +([\da-fA-F]+)', re.UNICODE)
 
 def parsePcdInfoFromMapFile(mapfilepath, efifilepath):
     """ Parse map file to get binary patch pcd information 
     @param path    Map file absolution path
     
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Add the support for character '<' and '>' in the map file

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Zhu, Yonghong
> Sent: Friday, November 04, 2016 8:30 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [Patch] BaseTools: Add the support for character '<' and '>' in the
> map file
> 
> Current the regex for the symbol in the map file doesn't support the '<'
> and '>' character, while user use Lambda Expression (C++11 feature), it
> would generate the something like @V<lambda_xxx>@ in the map file which
> cause build fail to parse the symbol in map file.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py | 4 ++-
> -
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
> b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
> index 59bc7c4..f4fd51a 100644
> --- a/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
> +++ b/BaseTools/Source/Python/GenPatchPcdTable/GenPatchPcdTable.py
> @@ -3,11 +3,11 @@
>  #    The Patch PCD table like:
>  #
>  #    PCD Name    Offset in binary
>  #    ========    ================
>  #
> -# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR>
>  # This program and the accompanying materials
>  # are licensed and made available under the terms and conditions of the BSD
> License
>  # which accompanies this distribution.  The full text of the license may be
> found at
>  # http://opensource.org/licenses/bsd-license.php
>  #
> @@ -35,11 +35,11 @@ __copyright__ = "Copyright (c) 2008 - 2010, Intel
> Corporation. All rights reserv
> 
>  #======================================  Internal Libraries
> ========================================
> 
>  #============================================== Code
> ===============================================
>  secRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\da-fA-F]+)[Hh]?
> +([.\w\$]+) +(\w+)', re.UNICODE)
> -symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$]+)
> +([\da-fA-F]+)', re.UNICODE)
> +symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.\-:\\\\\w\?@\$<>]+)
> +([\da-fA-F]+)', re.UNICODE)
> 
>  def parsePcdInfoFromMapFile(mapfilepath, efifilepath):
>      """ Parse map file to get binary patch pcd information
>      @param path    Map file absolution path
> 
> --
> 2.6.1.windows.1