Fix various parser bugs related to modifiers of top-level and class members.

dart/tests/compiler/dart2js/patch_test.dart

Index: dart/tests/compiler/dart2js/patch_test.dart
diff --git a/dart/tests/compiler/dart2js/patch_test.dart b/dart/tests/compiler/dart2js/patch_test.dart
index 7463d7e5eac73db95fda076af03defd974c845d3..779efceb5b776642180adf057f2e79698897bc12 100644
--- a/dart/tests/compiler/dart2js/patch_test.dart
+++ b/dart/tests/compiler/dart2js/patch_test.dart
@@ -506,9 +506,13 @@ testPatchNonPatchableOrigin() {
   Expect.isTrue(compiler.warnings.isEmpty,
                 "Unexpected warnings: ${compiler.warnings}");
   print('testPatchNonPatchableOrigin:${compiler.errors}');
-  Expect.equals(1, compiler.errors.length);
-  Expect.isTrue(
-      compiler.errors[0].message.kind == MessageKind.PATCH_NONPATCHABLE);
+  Expect.equals(2, compiler.errors.length);
+  Expect.equals(
+      MessageKind.EXTRANEOUS_MODIFIER, compiler.errors[0].message.kind);
+  Expect.equals(
+      // TODO(ahe): Eventually, this error should be removed as it will be
+      // handled by the regular parser.
+      MessageKind.PATCH_NONPATCHABLE, compiler.errors[1].message.kind);
 }
 
 testPatchNonExternalTopLevel() {