Default to expression contextual keywords for repl

diff --git a/mcs/mcs/eval.cs b/mcs/mcs/eval.cs
index 457bff4986b8df63dca767465f3de4899f132521..bb0260575a4a47839914da95df46a96d86cf4227 100644 (file)
--- a/mcs/mcs/eval.cs
+++ b/mcs/mcs/eval.cs
@@ -455,6 +455,9 @@ namespace Mono.CSharp
                {
                        Tokenizer tokenizer = new Tokenizer (seekable, source_file, new ParserSession ());
                        
+                       // Prefer contextual block keywords over identifiers
+                       tokenizer.parsing_block++;
+
                        int t = tokenizer.token ();
                        switch (t){
                        case Token.EOF:
@@ -586,6 +589,7 @@ namespace Mono.CSharp
 
                        if (kind == InputKind.StatementOrExpression){
                                parser.Lexer.putback_char = Tokenizer.EvalStatementParserCharacter;
+                               parser.Lexer.parsing_block++;
                                ctx.Settings.StatementMode = true;
                        } else {
                                parser.Lexer.putback_char = Tokenizer.EvalCompilationUnitParserCharacter;