Revert "Refactor handling of compounds."

pkg/compiler/lib/src/resolution/access_semantics.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // TODO(johnniwinther): Temporarily copied from analyzer2dart. Merge when
 // we shared code with the analyzer and this semantic visitor is complete.
 
 /**
  * Code for classifying the semantics of identifiers appearing in a Dart file.
  */
 library dart2js.access_semantics;
 
 import '../constants/expressions.dart';
 import '../elements/elements.dart';
 import '../dart_types.dart';
 
 /// Enum representing the different kinds of destinations which a property
 /// access or method or function invocation might refer to.
 enum AccessKind {
   /// The destination of the access is an instance method, property, or field
   /// of a class, and thus must be determined dynamically.
   DYNAMIC_PROPERTY,
 
   // TODO(johnniwinther): Split these cases into captured and non-captured
   // local access.
   /// The destination of the access is a function that is defined locally within
   /// an enclosing function or method.
   LOCAL_FUNCTION,
 
-  /// The destination of the access is a non-final variable that is defined
-  /// locally within an enclosing function or method.
+  /// The destination of the access is a variable that is defined locally within
+  /// an enclosing function or method.
   LOCAL_VARIABLE,
 
-  /// The destination of the access is a final variable that is defined locally
-  /// within an enclosing function or method.
-  FINAL_LOCAL_VARIABLE,
-
-  /// The destination of the access is a variable that is defined as a non-final
-  /// parameter to an enclosing function or method.
+  /// The destination of the access is a variable that is defined as a parameter
+  /// to an enclosing function or method.
   PARAMETER,
 
-  /// The destination of the access is a variable that is defined as a final
-  /// parameter to an enclosing function or method.
-  FINAL_PARAMETER,
-
-  /// The destination of the access is a non-final field that is defined
-  /// statically within a class.
+  /// The destination of the access is a field that is defined statically within
+  /// a class.
   STATIC_FIELD,
 
-  /// The destination of the access is a final field that is defined statically
-  /// within a class.
-  FINAL_STATIC_FIELD,
-
   /// The destination of the access is a method that is defined statically
   /// within a class.
   STATIC_METHOD,
 
   /// The destination of the access is a property getter that is defined
   /// statically within a class.
   STATIC_GETTER,
 
   /// The destination of the access is a property setter that is defined
   /// statically within a class.
   STATIC_SETTER,
 
-  /// The destination of the access is a non-final top level variable defined
-  /// within a library.
+  /// The destination of the access is a top level variable defined within a
+  /// library.
   TOPLEVEL_FIELD,
 
-  /// The destination of the access is a final top level variable defined within
-  /// a library.
-  FINAL_TOPLEVEL_FIELD,
-
   /// The destination of the access is a top level method defined within a
   /// library.
   TOPLEVEL_METHOD,
 
   /// The destination of the access is a top level property getter defined
   /// within a library.
   TOPLEVEL_GETTER,
 
   /// The destination of the access is a top level property setter defined
   /// within a library.
@@ skipping 16 matching lines @@
   /// function expression `(){}` in the function expression invocation `(){}()`.
   EXPRESSION,
 
   /// The destination of the access is `this` of the enclosing class.
   THIS,
 
   /// The destination of the access is an instance method, property, or field
   /// of the enclosing class.
   THIS_PROPERTY,
 
-  /// The destination of the access is a non-final field of the super class of
-  /// the enclosing class.
+  /// The destination of the access is a field of the super class of the
+  /// enclosing class.
   SUPER_FIELD,
 
-  /// The destination of the access is a final field of the super class of the
-  /// enclosing class.
-  SUPER_FINAL_FIELD,
-
   /// The destination of the access is a method of the super class of the
   /// enclosing class.
   SUPER_METHOD,
 
   /// The destination of the access is a getter of the super class of the
   /// enclosing class.
   SUPER_GETTER,
 
   /// The destination of the access is a setter of the super class of the
   /// enclosing class.
   SUPER_SETTER,
 
   /// Compound access where read and write access different elements.
   /// See [CompoundAccessKind].
   COMPOUND,
 
   /// The destination of the access is a compile-time constant.
   CONSTANT,
 
   /// The destination of the access is unresolved in a static context.
   UNRESOLVED,
 
   /// The destination of the access is unresolved super access.
   UNRESOLVED_SUPER,
 }
 
 enum CompoundAccessKind {
-  /// Read from a static getter and write to a static setter.
+  /// Read from a static getter and write to static setter.
   STATIC_GETTER_SETTER,
-  /// Read from a static method (closurize) and write to a static setter.
+  /// Read from a static method (closurize) and write to static setter.
   STATIC_METHOD_SETTER,
 
-  /// Read from an unresolved static getter and write to a static setter.
-  UNRESOLVED_STATIC_GETTER,
-  /// Read from a static getter and write to an unresolved static setter.
-  UNRESOLVED_STATIC_SETTER,
-
   /// Read from a top level getter and write to a top level setter.
   TOPLEVEL_GETTER_SETTER,
   /// Read from a top level method (closurize) and write to top level setter.
   TOPLEVEL_METHOD_SETTER,
 
-  /// Read from an unresolved top level getter and write to a top level setter.
-  UNRESOLVED_TOPLEVEL_GETTER,
-  /// Read from a top level getter and write to an unresolved top level setter.
-  UNRESOLVED_TOPLEVEL_SETTER,
-
   /// Read from one superclass field and write to another.
   SUPER_FIELD_FIELD,
   /// Read from a superclass field and write to a superclass setter.
   SUPER_FIELD_SETTER,
   /// Read from a superclass getter and write to a superclass setter.
   SUPER_GETTER_SETTER,
   /// Read from a superclass method (closurize) and write to a superclass
   /// setter.
   SUPER_METHOD_SETTER,
   /// Read from a superclass getter and write to a superclass field.
@@ skipping 106 matching lines @@
 
   StaticAccess._(AccessKind kind, this.element)
       : super._(kind);
 
   StaticAccess.superSetter(MethodElement this.element)
       : super._(AccessKind.SUPER_SETTER);
 
   StaticAccess.superField(FieldElement this.element)
       : super._(AccessKind.SUPER_FIELD);
 
-  StaticAccess.superFinalField(FieldElement this.element)
-      : super._(AccessKind.SUPER_FINAL_FIELD);
-
   StaticAccess.superMethod(MethodElement this.element)
       : super._(AccessKind.SUPER_METHOD);
 
   StaticAccess.superGetter(MethodElement this.element)
       : super._(AccessKind.SUPER_GETTER);
 
   StaticAccess.typeParameterTypeLiteral(TypeVariableElement this.element)
       : super._(AccessKind.TYPE_PARAMETER_TYPE_LITERAL);
 
   StaticAccess.localFunction(LocalFunctionElement this.element)
       : super._(AccessKind.LOCAL_FUNCTION);
 
   StaticAccess.localVariable(LocalVariableElement this.element)
       : super._(AccessKind.LOCAL_VARIABLE);
 
-  StaticAccess.finalLocalVariable(LocalVariableElement this.element)
-      : super._(AccessKind.FINAL_LOCAL_VARIABLE);
-
   StaticAccess.parameter(ParameterElement this.element)
       : super._(AccessKind.PARAMETER);
 
-  StaticAccess.finalParameter(ParameterElement this.element)
-      : super._(AccessKind.FINAL_PARAMETER);
-
   StaticAccess.staticField(FieldElement this.element)
       : super._(AccessKind.STATIC_FIELD);
 
-  StaticAccess.finalStaticField(FieldElement this.element)
-      : super._(AccessKind.FINAL_STATIC_FIELD);
-
   StaticAccess.staticMethod(MethodElement this.element)
       : super._(AccessKind.STATIC_METHOD);
 
   StaticAccess.staticGetter(MethodElement this.element)
       : super._(AccessKind.STATIC_GETTER);
 
   StaticAccess.staticSetter(MethodElement this.element)
       : super._(AccessKind.STATIC_SETTER);
 
   StaticAccess.topLevelField(FieldElement this.element)
       : super._(AccessKind.TOPLEVEL_FIELD);
 
-  StaticAccess.finalTopLevelField(FieldElement this.element)
-      : super._(AccessKind.FINAL_TOPLEVEL_FIELD);
-
   StaticAccess.topLevelMethod(MethodElement this.element)
       : super._(AccessKind.TOPLEVEL_METHOD);
 
   StaticAccess.topLevelGetter(MethodElement this.element)
       : super._(AccessKind.TOPLEVEL_GETTER);
 
   StaticAccess.topLevelSetter(MethodElement this.element)
       : super._(AccessKind.TOPLEVEL_SETTER);
 
   StaticAccess.unresolved(this.element)
@@ skipping 162 matching lines @@
 
   RedirectingFactoryConstructorAccessSemantics(
       ConstructorAccessKind kind,
       Element element,
       DartType type,
       this.effectiveTargetSemantics)
       : super(kind, element, type);
 }