2009-12-10 Marek Safar <marek.safar@gmail.com>

	* cs-parser.jay, statement.cs: Handle parser error in code
	completition.

svn path=/trunk/mcs/; revision=148024

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 54e986adba70510f7e8bd789a5646377beafde52..e5364e6aadab61ddb0ba82f47114ec5dadcf5955 100644 (file)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-10  Marek Safar  <marek.safar@gmail.com>
+
+       * cs-parser.jay, statement.cs: Handle parser error in code
+       completition.
+
 2009-12-10  Marek Safar  <marek.safar@gmail.com>
 
        * ecore.cs: Ignore base imported methods when they are already

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 6cfe93ef61b824dcead128806576e243451f4829..cac7c02e07b63971737ebfb15273edc414f4bb0d 100644 (file)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -4708,7 +4708,7 @@ interactive_statement_expression
        | error
          {
                Error_SyntaxError (yyToken);
-               $$ = null;
+               $$ = EmptyStatement.Value;
          }
        ;
        

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index 610213e405f233b1e5185682ea9b13dc363f2f16..26ca060c6151548b8ed6b4f1246a22967f67e9ea 100644 (file)
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -2122,7 +2122,7 @@ namespace Mono.CSharp {
                        //
                        int statement_count = statements.Count;
                        for (int ix = 0; ix < statement_count; ix++){
-                               Statement s = (Statement) statements [ix];
+                               Statement s = statements [ix];
                                // Check possible empty statement (CS0642)
                                if (ix + 1 < statement_count && ec.Report.WarningLevel >= 3 &&
                                        statements [ix + 1] is ExplicitBlock)