Fixed build error when using gcc 4.1. gcc 4.1 would flag an error

if the class was specified on functions defined inside the class
structure.

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@799 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/VfrCompile/VfrCompile.g b/Source/C/VfrCompile/VfrCompile.g
index 376602d..7b9253b 100644 (file)
--- a/Source/C/VfrCompile/VfrCompile.g
+++ b/Source/C/VfrCompile/VfrCompile.g
@@ -2076,7 +2076,7 @@ private:
 public:        \r
 \r
 VOID \r
-EfiVfrParser::SetIfStart (\r
+SetIfStart (\r
   UINT32 LineNum\r
   )\r
 /*++\r
@@ -2097,7 +2097,7 @@ Returns:
   mIfStart = LineNum;\r
 }\r
 VOID \r
-EfiVfrParser::SetClass (\r
+SetClass (\r
   UINT32 LineNum, \r
   UINT32 Value\r
   ) \r
@@ -2122,7 +2122,7 @@ Returns:
   mClass |= (UINT16)Value;\r
 }\r
 VOID \r
-EfiVfrParser::SetSubclass (\r
+SetSubclass (\r
   UINT32 LineNum, \r
   UINT32 Value\r
   ) \r
@@ -2146,22 +2146,22 @@ Returns:
   }\r
   mSubclass |= (UINT16)Value;\r
 }\r
-VOID EfiVfrParser::WriteClass ()\r
+VOID WriteClass ()\r
 {\r
   WriteWord (mClass);\r
   mClass = 0;\r
 }\r
-VOID EfiVfrParser::WriteSubclass ()\r
+VOID WriteSubclass ()\r
 {\r
   WriteWord (mSubclass);\r
   mSubclass = 0;\r
 }\r
-VOID EfiVfrParser::WriteIfrBytes ()\r
+VOID WriteIfrBytes ()\r
 {\r
   mOpcodeHandler.WriteIfrBytes ();\r
 }\r
 VOID \r
-EfiVfrParser::WriteFlagsKey (\r
+WriteFlagsKey (\r
   UINT32 KeyValue, \r
   UINT32 LineNum\r
   ) \r
@@ -2194,12 +2194,12 @@ Returns:
   WriteWord (KeyValue);\r
 }\r
 VOID \r
-EfiVfrParser::InitOrderedList ()\r
+InitOrderedList ()\r
 {\r
   mOptionCount = 0;\r
 }  \r
 VOID \r
-EfiVfrParser::EndOrderedList (\r
+EndOrderedList (\r
   UINT32 LineNum\r
   )\r
 {\r
@@ -2208,7 +2208,7 @@ EfiVfrParser::EndOrderedList (
   }\r
 }\r
 VOID \r
-EfiVfrParser::ResetFlags ()\r
+ResetFlags ()\r
 /*++\r
 \r
 Routine Description:\r
@@ -2235,7 +2235,7 @@ Returns:
 // Test validity of flags value for a one-of statement.\r
 //\r
 VOID \r
-EfiVfrParser::TestOneOfFlags (\r
+TestOneOfFlags (\r
   UINT32 LineNum\r
   ) \r
 {\r
@@ -2247,7 +2247,7 @@ EfiVfrParser::TestOneOfFlags (
   }\r
 }\r
 VOID \r
-EfiVfrParser::SetFlags (\r
+SetFlags (\r
   UINT32 Flags, \r
   UINT32 LineNum\r
   ) \r
@@ -2265,7 +2265,7 @@ EfiVfrParser::SetFlags (
   mSubStmtFlagsLineNum = LineNum;\r
 }\r
 VOID \r
-EfiVfrParser::WriteFlags ()\r
+WriteFlags ()\r
 {\r
   //\r
   // Check value for validity\r
@@ -2290,7 +2290,7 @@ EfiVfrParser::WriteFlags ()
 // later use. Call this first to init the values.\r
 //\r
 VOID \r
-EfiVfrParser::InitMinMaxStepDefault ()\r
+InitMinMaxStepDefault ()\r
 {\r
   mMinimumValue         = 0;\r
   mMaximumValue         = 0;\r
@@ -2298,7 +2298,7 @@ EfiVfrParser::InitMinMaxStepDefault ()
   mDefaultValue         = 0;\r
 }  \r
 VOID \r
-EfiVfrParser::WriteMinMaxStepDefault ()\r
+WriteMinMaxStepDefault ()\r
 {\r
   WriteWord (mMinimumValue);\r
   WriteWord (mMaximumValue);\r
@@ -2306,7 +2306,7 @@ EfiVfrParser::WriteMinMaxStepDefault ()
   WriteWord (mDefaultValue);\r
 }  \r
 VOID \r
-EfiVfrParser::SetMinMaxStepDefault (\r
+SetMinMaxStepDefault (\r
   UINT16  Value, \r
   INT32   MMSD, \r
   INT32   LineNum\r
@@ -2355,7 +2355,7 @@ EfiVfrParser::SetMinMaxStepDefault (
   }\r
 }\r
 VOID \r
-EfiVfrParser::AddLabel (\r
+AddLabel (\r
   UINT32 LabelNumber, \r
   UINT32 LineNum\r
   ) \r
@@ -2385,7 +2385,7 @@ EfiVfrParser::AddLabel (
   mDefinedLabels = Label;\r
 }\r
 VOID \r
-EfiVfrParser::QueueIdEqValList (\r
+QueueIdEqValList (\r
   UINT16 Value\r
   )\r
 {\r
@@ -2406,7 +2406,7 @@ EfiVfrParser::QueueIdEqValList (
   }\r
 }    \r
 VOID \r
-EfiVfrParser::FlushQueueIdEqValList ()\r
+FlushQueueIdEqValList ()\r
 {\r
   UINT32 Count;\r
   \r
@@ -2441,7 +2441,7 @@ EfiVfrParser::FlushQueueIdEqValList ()
   }\r
 }\r
 VOID \r
-EfiVfrParser::PrintErrorMessage (\r
+PrintErrorMessage (\r
   UINT32              LineNum,\r
   CHAR8               *Msg1,\r
   CHAR8               *Msg2\r
@@ -2457,7 +2457,7 @@ EfiVfrParser::PrintErrorMessage (
   }\r
 }\r
 VOID \r
-EfiVfrParser::PrintWarningMessage (\r
+PrintWarningMessage (\r
   UINT32              LineNum,\r
   CHAR8               *Msg1,\r
   CHAR8               *Msg2\r
@@ -2473,7 +2473,7 @@ EfiVfrParser::PrintWarningMessage (
   }\r
 }\r
 VOID \r
-EfiVfrParser::syn (\r
+syn (\r
   ANTLRAbstractToken  *Tok, \r
   ANTLRChar           *Egroup, \r
   SetWordType         *Eset, \r
@@ -2523,7 +2523,7 @@ Returns:
 }\r
 \r
 VOID \r
-EfiVfrParser::init()        \r
+init()        \r
 /*++\r
 \r
 Routine Description:\r
@@ -2565,12 +2565,12 @@ Returns:
 //\r
 // Destructor for the parser.\r
 //\r
-EfiVfrParser::~EfiVfrParser(VOID)\r
+~EfiVfrParser(VOID)\r
 {\r
   Cleanup();\r
 }\r
 VOID\r
-EfiVfrParser::Cleanup (VOID)\r
+Cleanup (VOID)\r
 /*++\r
 \r
 Routine Description:\r
@@ -2630,7 +2630,7 @@ Returns:
 }\r
 \r
 INT32 \r
-EfiVfrParser::AtoX (\r
+AtoX (\r
   CHAR8   *HexString, \r
   INT32   NumBytes, \r
   UINT32  *HexValue\r
@@ -2684,7 +2684,7 @@ Returns:
   return Count;\r
 }\r
 VOID \r
-EfiVfrParser::WriteGuidValue (\r
+WriteGuidValue (\r
   UINT32       TokenLineNum,\r
   CHAR8        *G1, \r
   CHAR8        *G2,\r
@@ -2743,7 +2743,7 @@ Returns:
   WriteByte (mFormSetGuid.Data4[7], 0);\r
 }\r
 VOID \r
-EfiVfrParser::WriteFieldOffset (\r
+WriteFieldOffset (\r
   INT8    WriteLength,\r
   CHAR8   *StructName, \r
   INT32   LineNum1, \r
@@ -2979,7 +2979,7 @@ Returns:
   }\r
 }\r
 VOID\r
-EfiVfrParser::StartStructDefinition (\r
+StartStructDefinition (\r
   INT32  IsNonNV,\r
   INT32  LineNum\r
   )\r
@@ -3022,7 +3022,7 @@ Returns:
   mLastStructDefinition = StructDef;\r
 }\r
 VOID\r
-EfiVfrParser::EndStructDefinition (\r
+EndStructDefinition (\r
   CHAR8  *StructName,\r
   INT32  LineNum\r
   )\r
@@ -3080,7 +3080,7 @@ EfiVfrParser::EndStructDefinition (
   }\r
 }\r
 VOID \r
-EfiVfrParser::AddStructField (\r
+AddStructField (\r
   CHAR8   *FieldName, \r
   INT32   LineNum, \r
   INT32   DataSize,\r
@@ -3145,7 +3145,7 @@ Returns:
   mLastStructDefinition->LastField = FieldDef;\r
 }\r
 VOID\r
-EfiVfrParser::AddVarStore (\r
+AddVarStore (\r
   CHAR8  *StructName,       // actual name of the structure\r
   CHAR8  *VarName,          // actual NV variable name\r
   UINT16 VarStoreId,        // key value\r
@@ -3228,7 +3228,7 @@ Returns:
   PrintErrorMessage (LineNum, StructName, "structure with this name not defined");\r
 }\r
 VOID \r
-EfiVfrParser::WriteDWord (\r
+WriteDWord (\r
   UINT32    Value, \r
   UINT8     KeyByte\r
   )\r
@@ -3261,7 +3261,7 @@ Returns:
   mOpcodeHandler.AddByte ((UINT8)Value, 0);\r
 }\r
 VOID \r
-EfiVfrParser::WriteOpByte (\r
+WriteOpByte (\r
   UINT32    LineNum,\r
   UINT8     ByteValue\r
   )\r
@@ -3285,7 +3285,7 @@ Returns:
   mOpcodeHandler.AddOpcodeByte (ByteValue, LineNum);\r
 }\r
 VOID \r
-EfiVfrParser::WriteByte (\r
+WriteByte (\r
   UINT8   ByteValue, \r
   UINT8   Key\r
   )\r
@@ -3312,7 +3312,7 @@ Returns:
   mOpcodeHandler.AddByte (ByteValue, Key);\r
 }\r
 VOID \r
-EfiVfrParser::WriteWord (\r
+WriteWord (\r
   UINT32  Value\r
   )\r
 /*++\r
@@ -3333,7 +3333,7 @@ Returns:
   mOpcodeHandler.AddByte ((UINT8)((Value \>> 8) & 0xFF), 0);\r
 }\r
 VOID \r
-EfiVfrParser::WriteStringIdWord (\r
+WriteStringIdWord (\r
   UINT16 WordValue\r
   )\r
 {\r
@@ -3341,7 +3341,7 @@ EfiVfrParser::WriteStringIdWord (
   mOpcodeHandler.AddByte ((UINT8)((WordValue \>> 8) & 0xFF), 0);\r
 }\r
 VOID\r
-EfiVfrParser::FreeGotoReferences ()\r
+FreeGotoReferences ()\r
 /*++\r
 \r
 Routine Description:\r
@@ -3399,7 +3399,7 @@ Returns:
   mGotoReferences = NULL;\r
 }\r
 VOID\r
-EfiVfrParser::AddGotoReference (\r
+AddGotoReference (\r
   UINT32  GotoNumber,\r
   UINT32  LineNum\r
   )\r
@@ -3434,7 +3434,7 @@ Returns:
   mGotoReferences = NewRef;\r
 }\r
 VOID\r
-EfiVfrParser::AddFormId (\r
+AddFormId (\r
   INT32   FormIdValue,\r
   UINT32  LineNum\r
   )\r
@@ -3500,7 +3500,7 @@ Returns:
   mFormIdValues = NewFormId;\r
 }\r
 UINT32\r
-EfiVfrParser::GetNumber (\r
+GetNumber (\r
   CHAR8   *NumStr,\r
   UINT32  LineNum,\r
   UINT32  NumBytes\r