a. Fixed the incorrect generated array in c code for default store va…

…lues. b. Fixed the version string. git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@1239 7335b38e-4728-0410-8992-fb3ffe349368
mcb30 · May 21, 2008 · 0cd1859 · 0cd1859
1 parent ceec92f
commit 0cd1859
Show file tree

Hide file tree

Showing 6 changed files with 174 additions and 168 deletions.
diff --git a/Source/C/VfrCompile/VfrCompiler.h b/Source/C/VfrCompile/VfrCompiler.h
@@ -1,15 +1,15 @@
 /** @file
-  
+
   VfrCompiler internal defintions.
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. 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        
-http://opensource.org/licenses/bsd-license.php                                            
-                                                                                          
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+Copyright (c) 2004 - 2008, Intel Corporation
+All rights reserved. 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
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "VfrUtilityLib.h"
 
 #define PROGRAM_NAME                       "VfrCompile"
-#define VFR_COMPILER_VERSION               "UEFI 2.1"
+#define VFR_COMPILER_VERSION               "1.90 (UEFI 2.1)"
 
 //
 // This is how we invoke the C preprocessor on the VFR source file

diff --git a/Source/C/VfrCompile/VfrError.cpp b/Source/C/VfrCompile/VfrError.cpp
@@ -42,6 +42,7 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = {
   { VFR_RETURN_FLAGS_UNSUPPORTED, "flags unsupported" },
   { VFR_RETURN_ERROR_ARRARY_NUM, "array number error" },
   { VFR_RETURN_DATA_STRING_ERROR, "data field string error or not support"},
+  { VFR_RETURN_DEFAULT_VALUE_REDEFINED, "Default value re-defined with different value"},
   { VFR_RETURN_CODEUNDEFINED, "Undefined Error Code" }
 };
 

diff --git a/Source/C/VfrCompile/VfrError.h b/Source/C/VfrCompile/VfrError.h
@@ -1,15 +1,15 @@
 /** @file
-  
+
   VfrCompiler Error definition
 
-Copyright (c) 2004 - 2008, Intel Corporation                                                         
-All rights reserved. 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        
-http://opensource.org/licenses/bsd-license.php                                            
-                                                                                          
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+Copyright (c) 2004 - 2008, Intel Corporation
+All rights reserved. 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
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 
@@ -40,6 +40,7 @@ typedef enum {
   VFR_RETURN_FLAGS_UNSUPPORTED,
   VFR_RETURN_ERROR_ARRARY_NUM,
   VFR_RETURN_DATA_STRING_ERROR,
+  VFR_RETURN_DEFAULT_VALUE_REDEFINED,
   VFR_RETURN_CODEUNDEFINED
 } EFI_VFR_RETURN_CODE;
 

diff --git a/Source/C/VfrCompile/VfrSyntax.g b/Source/C/VfrCompile/VfrSyntax.g
@@ -915,7 +915,7 @@ vfrStatementDefault :
 																					 _GET_CURRQEST_VARTINFO(),
 																					 VarStoreName,
 																					 _GET_CURRQEST_DATATYPE (),
-																					 Val), D->getLine());
+																					 Val), D);
 													   }
 													>>
   )