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 94711a9a378ad9ab8177798b84ffdeb487847a32..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
@@ -102,8 +103,8 @@ class CParser(Parser):
         self.postfix_expression_stack = []\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
@@ -173,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
@@ -532,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
@@ -784,10 +785,10 @@ class CParser(Parser):
                 if self.backtracking == 0:\r
                           \r
                     if d is not None:\r
-                      self.function_definition_stack[-1].ModifierText = self.input.toString(d.start,d.stop)\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 is not None:\r
@@ -809,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
@@ -921,9 +922,9 @@ class CParser(Parser):
                     if self.backtracking == 0:\r
                             \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
+                          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
@@ -958,13 +959,13 @@ class CParser(Parser):
                     if self.backtracking == 0:\r
                           \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
+                          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
@@ -1092,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
@@ -1162,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
@@ -1216,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
@@ -1263,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
@@ -1402,7 +1403,7 @@ class CParser(Parser):
                     if self.backtracking == 0:\r
                           \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
+                          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
@@ -1417,7 +1418,7 @@ class CParser(Parser):
                     if self.backtracking == 0:\r
                           \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
+                          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
@@ -1432,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
@@ -1465,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
@@ -1589,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
@@ -1636,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
@@ -1699,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
@@ -1742,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
@@ -1861,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
@@ -1921,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
@@ -2003,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
@@ -2158,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
@@ -2223,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
@@ -2275,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
@@ -2322,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
@@ -2464,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
@@ -3056,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
@@ -3206,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
@@ -3462,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
@@ -3528,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
@@ -3617,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
@@ -3825,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
@@ -3881,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
@@ -3971,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
@@ -4219,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
@@ -4570,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
@@ -4690,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
@@ -4770,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
@@ -4835,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
@@ -4933,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
@@ -5012,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
@@ -5103,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
@@ -5203,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
@@ -5355,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
@@ -5400,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
@@ -5500,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
@@ -5583,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
@@ -5644,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
@@ -5691,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
@@ -5789,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
@@ -5995,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
@@ -6065,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
@@ -6100,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
@@ -8135,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
@@ -8170,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
@@ -8217,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
@@ -8276,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
@@ -8285,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
@@ -8355,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
@@ -8415,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
@@ -8475,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
@@ -8535,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
@@ -8595,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
@@ -8669,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
@@ -8743,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
@@ -8817,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
@@ -9058,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
@@ -9155,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
@@ -9228,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
@@ -9301,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
@@ -12467,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
@@ -12560,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
@@ -14530,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
@@ -16251,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
@@ -16322,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
@@ -16383,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
@@ -16435,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
@@ -16502,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
@@ -16534,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
@@ -16581,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
@@ -16703,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