Check for using 'this' and 'super'. Tests. Issue 662.

compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java

Index: compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java b/compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java
index 5618eba56eaf1079c9b3ac3b7c98f93a96c2db9c..5e6caf23b08b25f06d076b8900ed3903ae184974 100644
--- a/compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java
+++ b/compiler/java/com/google/dart/compiler/resolver/ResolverErrorCode.java
@@ -61,7 +61,6 @@ public enum ResolverErrorCode implements ErrorCode {
   EXPECTED_ONE_ARGUMENT("Expected one argument"),
   EXPECTED_STATIC_FIELD("expected a static field, but got %s"),
   EXTRA_TYPE_ARGUMENT("Type variables may not have type arguments"),
-  FACTORY_ACCESS_SUPER("Cannot use 'super' in a factory constructor"),
   FACTORY_CANNOT_BE_ABSTRACT("A factory cannot be abstract"),
   FACTORY_CANNOT_BE_CONST("A factory cannot be const"),
   FACTORY_CANNOT_BE_STATIC("A factory cannot be static"),
@@ -104,12 +103,15 @@ public enum ResolverErrorCode implements ErrorCode {
   PARAMETER_NOT_MATCH_FIELD("Could not match parameter initializer '%s' with any field"),
   RETHROW_NOT_IN_CATCH("Re-throw not in a catch block"),
   STATIC_FINAL_REQUIRES_VALUE("Static final fields must have an initial value"),
-  STATIC_METHOD_ACCESS_SUPER("Cannot use 'super' in a static method"),
-  STATIC_METHOD_ACCESS_THIS("Cannot use 'this' in a static method"),
+  SUPER_IN_FACTORY_CONSTRUCTOR("Cannot use 'super' in a factory constructor"),
+  SUPER_IN_STATIC_METHOD("Cannot use 'super' in a static method"),
   SUPER_OUTSIDE_OF_METHOD("Cannot use 'super' outside of a method"),
+  SUPER_ON_TOP_LEVEL("Cannot use 'super' in a top-level element"),
+  THIS_IN_STATIC_METHOD("Cannot use 'this' in a static method"),
+  THIS_ON_TOP_LEVEL("Cannot use 'this' in a top-level element"),
+  THIS_OUTSIDE_OF_METHOD("Cannot use 'this' outside of a method"),
+  THIS_IN_FACTORY_CONSTRUCTOR("Cannot use 'this' in a factory constructor"),
   TOO_MANY_QUALIFIERS_FOR_METHOD("Too many qualifiers for method or constructor"),
-  TOP_LEVEL_METHOD_ACCESS_SUPER("Cannot use 'super' in a top-level method"),
-  TOP_LEVEL_METHOD_ACCESS_THIS("Cannot use 'this' in a top-level method"),
   TYPE_ARGS_ONLY_ON_CONSTRUCTORS("Type arguments are only allowed on constructor methods"),
   TYPE_NOT_ASSIGNMENT_COMPATIBLE("%s is not assignable to %s"),
   TYPE_VARIABLE_IN_STATIC_CONTEXT("cannot access type variable %s in static context"),