From: jlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 8 Feb 2010 05:37:56 +0000 (+0000)
Subject: Roll back to ECC previous stable version.
X-Git-Tag: edk2-stable201903~16389
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=f430c77b1b84463dd1b871add247e2c66b37c60d

Roll back to ECC previous stable version.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9947 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py
index 989ba7091d..b8b1d2d6f5 100644
--- a/BaseTools/Source/Python/Ecc/c.py
+++ b/BaseTools/Source/Python/Ecc/c.py
@@ -742,7 +742,7 @@ def SplitPredicateByOp(Str, Op, IsFuncCalling = False):
             return [Name]
         
         Name = Str[0:Index + IndexInRemainingStr].strip()
-        Value = Str[Index+IndexInRemainingStr+len(Op):].strip().strip(')')
+        Value = Str[Index+IndexInRemainingStr+len(Op):].strip()
         return [Name, Value]
     
     TmpStr = Str.rstrip(';').rstrip(')')
@@ -759,8 +759,6 @@ def SplitPredicateByOp(Str, Op, IsFuncCalling = False):
         TmpStr = Str[0:Index - 1]
 
 def SplitPredicateStr(Str):
-    
-    Str = Str.lstrip('(')
     IsFuncCalling = False
     p = GetFuncDeclPattern()
     TmpStr = Str.replace('.', '').replace('->', '')
@@ -1221,16 +1219,6 @@ def GetVarInfo(PredVarList, FuncRecord, FullFileName, IsFuncCall = False, Target
                 Type = GetRealType(Type, TypedefDict, TargetType)
                 return Type
 
-def GetTypeFromArray(Type, Var):
-    Count = Var.count('[')
-    
-    while Count > 0:
-        Type = Type.strip()
-        Type = Type.rstrip('*')
-        Count = Count - 1
-
-    return Type
-
 def CheckFuncLayoutReturnType(FullFileName):
     ErrorMsgList = []
     
@@ -1943,7 +1931,6 @@ def CheckPointerNullComparison(FullFileName):
                     FuncReturnTypeDict[PredVarStr] = Type
                 if Type == None:
                     continue
-                Type = GetTypeFromArray(Type, PredVarStr)
                 if Type.find('*') != -1:
                     PrintErrorMsg(ERROR_PREDICATE_EXPRESSION_CHECK_COMPARISON_NULL_TYPE, 'Predicate Expression: %s' % Exp, FileTable, Str[2])