[Patch] BaseTools: Convert incomplete expression with dangling while()

[Patch] BaseTools: Convert incomplete expression with dangling while()

[Yonghong Zhu]

From: Nikolai SAOUKH  <nms@otdel-1.org>

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Nikolai SAOUKH  <nms@otdel-1.org>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/C/VfrCompile/VfrSyntax.g | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index 4b42d3c..406dbc5 100644
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -1,9 +1,9 @@
 /*++ @file
 Vfr Syntax
 
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2017, 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
 http://opensource.org/licenses/bsd-license.php
 
@@ -31,12 +31,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "DLexerBase.h"
 #include "VfrLexer.h"
 #include "AToken.h"
 
 #define GET_LINENO(Obj)       ((Obj)->getLine())
-#define SET_LINE_INFO(Obj, L) {(Obj).SetLineNo((L)->getLine());} while (0)
-#define CRT_END_OP(Obj)       {CIfrEnd EObj; if (Obj != NULL) EObj.SetLineNo ((Obj)->getLine());} while (0)
+#define SET_LINE_INFO(Obj, L) do {(Obj).SetLineNo((L)->getLine());} while (0)
+#define CRT_END_OP(Obj)       do {CIfrEnd EObj; if (Obj != NULL) EObj.SetLineNo ((Obj)->getLine());} while (0)
 
 typedef ANTLRCommonToken ANTLRToken;
 
 class CVfrDLGLexer : public VfrLexer
 {
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Convert incomplete expression with dangling while()

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Sunday, January 22, 2017 11:39 AM
>To: edk2-devel@lists.01.org
>Cc: Nikolai SAOUKH <nms@otdel-1.org>
>Subject: [edk2] [Patch] BaseTools: Convert incomplete expression with
>dangling while()
>
>From: Nikolai SAOUKH  <nms@otdel-1.org>
>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Nikolai SAOUKH  <nms@otdel-1.org>
>Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/C/VfrCompile/VfrSyntax.g | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
>b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
>index 4b42d3c..406dbc5 100644
>--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
>+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
>@@ -1,9 +1,9 @@
> /*++ @file
> Vfr Syntax
>
>-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
>+Copyright (c) 2004 - 2017, 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
> http://opensource.org/licenses/bsd-license.php
>
>@@ -31,12 +31,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
>KIND, EITHER EXPRESS OR IMPLIED.
> #include "DLexerBase.h"
> #include "VfrLexer.h"
> #include "AToken.h"
>
> #define GET_LINENO(Obj)       ((Obj)->getLine())
>-#define SET_LINE_INFO(Obj, L) {(Obj).SetLineNo((L)->getLine());} while (0)
>-#define CRT_END_OP(Obj)       {CIfrEnd EObj; if (Obj != NULL) EObj.SetLineNo
>((Obj)->getLine());} while (0)
>+#define SET_LINE_INFO(Obj, L) do {(Obj).SetLineNo((L)->getLine());} while
>(0)
>+#define CRT_END_OP(Obj)       do {CIfrEnd EObj; if (Obj != NULL)
>EObj.SetLineNo ((Obj)->getLine());} while (0)
>
> typedef ANTLRCommonToken ANTLRToken;
>
> class CVfrDLGLexer : public VfrLexer
> {
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel