BaseTools: Adjust the spaces around commas and colons

Based on "futurize -f lib2to3.fixes.fix_ws_comma"

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

2 files changed, 22 insertions, 22 deletions

diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Python/Ecc/CParser.py
index d5fd3a37a1..d7eff138da 100644
--- a/BaseTools/Source/Python/Ecc/CParser.py
+++ b/BaseTools/Source/Python/Ecc/CParser.py
@@ -785,10 +785,10 @@ class CParser(Parser):
                 if self.backtracking == 0:

                           

                     if d is not None:

-                      self.function_definition_stack[-1].ModifierText = self.input.toString(d.start,d.stop)

+                      self.function_definition_stack[-1].ModifierText = self.input.toString(d.start, d.stop)

                     else:

                       self.function_definition_stack[-1].ModifierText = ''

-                    self.function_definition_stack[-1].DeclText = self.input.toString(declarator1.start,declarator1.stop)

+                    self.function_definition_stack[-1].DeclText = self.input.toString(declarator1.start, declarator1.stop)

                     self.function_definition_stack[-1].DeclLine = declarator1.start.line

                     self.function_definition_stack[-1].DeclOffset = declarator1.start.charPositionInLine

                     if a is not None:

@@ -922,9 +922,9 @@ class CParser(Parser):
                     if self.backtracking == 0:

                             

                         if b is not None:

-                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, self.input.toString(b.start,b.stop), self.input.toString(c.start,c.stop))

+                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, self.input.toString(b.start, b.stop), self.input.toString(c.start, c.stop))

                         else:

-                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start,c.stop))

+                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start, c.stop))

                         	  

 

 

@@ -959,7 +959,7 @@ class CParser(Parser):
                     if self.backtracking == 0:

                           

                         if t is not None:

-                          self.StoreVariableDeclaration(s.start.line, s.start.charPositionInLine, t.start.line, t.start.charPositionInLine, self.input.toString(s.start,s.stop), self.input.toString(t.start,t.stop))

+                          self.StoreVariableDeclaration(s.start.line, s.start.charPositionInLine, t.start.line, t.start.charPositionInLine, self.input.toString(s.start, s.stop), self.input.toString(t.start, t.stop))

                         	

 

 

@@ -1403,7 +1403,7 @@ class CParser(Parser):
                     if self.backtracking == 0:

                           

                         if s.stop is not None:

-                          self.StoreStructUnionDefinition(s.start.line, s.start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.input.toString(s.start,s.stop))

+                          self.StoreStructUnionDefinition(s.start.line, s.start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.input.toString(s.start, s.stop))

                         	

 

 

@@ -1418,7 +1418,7 @@ class CParser(Parser):
                     if self.backtracking == 0:

                           

                         if e.stop is not None:

-                          self.StoreEnumerationDefinition(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))

+                          self.StoreEnumerationDefinition(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))

                         	

 

 

@@ -5401,7 +5401,7 @@ class CParser(Parser):
                 if self.failed:

                     return 

                 if self.backtracking == 0:

-                    self.postfix_expression_stack[-1].FuncCallText += self.input.toString(p.start,p.stop)

+                    self.postfix_expression_stack[-1].FuncCallText += self.input.toString(p.start, p.stop)

 

                 # C.g:407:9: ( '[' expression ']' | '(' a= ')' | '(' c= argument_expression_list b= ')' | '(' macro_parameter_list ')' | '.' x= IDENTIFIER | '*' y= IDENTIFIER | '->' z= IDENTIFIER | '++' | '--' )*

                 while True: #loop65

@@ -5501,7 +5501,7 @@ class CParser(Parser):
                         if self.failed:

                             return 

                         if self.backtracking == 0:

-                            self.StoreFunctionCalling(p.start.line, p.start.charPositionInLine, b.line, b.charPositionInLine, self.postfix_expression_stack[-1].FuncCallText, self.input.toString(c.start,c.stop))

+                            self.StoreFunctionCalling(p.start.line, p.start.charPositionInLine, b.line, b.charPositionInLine, self.postfix_expression_stack[-1].FuncCallText, self.input.toString(c.start, c.stop))

 

 

 

@@ -8277,7 +8277,7 @@ class CParser(Parser):
                     if self.failed:

                         return 

                     if self.backtracking == 0:

-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))

+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))

 

 

 

@@ -16384,7 +16384,7 @@ class CParser(Parser):
                     if self.failed:

                         return 

                     if self.backtracking == 0:

-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))

+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))

 

                     self.following.append(self.FOLLOW_statement_in_selection_statement2284)

                     self.statement()

@@ -16503,7 +16503,7 @@ class CParser(Parser):
                     if self.failed:

                         return 

                     if self.backtracking == 0:

-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))

+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))

 

 

 

@@ -16535,7 +16535,7 @@ class CParser(Parser):
                     if self.failed:

                         return 

                     if self.backtracking == 0:

-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))

+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))

 

 

 

@@ -16582,7 +16582,7 @@ class CParser(Parser):
                     if self.failed:

                         return 

                     if self.backtracking == 0:

-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))

+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))

 

 

 

diff --git a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
index fd96bb9a3c..b3b0ede7e8 100644
--- a/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Ecc/MetaFileWorkspace/MetaFileParser.py
@@ -561,7 +561,7 @@ class InfParser(MetaFileParser):
                     NmakeLine = ''

 

             # section content

-            self._ValueList = ['','','']

+            self._ValueList = ['', '', '']

             # parse current line, result will be put in self._ValueList

             self._SectionParser[self._SectionType](self)

             if self._ValueList is None or self._ItemType == MODEL_META_DATA_DEFINE:

@@ -920,7 +920,7 @@ class DscParser(MetaFileParser):
 

     ## Directive statement parser

     def _DirectiveParser(self):

-        self._ValueList = ['','','']

+        self._ValueList = ['', '', '']

         TokenList = GetSplitValueList(self._CurrentLine, ' ', 1)

         self._ValueList[0:len(TokenList)] = TokenList

 

@@ -1110,7 +1110,7 @@ class DscParser(MetaFileParser):
 

     ## Override parent's method since we'll do all macro replacements in parser

     def _GetMacros(self):

-        Macros = dict( [('ARCH','IA32'), ('FAMILY','MSFT'),('TOOL_CHAIN_TAG','VS2008x86'),('TARGET','DEBUG')])

+        Macros = dict( [('ARCH', 'IA32'), ('FAMILY', 'MSFT'), ('TOOL_CHAIN_TAG', 'VS2008x86'), ('TARGET', 'DEBUG')])

         Macros.update(self._FileLocalMacros)

         Macros.update(self._GetApplicableSectionMacro())

         Macros.update(GlobalData.gEdkGlobal)

@@ -1225,7 +1225,7 @@ class DscParser(MetaFileParser):
         self._RawTable.Drop()

         self._Table.Drop()

         for Record in RecordList:

-            EccGlobalData.gDb.TblDsc.Insert(Record[1],Record[2],Record[3],Record[4],Record[5],Record[6],Record[7],Record[8],Record[9],Record[10],Record[11],Record[12],Record[13],Record[14])

+            EccGlobalData.gDb.TblDsc.Insert(Record[1], Record[2], Record[3], Record[4], Record[5], Record[6], Record[7], Record[8], Record[9], Record[10], Record[11], Record[12], Record[13], Record[14])

         GlobalData.gPlatformDefines.update(self._FileLocalMacros)

         self._PostProcessed = True

         self._Content = None

@@ -1246,7 +1246,7 @@ class DscParser(MetaFileParser):
 

     def __RetrievePcdValue(self):

         Records = self._RawTable.Query(MODEL_PCD_FEATURE_FLAG, BelongsToItem=-1.0)

-        for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records:

+        for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Records:

             Value, DatumType, MaxDatumSize = AnalyzePcdData(Value)

             # Only use PCD whose value is straitforward (no macro and PCD)

             if self.SymbolPattern.findall(Value):

@@ -1259,7 +1259,7 @@ class DscParser(MetaFileParser):
             self._Symbols[Name] = Value

 

         Records = self._RawTable.Query(MODEL_PCD_FIXED_AT_BUILD, BelongsToItem=-1.0)

-        for TokenSpaceGuid,PcdName,Value,Dummy2,Dummy3,ID,Line in Records:

+        for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Records:

             Value, DatumType, MaxDatumSize = AnalyzePcdData(Value)

             # Only use PCD whose value is straitforward (no macro and PCD)

             if self.SymbolPattern.findall(Value):

@@ -1571,7 +1571,7 @@ class DecParser(MetaFileParser):
                 continue

 

             # section content

-            self._ValueList = ['','','']

+            self._ValueList = ['', '', '']

             self._SectionParser[self._SectionType[0]](self)

             if self._ValueList is None or self._ItemType == MODEL_META_DATA_DEFINE:

                 self._ItemType = -1

@@ -1717,7 +1717,7 @@ class DecParser(MetaFileParser):
                         GuidValue = GuidValue.lstrip(' {')

                         HexList.append('0x' + str(GuidValue[2:]))

                         Index += 1

-            self._ValueList[1] = "{ %s, %s, %s, { %s, %s, %s, %s, %s, %s, %s, %s }}" % (HexList[0], HexList[1], HexList[2],HexList[3],HexList[4],HexList[5],HexList[6],HexList[7],HexList[8],HexList[9],HexList[10])

+            self._ValueList[1] = "{ %s, %s, %s, { %s, %s, %s, %s, %s, %s, %s, %s }}" % (HexList[0], HexList[1], HexList[2], HexList[3], HexList[4], HexList[5], HexList[6], HexList[7], HexList[8], HexList[9], HexList[10])

         else:

             EdkLogger.error('Parser', FORMAT_INVALID, "Invalid GUID value format",

                             ExtraData=self._CurrentLine + \