**** Merged r48805-r48851 from MCS ****

[mono.git] / mcs / gmcs / cs-parser.jay

diff --git a/mcs/gmcs/cs-parser.jay b/mcs/gmcs/cs-parser.jay
index b4498bb2b361238aa3a2400bd4268d6b2a184c64..18d47afdaaf90746ccaf03291e8ebf7d9f23b6a2 100644 (file)
--- a/mcs/gmcs/cs-parser.jay
+++ b/mcs/gmcs/cs-parser.jay
@@ -4200,7 +4200,8 @@ if_statement
 
                $$ = new If ((Expression) $3, (Statement) $5, l);
 
-               if (RootContext.WarningLevel >= 4){
+               if (RootContext.WarningLevel >= 3){
+                       // FIXME: location for warning should be loc property of $5.
                        if ($5 == EmptyStatement.Value)
                                Report.Warning (642, l, "Possible mistaken empty statement");
                }
@@ -4212,6 +4213,14 @@ if_statement
                Location l = (Location) $1;
 
                $$ = new If ((Expression) $3, (Statement) $5, (Statement) $7, l);
+
+               if (RootContext.WarningLevel >= 3){
+                       // FIXME: location for warning should be loc property of $5 and $7.
+                       if ($5 == EmptyStatement.Value)
+                               Report.Warning (642, l, "Possible mistaken empty statement");
+                       if ($7 == EmptyStatement.Value)
+                               Report.Warning (642, l, "Possible mistaken empty statement");
+               }
          }
        ;
 
@@ -4316,11 +4325,6 @@ while_statement
          {
                Location l = (Location) $1;
                $$ = new While ((Expression) $3, (Statement) $5, l);
-       
-               if (RootContext.WarningLevel >= 4){
-                       if ($5 == EmptyStatement.Value)
-                               Report.Warning (642, l, "Possible mistaken empty statement");
-               }
          }
        ;
 
@@ -4391,11 +4395,6 @@ for_statement
 
                For f = new For ((Statement) $5, (Expression) $6, (Statement) $8, (Statement) $10, l);
 
-               if (RootContext.WarningLevel >= 4){
-                       if ($10 == EmptyStatement.Value)
-                               Report.Warning (642, (Location) $4, "Possible mistaken empty statement");
-               }
-
                current_block.AddStatement (f);
                while (current_block.Implicit)
                        current_block = current_block.Parent;
@@ -4781,11 +4780,6 @@ fixed_statement
 
                Fixed f = new Fixed ((Expression) $3, (ArrayList) $4, (Statement) $7, l);
 
-               if (RootContext.WarningLevel >= 4){
-                       if ($7 == EmptyStatement.Value)
-                               Report.Warning (642, l, "Possible mistaken empty statement");
-               }
-
                current_block.AddStatement (f);
                while (current_block.Implicit)
                        current_block = current_block.Parent;