Add Cleanup method, also fix #region error messages.

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

diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
index 85147a4d11b7e0ebc006e880011a7ffd19d5f545..281d9d1199dec474c6209811f72e706b41ae50cc 100755 (executable)
--- a/mcs/mcs/cs-tokenizer.cs
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -1401,7 +1401,7 @@ namespace Mono.CSharp
                                        int state = (int) ifstack.Peek ();\r
 \r
                                        if ((state & REGION) != 0) {\r
-                                               Error_UnexpectedDirective ("#endregion directive expected");\r
+                                               Report.Error (1038, Location, "#endregion directive expected");\r
                                                return true;\r
                                        }\r
 \r
@@ -1431,7 +1431,7 @@ namespace Mono.CSharp
                                        int state = (int) ifstack.Peek ();\r
 \r
                                        if ((state & REGION) != 0) {\r
-                                               Error_UnexpectedDirective ("#endregion directive expected");\r
+                                               Report.Error (1038, Location, "#endregion directive expected");\r
                                                return true;\r
                                        }\r
 \r
@@ -1756,11 +1756,21 @@ namespace Mono.CSharp
                                return Token.ERROR;\r
                        }\r
 \r
-                       if (ifstack != null && ifstack.Count >= 1)\r
-                               Report.Error (1027, Location, "#endif/#endregion expected");\r
-\r
                        return Token.EOF;\r
                }\r
+\r
+               public void Cleanup ()\r
+               {\r
+                       if (ifstack != null && ifstack.Count >= 1) {\r
+                               int state = (int) ifstack.Pop ();\r
+                               if ((state & REGION) != 0)\r
+                                       Report.Error (1038, "#endregion directive expected");\r
+                               else \r
+                                       Report.Error (1027, "#endif directive expected");\r
+                       }\r
+                               \r
+               }\r
+\r
        }\r
 }\r
 \r