From fff9db5a8d5dab5cb2ec7dcd8d785859bb62f8ea Mon Sep 17 00:00:00 2001 From: Mathias Stearn Date: Fri, 29 Jul 2011 17:40:32 -0400 Subject: [PATCH] Preserve existing spacing when replacing 0 errorcodes --- buildscripts/errorcodes.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/buildscripts/errorcodes.py b/buildscripts/errorcodes.py index ce1b3e465d0..dec1030ddad 100755 --- a/buildscripts/errorcodes.py +++ b/buildscripts/errorcodes.py @@ -32,9 +32,9 @@ def assignErrorCodes(): codes = [] def readErrorCodes( callback, replaceZero = False ): - ps = [ re.compile( "(([umsg]asser(t|ted))) *\( *(\d+)" ) , - re.compile( "((User|Msg|MsgAssertion)Exceptio(n))\( *(\d+)" ) , - re.compile( "(((verify))) *\( *(\d+)" ) + ps = [ re.compile( "(([umsg]asser(t|ted))) *\(( *)(\d+)" ) , + re.compile( "((User|Msg|MsgAssertion)Exceptio(n))\(( *)(\d+)" ) , + re.compile( "(((verify))) *\(( *)(\d+)" ) ] for x in utils.getAllSourceFiles(): @@ -52,7 +52,8 @@ def readErrorCodes( callback, replaceZero = False ): m = m.groups() start = m[0] - code = m[3] + spaces = m[3] + code = m[4] if code == '0' and replaceZero : code = getNextCode( lastCodes ) lastCodes.append( code ) @@ -65,7 +66,7 @@ def readErrorCodes( callback, replaceZero = False ): codes.append( ( x , lineNum , line , code ) ) callback( x , lineNum , line , code ) - return start + "( " + code + return start + "(" + spaces + code line = re.sub( p, repl, line )