X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FEcc%2Fc.py;h=39a9d8ac363a8abeb1cbe060010ad0c98b6a633c;hb=dbc85eb993439a7006bb20091c1cc6de43d19e80;hp=256b9e021c265d5a12a74b8fe32114873c720f11;hpb=00261e1dc62ec078391f0239683ba7a709d3122d;p=mirror_edk2.git

diff --git a/BaseTools/Source/Python/Ecc/c.py b/BaseTools/Source/Python/Ecc/c.py
index 256b9e021c..39a9d8ac36 100644
--- a/BaseTools/Source/Python/Ecc/c.py
+++ b/BaseTools/Source/Python/Ecc/c.py
@@ -1,7 +1,7 @@
 ## @file
 # This file is used to be the c coding style checking of ECC tool
 #
-# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -271,7 +271,7 @@ def GetIdentifierList():
 def StripNonAlnumChars(Str):
     StrippedStr = ''
     for Char in Str:
-        if Char.isalnum():
+        if Char.isalnum() or Char == '_':
             StrippedStr += Char
     return StrippedStr
 
@@ -1568,7 +1568,7 @@ def CheckMemberVariableFormat(Name, Value, FileTable, TdId, ModelId):
     Fields = Value[LBPos + 1 : RBPos]
     Fields = StripComments(Fields).strip()
     NestPos = Fields.find ('struct')
-    if NestPos != -1 and (NestPos + len('struct') < len(Fields)):
+    if NestPos != -1 and (NestPos + len('struct') < len(Fields)) and ModelId != DataClass.MODEL_IDENTIFIER_UNION:
         if not Fields[NestPos + len('struct') + 1].isalnum():
             if not EccGlobalData.gException.IsException(ERROR_DECLARATION_DATA_TYPE_CHECK_NESTED_STRUCTURE, Name):
                 PrintErrorMsg(ERROR_DECLARATION_DATA_TYPE_CHECK_NESTED_STRUCTURE, 'Nested struct in [%s].' % (Name), FileTable, TdId)
@@ -1858,7 +1858,13 @@ def CheckDeclNoUseCType(FullFileName):
     for Result in ResultSet:
         for Type in CTypeTuple:
             if PatternInModifier(Result[0], Type):
-                PrintErrorMsg(ERROR_DECLARATION_DATA_TYPE_CHECK_NO_USE_C_TYPE, 'Variable type %s' % Type, FileTable, Result[2])
+                if EccGlobalData.gException.IsException(ERROR_DECLARATION_DATA_TYPE_CHECK_NO_USE_C_TYPE,
+                                                        Result[0] + ' ' + Result[1]):
+                    continue
+                PrintErrorMsg(ERROR_DECLARATION_DATA_TYPE_CHECK_NO_USE_C_TYPE,
+                              'Invalid variable type (%s) in definition [%s]' % (Type, Result[0] + ' ' + Result[1]),
+                              FileTable,
+                              Result[2])
                 break
 
     SqlStatement = """ select Modifier, Name, ID, Value
@@ -2216,7 +2222,8 @@ def CheckDoxygenCommand(FullFileName):
                        where Model = %d or Model = %d
                    """ % (FileTable, DataClass.MODEL_IDENTIFIER_COMMENT, DataClass.MODEL_IDENTIFIER_FUNCTION_HEADER)
     ResultSet = Db.TblFile.Exec(SqlStatement)
-    DoxygenCommandList = ['bug', 'todo', 'example', 'file', 'attention', 'param', 'post', 'pre', 'retval', 'return', 'sa', 'since', 'test', 'note', 'par']
+    DoxygenCommandList = ['bug', 'todo', 'example', 'file', 'attention', 'param', 'post', 'pre', 'retval',
+                          'return', 'sa', 'since', 'test', 'note', 'par', 'endcode', 'code']
     for Result in ResultSet:
         CommentStr = Result[0]
         CommentPartList = CommentStr.split()
@@ -2228,6 +2235,10 @@ def CheckDoxygenCommand(FullFileName):
             if Part.startswith('@'):
                 if EccGlobalData.gException.IsException(ERROR_DOXYGEN_CHECK_COMMAND, Part):
                     continue
+                if not Part.replace('@', '').strip():
+                    continue
+                if Part.lstrip('@') in ['{', '}']:
+                    continue
                 if Part.lstrip('@').isalpha():
                     if Part.lstrip('@') not in DoxygenCommandList:
                         PrintErrorMsg(ERROR_DOXYGEN_CHECK_COMMAND, 'Unknown doxygen command %s' % Part, FileTable, Result[1])