Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2011-02-18 00:06:35 +0300
committerMarek Safar <marek.safar@gmail.com>2011-02-18 00:06:35 +0300
commit1be427d6d3c4d46903e854e1e79fd07a355b8859 (patch)
treea56e8cfb459e7c7b3f803c9d4d23abe2cfdb0c3c
parent862e1a20d2cf7991a4c0b2b8e1a1ba5331cae232 (diff)
Fix repl using declaration after type declaration
-rw-r--r--mcs/class/Mono.CSharp/Test/Evaluator/TypesTest.cs8
-rw-r--r--mcs/mcs/eval.cs1
2 files changed, 9 insertions, 0 deletions
diff --git a/mcs/class/Mono.CSharp/Test/Evaluator/TypesTest.cs b/mcs/class/Mono.CSharp/Test/Evaluator/TypesTest.cs
index c956c399d58..93fbcb4a0e5 100644
--- a/mcs/class/Mono.CSharp/Test/Evaluator/TypesTest.cs
+++ b/mcs/class/Mono.CSharp/Test/Evaluator/TypesTest.cs
@@ -44,5 +44,13 @@ namespace MonoTests.EvaluatorTest
object res = Evaluator.Evaluate ("typeof (Z);");
Assert.AreEqual ("Z", res.ToString ());
}
+
+ [Test]
+ public void UsingAfterType ()
+ {
+ Evaluator.Run ("struct Z { }");
+ Evaluator.Run ("using System;");
+ Evaluator.Run ("struct Z { }");
+ }
}
} \ No newline at end of file
diff --git a/mcs/mcs/eval.cs b/mcs/mcs/eval.cs
index 61aee92b88c..f8aaaf33778 100644
--- a/mcs/mcs/eval.cs
+++ b/mcs/mcs/eval.cs
@@ -548,6 +548,7 @@ namespace Mono.CSharp
if (ns == null)
ns = new NamespaceEntry (module, null, Location.SourceFiles[0], null);
+ ns.DeclarationFound = false;
CSharpParser parser = new CSharpParser (seekable, Location.SourceFiles [0], module, ns);
if (kind == InputKind.StatementOrExpression){