##\r
# Import Modules\r
#\r
+from __future__ import print_function\r
import Common.LongFilePathOs as os, codecs, re\r
import distutils.util\r
import Common.EdkLogger as EdkLogger\r
-import StringIO\r
+from io import BytesIO\r
from Common.BuildToolError import *\r
-from Common.String import GetLineNo\r
+from Common.StringUtils import GetLineNo\r
from Common.Misc import PathClass\r
from Common.LongFilePathSupport import LongFilePath\r
from Common.GlobalData import *\r
# @retval LangName: Valid lanugage code in RFC 4646 format or None\r
#\r
def GetLanguageCode(LangName, IsCompatibleMode, File):\r
- global LangConvTable\r
-\r
length = len(LangName)\r
if IsCompatibleMode:\r
if length == 3 and LangName.isalpha():\r
self.StringValueByteList = UniToHexList(self.StringValue)\r
self.Length = len(self.StringValueByteList)\r
\r
+def StripComments(Line):\r
+ Comment = u'//'\r
+ CommentPos = Line.find(Comment)\r
+ while CommentPos >= 0:\r
+ # if there are non matched quotes before the comment header\r
+ # then we are in the middle of a string\r
+ # but we need to ignore the escaped quotes and backslashes.\r
+ if ((Line.count(u'"', 0, CommentPos) - Line.count(u'\\"', 0, CommentPos)) & 1) == 1:\r
+ CommentPos = Line.find (Comment, CommentPos + 1)\r
+ else:\r
+ return Line[:CommentPos].strip()\r
+ return Line.strip()\r
+\r
## UniFileClassObject\r
#\r
# A structure for .uni file definition\r
Lang = distutils.util.split_quoted((Line.split(u"//")[0]))\r
if len(Lang) != 3:\r
try:\r
- FileIn = self.OpenUniFile(LongFilePath(File.Path))\r
- except UnicodeError, X:\r
+ FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
+ except UnicodeError as X:\r
EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File);\r
except:\r
EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File);\r
self.OrderedStringDict[LangName][Item.StringName] = len(self.OrderedStringList[LangName]) - 1\r
return True\r
\r
- def OpenUniFile(self, FileName):\r
+ @staticmethod\r
+ def OpenUniFile(FileName):\r
#\r
# Read file\r
#\r
FileIn.startswith(codecs.BOM_UTF16_LE)):\r
Encoding = 'utf-16'\r
\r
- self.VerifyUcs2Data(FileIn, FileName, Encoding)\r
+ UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding)\r
\r
- UniFile = StringIO.StringIO(FileIn)\r
+ UniFile = BytesIO(FileIn)\r
Info = codecs.lookup(Encoding)\r
(Reader, Writer) = (Info.streamreader, Info.streamwriter)\r
return codecs.StreamReaderWriter(UniFile, Reader, Writer)\r
\r
- def VerifyUcs2Data(self, FileIn, FileName, Encoding):\r
+ @staticmethod\r
+ def VerifyUcs2Data(FileIn, FileName, Encoding):\r
Ucs2Info = codecs.lookup('ucs-2')\r
#\r
# Convert to unicode\r
FileDecoded = codecs.decode(FileIn, Encoding)\r
Ucs2Info.encode(FileDecoded)\r
except:\r
- UniFile = StringIO.StringIO(FileIn)\r
+ UniFile = BytesIO(FileIn)\r
Info = codecs.lookup(Encoding)\r
(Reader, Writer) = (Info.streamreader, Info.streamwriter)\r
File = codecs.StreamReaderWriter(UniFile, Reader, Writer)\r
Name = Item.split()[1]\r
# Check the string name\r
if Name != '':\r
- MatchString = re.match('^[a-zA-Z][a-zA-Z0-9_]*$', Name, re.UNICODE)\r
- if MatchString is None or MatchString.end(0) != len(Name):\r
+ MatchString = gIdentifierPattern.match(Name)\r
+ if MatchString is None:\r
EdkLogger.error('Unicode File Parser', FORMAT_INVALID, 'The string token name %s defined in UNI file %s contains the invalid character.' % (Name, self.File))\r
LanguageList = Item.split(u'#language ')\r
for IndexI in range(len(LanguageList)):\r
FileName = Item[Item.find(u'#include ') + len(u'#include ') :Item.find(u' ', len(u'#include '))][1:-1]\r
self.LoadUniFile(FileName)\r
\r
- def StripComments(self, Line):\r
- Comment = u'//'\r
- CommentPos = Line.find(Comment)\r
- while CommentPos >= 0:\r
- # if there are non matched quotes before the comment header\r
- # then we are in the middle of a string\r
- # but we need to ignore the escaped quotes and backslashes.\r
- if ((Line.count(u'"', 0, CommentPos) - Line.count(u'\\"', 0, CommentPos)) & 1) == 1:\r
- CommentPos = Line.find (Comment, CommentPos + 1)\r
- else:\r
- return Line[:CommentPos].strip()\r
- return Line.strip()\r
- \r
-\r
#\r
# Pre-process before parse .uni file\r
#\r
EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, ExtraData=File.Path)\r
\r
try:\r
- FileIn = self.OpenUniFile(LongFilePath(File.Path))\r
- except UnicodeError, X:\r
+ FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
+ except UnicodeError as X:\r
EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path);\r
except:\r
EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File.Path);\r
for Line in FileIn:\r
Line = Line.strip()\r
Line = Line.replace(u'\\\\', BACK_SLASH_PLACEHOLDER)\r
- Line = self.StripComments(Line)\r
+ Line = StripComments(Line)\r
\r
#\r
# Ignore empty line\r
Language = GetLanguageCode(Language, self.IsCompatibleMode, self.File)\r
# Check the string name\r
if not self.IsCompatibleMode and Name != '':\r
- MatchString = re.match('^[a-zA-Z][a-zA-Z0-9_]*$', Name, re.UNICODE)\r
- if MatchString is None or MatchString.end(0) != len(Name):\r
+ MatchString = gIdentifierPattern.match(Name)\r
+ if MatchString is None:\r
EdkLogger.error('Unicode File Parser', FORMAT_INVALID, 'The string token name %s defined in UNI file %s contains the invalid character.' % (Name, self.File))\r
self.AddStringToList(Name, Language, Value)\r
continue\r
# Show the instance itself\r
#\r
def ShowMe(self):\r
- print self.LanguageDef\r
+ print(self.LanguageDef)\r
#print self.OrderedStringList\r
for Item in self.OrderedStringList:\r
- print Item\r
+ print(Item)\r
for Member in self.OrderedStringList[Item]:\r
- print str(Member)\r
+ print(str(Member))\r
\r
# This acts like the main() function for the script, unless it is 'import'ed into another\r
# script.\r
projects / mirror_edk2.git / blobdiff