2005-12-23 Miguel de Icaza <miguel@novell.com>

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

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index bdb137cbc341d98b97acd92726c98703f2823056..a88ca9764f7b258086673b77f784f50b4bd68681 100644 (file)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -4685,13 +4685,12 @@ TypeContainer pop_current_class ()
 {
        TypeContainer retval = current_class;
 
-       current_class = current_class.Parent;
-       current_container = current_container.Parent;
-       
+       current_class = (TypeContainer) current_class.Parent;
+       current_container = (TypeContainer) current_container.Parent;
+
        if (current_class != current_container) {
-               if (!(current_class is ClassPart) ||
-                   ((ClassPart) current_class).PartialContainer != current_container)
-                       throw new InternalErrorException ();
+               if (((ClassPart) current_class).PartialContainer != current_container)
+                       throw new InternalErrorException ("current_container and current_class are out of sync");
        } else if (current_container is ClassPart)
                current_container = ((ClassPart) current_class).PartialContainer;