Migrate UnlinkedVariable.constExpr to UnlinkedExecutable.bodyExpr.

pkg/analyzer/lib/src/summary/idl.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.
 
 /**
  * This file is an "idl" style description of the summary format.  It
  * contains abstract classes which declare the interface for reading data from
  * summaries.  It is parsed and transformed into code that implements the
  * summary format.
  *
@@ skipping 23 matching lines @@
  *
  * Since we expect "linked" and "prelinked" dependencies to be similar, we only
  * rarely distinguish between them; most information is that is not "unlinked"
  * is typically considered "linked" for simplicity.
  *
  * Except as otherwise noted, synthetic elements are not stored in the summary;
  * they are re-synthesized at the time the summary is read.
  */
 library analyzer.tool.summary.idl;
 
+import 'package:analyzer/dart/element/element.dart';
+
 import 'base.dart' as base;
 import 'base.dart' show Id, TopLevel;
 import 'format.dart' as generated;
-import 'package:analyzer/dart/element/element.dart';
 
 /**
  * Annotation describing information which is not part of Dart semantics; in
  * other words, if this information (or any information it refers to) changes,
  * static analysis and runtime behavior of the library are unaffected.
  *
  * Information that has purely local effect (in other words, it does not affect
  * the API of the code being analyzed) is also marked as `informative`.
  */
 const informative = null;
@@ skipping 1404 matching lines @@
    * that element onto the stack.
    */
   pushLocalFunctionReference,
 }
 
 /**
  * Unlinked summary information about a constructor initializer.
  */
 abstract class UnlinkedConstructorInitializer extends base.SummaryClass {
   /**
-   * If [kind] is `thisInvocation` or `superInvocation`, the arguments of the
-   * invocation.  Otherwise empty.
-   */
-  @Id(3)
-  List<UnlinkedConst> get arguments;
-
-  /**
    * If there are `m` [arguments] and `n` [argumentNames], then each argument
    * from [arguments] with index `i` such that `n + i - m >= 0`, should be used
    * with the name at `n + i - m`.
    */
   @Id(4)
   List<String> get argumentNames;
 
   /**
+   * If [kind] is `thisInvocation` or `superInvocation`, the arguments of the
+   * invocation.  Otherwise empty.
+   */
+  @Id(3)
+  List<UnlinkedConst> get arguments;
+
+  /**
    * If [kind] is `field`, the expression of the field initializer.
    * Otherwise `null`.
    */
   @Id(1)
   UnlinkedConst get expression;
 
   /**
    * The kind of the constructor initializer (field, redirect, super).
    */
   @Id(2)
@@ skipping 133 matching lines @@
  * declaration.
  */
 abstract class UnlinkedExecutable extends base.SummaryClass {
   /**
    * Annotations for this executable.
    */
   @Id(6)
   List<UnlinkedConst> get annotations;
 
   /**
+   * If this executable's function body is declared using `=>`, the expression
+   * to the right of the `=>`.  May be omitted if neither type inference nor
+   * constant evaluation depends on the function body.
+   */
+  @Id(29)
+  UnlinkedConst get bodyExpr;
+
+  /**
    * Code range of the executable.
    */
   @informative
   @Id(26)
   CodeRange get codeRange;
 
   /**
    * If a constant [UnlinkedExecutableKind.constructor], the constructor
    * initializers.  Otherwise empty.
    */
@@ skipping 964 matching lines @@
   /**
    * Annotations for this variable.
    */
   @Id(8)
   List<UnlinkedConst> get annotations;
 
   /**
    * Code range of the variable.
    */
   @informative
-  @Id(14)
+  @Id(5)
   CodeRange get codeRange;
 
   /**
-   * If [isConst] is true, and the variable has an initializer, the constant
-   * expression in the initializer.  Note that the presence of this expression
-   * does not mean that it is a valid, check [UnlinkedConst.isInvalid].
-   */
-  @Id(5)
-  UnlinkedConst get constExpr;
-
-  /**
    * Documentation comment for the variable, or `null` if there is no
    * documentation comment.
    */
   @informative
   @Id(10)
   UnlinkedDocumentationComment get documentationComment;
 
   /**
    * If this variable is inferable, nonzero slot id identifying which entry in
    * [LinkedLibrary.types] contains the inferred type for this variable.  If
@@ skipping 67 matching lines @@
    */
   @Id(11)
   int get visibleLength;
 
   /**
    * If a local variable, the beginning of the visible range; zero otherwise.
    */
   @Id(12)
   int get visibleOffset;
 }