BaseTools: Adjust the spaces around commas and colons

[mirror_edk2.git] / BaseTools / Source / Python / Ecc / CParser.py

diff --git a/BaseTools/Source/Python/Ecc/CParser.py b/BaseTools/Source/Python/Ecc/CParser.py
index baa521f43cc408195214b6cd587dc6e1e9811981..d7eff138da5761f1b97ef7fb895922b391216561 100644 (file)
--- a/BaseTools/Source/Python/Ecc/CParser.py
+++ b/BaseTools/Source/Python/Ecc/CParser.py
@@ -1,5 +1,6 @@
 # $ANTLR 3.0.1 C.g 2010-02-23 09:58:53\r
 \r
+from __future__ import print_function\r
 from antlr3 import *\r
 from antlr3.compat import set, frozenset\r
          \r
@@ -98,19 +99,12 @@ class CParser(Parser):
         Parser.__init__(self, input)\r
         self.ruleMemo = {}\r
 \r
-       self.function_definition_stack = []\r
-       self.postfix_expression_stack = []\r
+        self.function_definition_stack = []\r
+        self.postfix_expression_stack = []\r
 \r
-\r
-\r
-                \r
-\r
-\r
-              \r
-            \r
     def printTokenInfo(self, line, offset, tokenText):\r
-       print str(line)+ ',' + str(offset) + ':' + str(tokenText)\r
-        \r
+        print(str(line)+ ',' + str(offset) + ':' + str(tokenText))\r
+\r
     def StorePredicateExpression(self, StartLine, StartOffset, EndLine, EndOffset, Text):\r
        PredExp = CodeFragment.PredicateExpression(Text, (StartLine, StartOffset), (EndLine, EndOffset))\r
        FileProfile.PredicateExpressionList.append(PredExp)\r
@@ -180,7 +174,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -539,7 +533,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -790,14 +784,14 @@ class CParser(Parser):
 \r
                 if self.backtracking == 0:\r
                           \r
-                    if d != None:\r
-                      self.function_definition_stack[-1].ModifierText = self.input.toString(d.start,d.stop)\r
+                    if d is not None:\r
+                      self.function_definition_stack[-1].ModifierText = self.input.toString(d.start, d.stop)\r
                     else:\r
                       self.function_definition_stack[-1].ModifierText = ''\r
-                    self.function_definition_stack[-1].DeclText = self.input.toString(declarator1.start,declarator1.stop)\r
+                    self.function_definition_stack[-1].DeclText = self.input.toString(declarator1.start, declarator1.stop)\r
                     self.function_definition_stack[-1].DeclLine = declarator1.start.line\r
                     self.function_definition_stack[-1].DeclOffset = declarator1.start.charPositionInLine\r
-                    if a != None:\r
+                    if a is not None:\r
                       self.function_definition_stack[-1].LBLine = a.start.line\r
                       self.function_definition_stack[-1].LBOffset = a.start.charPositionInLine\r
                     else:\r
@@ -816,7 +810,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -927,10 +921,10 @@ class CParser(Parser):
                         return \r
                     if self.backtracking == 0:\r
                             \r
-                        if b != None:\r
-                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, self.input.toString(b.start,b.stop), self.input.toString(c.start,c.stop))\r
+                        if b is not None:\r
+                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, self.input.toString(b.start, b.stop), self.input.toString(c.start, c.stop))\r
                         else:\r
-                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start,c.stop))\r
+                          self.StoreTypedefDefinition(a.line, a.charPositionInLine, d.line, d.charPositionInLine, '', self.input.toString(c.start, c.stop))\r
                                  \r
 \r
 \r
@@ -964,14 +958,14 @@ class CParser(Parser):
                         return \r
                     if self.backtracking == 0:\r
                           \r
-                        if t != None:\r
-                          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))\r
+                        if t is not None:\r
+                          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))\r
                                \r
 \r
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1099,7 +1093,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1169,7 +1163,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1223,7 +1217,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1270,7 +1264,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1408,8 +1402,8 @@ class CParser(Parser):
                         return \r
                     if self.backtracking == 0:\r
                           \r
-                        if s.stop != None:\r
-                          self.StoreStructUnionDefinition(s.start.line, s.start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.input.toString(s.start,s.stop))\r
+                        if s.stop is not None:\r
+                          self.StoreStructUnionDefinition(s.start.line, s.start.charPositionInLine, s.stop.line, s.stop.charPositionInLine, self.input.toString(s.start, s.stop))\r
                                \r
 \r
 \r
@@ -1423,8 +1417,8 @@ class CParser(Parser):
                         return \r
                     if self.backtracking == 0:\r
                           \r
-                        if e.stop != None:\r
-                          self.StoreEnumerationDefinition(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))\r
+                        if e.stop is not None:\r
+                          self.StoreEnumerationDefinition(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))\r
                                \r
 \r
 \r
@@ -1439,7 +1433,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1472,7 +1466,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1596,7 +1590,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1643,7 +1637,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1706,7 +1700,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1749,7 +1743,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1868,7 +1862,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -1928,7 +1922,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2010,7 +2004,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2165,7 +2159,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2230,7 +2224,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2282,7 +2276,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2329,7 +2323,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -2471,7 +2465,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3063,7 +3057,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3213,7 +3207,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3469,7 +3463,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3535,7 +3529,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3624,7 +3618,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3832,7 +3826,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3888,7 +3882,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -3978,7 +3972,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4226,7 +4220,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4577,7 +4571,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4697,7 +4691,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4777,7 +4771,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4842,7 +4836,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -4940,7 +4934,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5019,7 +5013,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5110,7 +5104,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5210,7 +5204,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5362,7 +5356,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5407,7 +5401,7 @@ class CParser(Parser):
                 if self.failed:\r
                     return \r
                 if self.backtracking == 0:\r
-                    self.postfix_expression_stack[-1].FuncCallText += self.input.toString(p.start,p.stop)\r
+                    self.postfix_expression_stack[-1].FuncCallText += self.input.toString(p.start, p.stop)\r
 \r
                 # C.g:407:9: ( '[' expression ']' | '(' a= ')' | '(' c= argument_expression_list b= ')' | '(' macro_parameter_list ')' | '.' x= IDENTIFIER | '*' y= IDENTIFIER | '->' z= IDENTIFIER | '++' | '--' )*\r
                 while True: #loop65\r
@@ -5507,7 +5501,7 @@ class CParser(Parser):
                         if self.failed:\r
                             return \r
                         if self.backtracking == 0:\r
-                            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))\r
+                            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))\r
 \r
 \r
 \r
@@ -5590,7 +5584,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5651,7 +5645,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5698,7 +5692,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -5796,7 +5790,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -6002,7 +5996,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -6072,7 +6066,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -6107,7 +6101,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8142,7 +8136,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8177,7 +8171,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8224,7 +8218,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8283,7 +8277,7 @@ class CParser(Parser):
                     if self.failed:\r
                         return \r
                     if self.backtracking == 0:\r
-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))\r
+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))\r
 \r
 \r
 \r
@@ -8292,7 +8286,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8362,7 +8356,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8422,7 +8416,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8482,7 +8476,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8542,7 +8536,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8602,7 +8596,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8676,7 +8670,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8750,7 +8744,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -8824,7 +8818,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9065,7 +9059,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9162,7 +9156,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9235,7 +9229,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -9308,7 +9302,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -12474,7 +12468,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -12567,7 +12561,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -14537,7 +14531,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16258,7 +16252,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16329,7 +16323,7 @@ class CParser(Parser):
                 retval.stop = self.input.LT(-1)\r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16390,7 +16384,7 @@ class CParser(Parser):
                     if self.failed:\r
                         return \r
                     if self.backtracking == 0:\r
-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))\r
+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))\r
 \r
                     self.following.append(self.FOLLOW_statement_in_selection_statement2284)\r
                     self.statement()\r
@@ -16442,7 +16436,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16509,7 +16503,7 @@ class CParser(Parser):
                     if self.failed:\r
                         return \r
                     if self.backtracking == 0:\r
-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))\r
+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))\r
 \r
 \r
 \r
@@ -16541,7 +16535,7 @@ class CParser(Parser):
                     if self.failed:\r
                         return \r
                     if self.backtracking == 0:\r
-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))\r
+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))\r
 \r
 \r
 \r
@@ -16588,12 +16582,12 @@ class CParser(Parser):
                     if self.failed:\r
                         return \r
                     if self.backtracking == 0:\r
-                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start,e.stop))\r
+                        self.StorePredicateExpression(e.start.line, e.start.charPositionInLine, e.stop.line, e.stop.charPositionInLine, self.input.toString(e.start, e.stop))\r
 \r
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r
@@ -16710,7 +16704,7 @@ class CParser(Parser):
 \r
 \r
 \r
-            except RecognitionException, re:\r
+            except RecognitionException as re:\r
                 self.reportError(re)\r
                 self.recover(self.input, re)\r
         finally:\r