-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
NULL = u'\u0000'\r
TAB = u'\t'\r
BACK_SPLASH = u'\\'\r
+DOBULE_QUOTED_SPLASH = u'\\"'\r
+SIGLE_QUOTED_SPLASH = u"\\'"\r
+TAB_BACK_SLASH = u"\\/"\r
\r
gIncludePattern = re.compile("^#include +[\"<]+([^\"< >]+)[>\"]+$", re.MULTILINE | re.UNICODE)\r
\r
self.Token = 2\r
self.LanguageDef = [] #[ [u'LanguageIdentifier', u'PrintableName'], ... ]\r
self.OrderedStringList = {} #{ u'LanguageIdentifier' : [StringDefClassObject] }\r
+ self.OrderedStringDict = {} #{ u'LanguageIdentifier' : {StringName:(IndexInList)} }\r
+ self.OrderedStringListByToken = {} #{ u'LanguageIdentifier' : {Token: StringDefClassObject} }\r
self.IsCompatibleMode = IsCompatibleMode\r
self.IncludePathList = IncludePathList\r
if len(self.FileList) > 0:\r
else:\r
OtherLang = FirstLangName\r
self.OrderedStringList[LangName].append (StringDefClassObject(Item.StringName, '', Item.Referenced, Item.Token, OtherLang))\r
-\r
+ self.OrderedStringDict[LangName][Item.StringName] = len(self.OrderedStringList[LangName]) - 1\r
return True\r
\r
#\r
# Get String name and value\r
#\r
def GetStringObject(self, Item):\r
- Name = ''\r
Language = ''\r
Value = ''\r
\r
Name = Item.split()[1]\r
# Check the string name is the upper character\r
- if not self.IsCompatibleMode and Name != '':\r
+ if Name != '':\r
MatchString = re.match('[A-Z0-9_]+', Name, re.UNICODE)\r
if MatchString == None or MatchString.end(0) != len(Name):\r
EdkLogger.error('Unicode File Parser', FORMAT_INVALID, 'The string token name %s defined in UNI file %s contains the invalid lower case character.' %(Name, self.File))\r
Line = Line.replace(u'/language', u'#language')\r
Line = Line.replace(u'/include', u'#include')\r
\r
+ Line = Line.replace(u'\\\\', u'\u0006')\r
Line = Line.replace(UNICODE_WIDE_CHAR, WIDE_CHAR)\r
Line = Line.replace(UNICODE_NARROW_CHAR, NARROW_CHAR)\r
Line = Line.replace(UNICODE_NON_BREAKING_CHAR, NON_BREAKING_CHAR)\r
\r
- Line = Line.replace(u'\\\\', u'\u0006')\r
Line = Line.replace(u'\\r\\n', CR + LF)\r
Line = Line.replace(u'\\n', CR + LF)\r
Line = Line.replace(u'\\r', CR)\r
Line = Line.replace(u'''\"''', u'''"''')\r
Line = Line.replace(u'\t', u' ')\r
Line = Line.replace(u'\u0006', u'\\')\r
- \r
+ Line = Line.replace(DOBULE_QUOTED_SPLASH, u'"')\r
+ Line = Line.replace(SIGLE_QUOTED_SPLASH, u"'")\r
+ Line = Line.replace(TAB_BACK_SLASH, u"/")\r
+\r
# if Line.find(u'\\x'):\r
# hex = Line[Line.find(u'\\x') + 2 : Line.find(u'\\x') + 6]\r
# hex = "u'\\u" + hex + "'"\r
\r
if Language not in self.OrderedStringList:\r
self.OrderedStringList[Language] = []\r
+ self.OrderedStringDict[Language] = {}\r
\r
IsAdded = True\r
- for Item in self.OrderedStringList[Language]:\r
- if Name == Item.StringName:\r
- IsAdded = False\r
- if Value != None:\r
- Item.UpdateValue(Value)\r
- Item.UseOtherLangDef = ''\r
- break\r
+ if Name in self.OrderedStringDict[Language]:\r
+ IsAdded = False\r
+ if Value != None:\r
+ ItemIndexInList = self.OrderedStringDict[Language][Name]\r
+ Item = self.OrderedStringList[Language][ItemIndexInList]\r
+ Item.UpdateValue(Value)\r
+ Item.UseOtherLangDef = '' \r
\r
if IsAdded:\r
Token = len(self.OrderedStringList[Language])\r
if Index == -1:\r
self.OrderedStringList[Language].append(StringDefClassObject(Name, Value, Referenced, Token, UseOtherLangDef))\r
+ self.OrderedStringDict[Language][Name] = Token\r
for LangName in self.LanguageDef:\r
#\r
# New STRING token will be added into all language string lists.\r
else:\r
OtherLangDef = Language\r
self.OrderedStringList[LangName[0]].append(StringDefClassObject(Name, '', Referenced, Token, OtherLangDef))\r
+ self.OrderedStringDict[LangName[0]][Name] = len(self.OrderedStringList[LangName[0]]) - 1\r
else:\r
self.OrderedStringList[Language].insert(Index, StringDefClassObject(Name, Value, Referenced, Token, UseOtherLangDef))\r
+ self.OrderedStringDict[Language][Name] = Index\r
\r
#\r
# Set the string as referenced\r
# So, only update the status of string stoken in first language string list.\r
#\r
Lang = self.LanguageDef[0][0]\r
- for Item in self.OrderedStringList[Lang]:\r
- if Name == Item.StringName:\r
- Item.Referenced = True\r
- break\r
+ if Name in self.OrderedStringDict[Lang]:\r
+ ItemIndexInList = self.OrderedStringDict[Lang][Name]\r
+ Item = self.OrderedStringList[Lang][ItemIndexInList]\r
+ Item.Referenced = True\r
+\r
#\r
# Search the string in language definition by Name\r
#\r
def FindStringValue(self, Name, Lang):\r
- for Item in self.OrderedStringList[Lang]:\r
- if Item.StringName == Name:\r
- return Item\r
+ if Name in self.OrderedStringDict[Lang]:\r
+ ItemIndexInList = self.OrderedStringDict[Lang][Name]\r
+ return self.OrderedStringList[Lang][ItemIndexInList]\r
\r
return None\r
\r
#\r
FirstLangName = self.LanguageDef[0][0]\r
\r
+ # Convert the OrderedStringList to be OrderedStringListByToken in order to faciliate future search by token\r
+ for LangNameItem in self.LanguageDef:\r
+ self.OrderedStringListByToken[LangNameItem[0]] = {}\r
+\r
#\r
# Use small token for all referred string stoken.\r
#\r
OtherLangItem = self.OrderedStringList[LangName][Index]\r
OtherLangItem.Referenced = True\r
OtherLangItem.Token = RefToken\r
+ self.OrderedStringListByToken[LangName][OtherLangItem.Token] = OtherLangItem\r
RefToken = RefToken + 1\r
\r
#\r
LangName = LangNameItem[0]\r
OtherLangItem = self.OrderedStringList[LangName][Index]\r
OtherLangItem.Token = RefToken + UnRefToken\r
+ self.OrderedStringListByToken[LangName][OtherLangItem.Token] = OtherLangItem\r
UnRefToken = UnRefToken + 1\r
\r
#\r
projects / mirror_edk2.git / blobdiff