Reviewed-by: Liming Gao <[email protected]> > -----Original Message----- > From: Zhu, Yonghong > Sent: Tuesday, May 03, 2016 3:47 PM > To: [email protected] > Cc: Gao, Liming <[email protected]> > Subject: [Patch V2] BaseTools: Support \x####\ in UNI files to specify non- > ascii characters > > UNI spec updated to allow using \x####\ to specify non-ascii characters, > # is a hex digit. > > Cc: Liming Gao <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu <[email protected]> > --- > BaseTools/Source/Python/AutoGen/UniClassObject.py | 18 > ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py > b/BaseTools/Source/Python/AutoGen/UniClassObject.py > index a01381b..d28fd3a 100644 > --- a/BaseTools/Source/Python/AutoGen/UniClassObject.py > +++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py > @@ -2,11 +2,11 @@ > # This file is used to collect all defined strings in multiple uni files > # > # > # Copyright (c) 2014 Hewlett-Packard Development Company, L.P.<BR> > # > -# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2007 - 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 > # > @@ -430,13 +430,23 @@ class UniFileClassObject(object): > Line = Line.replace(u'\t', u' ') > Line = Line.replace(u'\\"', u'"') > Line = Line.replace(u"\\'", u"'") > Line = Line.replace(BACK_SLASH_PLACEHOLDER, u'\\') > > -# if Line.find(u'\\x'): > -# hex = Line[Line.find(u'\\x') + 2 : Line.find(u'\\x') + 6] > -# hex = "u'\\u" + hex + "'" > + StartPos = Line.find(u'\\x') > + while (StartPos != -1): > + EndPos = Line.find(u'\\', StartPos + 1, StartPos + 7) > + if EndPos != -1 and EndPos - StartPos == 6 : > + if re.match('[a-fA-F0-9]{4}', Line[StartPos + 2 : > EndPos], > re.UNICODE): > + EndStr = Line[EndPos: ] > + UniStr = ('\u' + (Line[StartPos + 2 : > EndPos])).decode('unicode_escape') > + if EndStr.startswith(u'\\x') and len(EndStr) >= 7: > + if EndStr[6] == u'\\' and > re.match('[a-fA-F0-9]{4}', EndStr[2 : 6], > re.UNICODE): > + Line = Line[0 : StartPos] + UniStr + EndStr > + else: > + Line = Line[0 : StartPos] + UniStr + EndStr[1:] > + StartPos = Line.find(u'\\x', StartPos) > > IncList = gIncludePattern.findall(Line) > if len(IncList) == 1: > for Dir in [File.Dir] + self.IncludePathList: > IncFile = PathClass(str(IncList[0]), Dir) > -- > 2.6.1.windows.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
